proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 10:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5942 from patrasar/2438087

Browse Source 
pimd: Display mroute uptime per (s,g) entry
This commit is contained in:
Donald Sharp 2020-03-09 08:47:10 -04:00 committed by GitHub
commit 5cb1323595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pimd/pim_cmd.c
View File

@ -5772,6 +5772,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
int oif_vif_index;
struct interface *ifp_in;
char proto[100];
char mroute_uptime[10];
if (uj) {
json = json_object_new_object();
@ -5807,6 +5808,10 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
else
strlcpy(in_ifname, "<iif?>", sizeof(in_ifname));
pim_time_uptime(mroute_uptime, sizeof(mroute_uptime),
now - c_oil->mroute_creation);
if (uj) {
/* Find the group, create it if it doesn't exist */
@ -5840,13 +5845,14 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
json_object_int_add(json_source, "OilInheritedRescan",
c_oil->oil_inherited_rescan);
json_object_string_add(json_source, "iif", in_ifname);
json_object_string_add(json_source, "upTime",
mroute_uptime);
json_oil = NULL;
}
for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
++oif_vif_index) {
struct interface *ifp_out;
char mroute_uptime[10];
int ttl;
ttl = c_oil->oil.mfcc_ttls[oif_vif_index];
@ -5864,9 +5870,6 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
continue;
ifp_out = pim_if_find_by_vif_index(pim, oif_vif_index);
pim_time_uptime(
mroute_uptime, sizeof(mroute_uptime),
now - c_oil->mroute_creation);
found_oif = 1;
if (ifp_out)
@ -5952,6 +5955,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
src_str[0] = '\0';
grp_str[0] = '\0';
in_ifname[0] = '\0';
mroute_uptime[0] = '\0';
first = 0;
}
}