matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Introduce mroute_creation in channel oil data structure

Browse source 
Issue: (*,G) mroute uptime is not updated in mroute table,
after deleting and adding the RP

Root cause: When RP gets deleted or becomes not reachable, then
we un-install the entry from the kernel, but still maintains the
entry in the stack. When  RP gets re-configured or becomes reachable,
"show ip mroute" shows the uptime, when the channel_oil gets created.

Fix: Introduce a new time mroute_creation in the channel_oil, gets
updated when mroute gets installed in the kernel.

Signed-off-by: Sarita Patra <saritap@vmware.com>
This commit is contained in:
Sarita Patra 2019-03-31 23:38:28 -07:00
parent ecedbaa13b
commit e7cd85bda7
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pimd/pim_cmd.c
View file

@ -4594,7 +4594,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill,
for (oif_vif_index = 0; oif_vif_index < MAXVIFS; for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
++oif_vif_index) { ++oif_vif_index) {
struct interface *ifp_out; struct interface *ifp_out;
char oif_uptime[10]; char mroute_uptime[10];
int ttl; int ttl;
ttl = c_oil->oil.mfcc_ttls[oif_vif_index]; ttl = c_oil->oil.mfcc_ttls[oif_vif_index];
@ -4603,8 +4603,8 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill,
ifp_out = pim_if_find_by_vif_index(pim, oif_vif_index); ifp_out = pim_if_find_by_vif_index(pim, oif_vif_index);
pim_time_uptime( pim_time_uptime(
oif_uptime, sizeof(oif_uptime), mroute_uptime, sizeof(mroute_uptime),
now - c_oil->oif_creation[oif_vif_index]); now - c_oil->mroute_creation);
found_oif = 1; found_oif = 1;
if (ifp_out) if (ifp_out)
@ -4652,7 +4652,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill,
oif_vif_index); oif_vif_index);
json_object_int_add(json_ifp_out, "ttl", ttl); json_object_int_add(json_ifp_out, "ttl", ttl);
json_object_string_add(json_ifp_out, "upTime", json_object_string_add(json_ifp_out, "upTime",
oif_uptime); mroute_uptime);
if (!json_oil) { if (!json_oil) {
json_oil = json_object_new_object(); json_oil = json_object_new_object();
json_object_object_add(json_source, json_object_object_add(json_source,
@ -4684,7 +4684,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill,
vty_out(vty, vty_out(vty,
"%-15s %-15s %-6s %-16s %-16s %-3d %8s\n", "%-15s %-15s %-6s %-16s %-16s %-3d %8s\n",
src_str, grp_str, proto, in_ifname, src_str, grp_str, proto, in_ifname,
out_ifname, ttl, oif_uptime); out_ifname, ttl, mroute_uptime);
if (first) { if (first) {
src_str[0] = '\0'; src_str[0] = '\0';

2
pimd/pim_mroute.c
View file

@ -964,6 +964,8 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
} }
c_oil->installed = 1; c_oil->installed = 1;
c_oil->mroute_creation = pim_time_monotonic_sec();
return 0; return 0;
} }

1
pimd/pim_oil.h
View file

@ -97,6 +97,7 @@ struct channel_oil {
uint32_t oif_flags[MAXVIFS]; uint32_t oif_flags[MAXVIFS];
struct channel_counts cc; struct channel_counts cc;
struct pim_upstream *up; struct pim_upstream *up;
time_t mroute_creation;
}; };
extern struct list *pim_channel_oil_list; extern struct list *pim_channel_oil_list;