proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 15:43:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Refactor interface statistic calling

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-02-05 21:17:08 -05:00 committed by Donald Sharp
parent 2ae2638713
commit 78860b9f45
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
zebra/interface.c
View File

@ -1255,6 +1255,19 @@ ALIAS (zebra_interface,
"Interface's name\n" "Interface's name\n"
VRF_CMD_HELP_STR) VRF_CMD_HELP_STR)
static void
interface_update_stats (void)
{
#ifdef HAVE_PROC_NET_DEV
/* If system has interface statistics via proc file system, update
statistics. */
ifstat_update_proc ();
#endif /* HAVE_PROC_NET_DEV */
#ifdef HAVE_NET_RT_IFLIST
ifstat_update_sysctl ();
#endif /* HAVE_NET_RT_IFLIST */
}
struct cmd_node interface_node = struct cmd_node interface_node =
{ {
INTERFACE_NODE, INTERFACE_NODE,
@ -1300,14 +1313,7 @@ DEFUN (show_interface, show_interface_cmd,
struct interface *ifp; struct interface *ifp;
vrf_id_t vrf_id = VRF_DEFAULT; vrf_id_t vrf_id = VRF_DEFAULT;
#ifdef HAVE_PROC_NET_DEV interface_update_stats ();
/* If system has interface statistics via proc file system, update
statistics. */
ifstat_update_proc ();
#endif /* HAVE_PROC_NET_DEV */
#ifdef HAVE_NET_RT_IFLIST
ifstat_update_sysctl ();
#endif /* HAVE_NET_RT_IFLIST */
if (argc > 0) if (argc > 0)
VRF_GET_ID (vrf_id, argv[0]); VRF_GET_ID (vrf_id, argv[0]);
@ -1337,14 +1343,7 @@ DEFUN (show_interface_vrf_all, show_interface_vrf_all_cmd,
struct interface *ifp; struct interface *ifp;
vrf_iter_t iter; vrf_iter_t iter;
#ifdef HAVE_PROC_NET_DEV interface_update_stats ();
/* If system has interface statistics via proc file system, update
statistics. */
ifstat_update_proc ();
#endif /* HAVE_PROC_NET_DEV */
#ifdef HAVE_NET_RT_IFLIST
ifstat_update_sysctl ();
#endif /* HAVE_NET_RT_IFLIST */
/* All interface print. */ /* All interface print. */
for (iter = vrf_first (); iter != VRF_ITER_INVALID; iter = vrf_next (iter)) for (iter = vrf_first (); iter != VRF_ITER_INVALID; iter = vrf_next (iter))
@ -1367,14 +1366,7 @@ DEFUN (show_interface_name_vrf,
struct interface *ifp; struct interface *ifp;
vrf_id_t vrf_id = VRF_DEFAULT; vrf_id_t vrf_id = VRF_DEFAULT;
#ifdef HAVE_PROC_NET_DEV interface_update_stats ();
/* If system has interface statistics via proc file system, update
statistics. */
ifstat_update_proc ();
#endif /* HAVE_PROC_NET_DEV */
#ifdef HAVE_NET_RT_IFLIST
ifstat_update_sysctl ();
#endif /* HAVE_NET_RT_IFLIST */
if (argc > 1) if (argc > 1)
VRF_GET_ID (vrf_id, argv[1]); VRF_GET_ID (vrf_id, argv[1]);
@ -1404,14 +1396,7 @@ DEFUN (show_interface_name_vrf_all, show_interface_name_vrf_all_cmd,
vrf_iter_t iter; vrf_iter_t iter;
int found = 0; int found = 0;
#ifdef HAVE_PROC_NET_DEV interface_update_stats ();
/* If system has interface statistics via proc file system, update
statistics. */
ifstat_update_proc ();
#endif /* HAVE_PROC_NET_DEV */
#ifdef HAVE_NET_RT_IFLIST
ifstat_update_sysctl ();
#endif /* HAVE_NET_RT_IFLIST */
/* All interface print. */ /* All interface print. */
for (iter = vrf_first (); iter != VRF_ITER_INVALID; iter = vrf_next (iter)) for (iter = vrf_first (); iter != VRF_ITER_INVALID; iter = vrf_next (iter))