diff options
| author | Sarita Patra <saritap@vmware.com> | 2019-03-31 23:38:28 -0700 |
|---|---|---|
| committer | Sarita Patra <saritap@vmware.com> | 2019-03-31 23:38:28 -0700 |
| commit | e7cd85bda76820933a10d59d0376985fa4b10fd9 (patch) | |
| tree | d059bbd9dcf17b9dce66dd698e1129714d7c2e62 | |
| parent | ecedbaa13b8f39011c8c3feed163b293605447de (diff) | |
pimd: Introduce mroute_creation in channel oil data structure
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>
| -rw-r--r-- | pimd/pim_cmd.c | 10 | ||||
| -rw-r--r-- | pimd/pim_mroute.c | 2 | ||||
| -rw-r--r-- | pimd/pim_oil.h | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index f9140802fb..70b3ae10e5 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -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; ++oif_vif_index) { struct interface *ifp_out; - char oif_uptime[10]; + char mroute_uptime[10]; int ttl; 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); pim_time_uptime( - oif_uptime, sizeof(oif_uptime), - now - c_oil->oif_creation[oif_vif_index]); + mroute_uptime, sizeof(mroute_uptime), + now - c_oil->mroute_creation); found_oif = 1; if (ifp_out) @@ -4652,7 +4652,7 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill, oif_vif_index); json_object_int_add(json_ifp_out, "ttl", ttl); json_object_string_add(json_ifp_out, "upTime", - oif_uptime); + mroute_uptime); if (!json_oil) { json_oil = json_object_new_object(); 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, "%-15s %-15s %-6s %-16s %-16s %-3d %8s\n", src_str, grp_str, proto, in_ifname, - out_ifname, ttl, oif_uptime); + out_ifname, ttl, mroute_uptime); if (first) { src_str[0] = '\0'; diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 67b1a95f74..b5e773fb59 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -964,6 +964,8 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name) } c_oil->installed = 1; + c_oil->mroute_creation = pim_time_monotonic_sec(); + return 0; } diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h index 5dd4e8b326..8b95324142 100644 --- a/pimd/pim_oil.h +++ b/pimd/pim_oil.h @@ -97,6 +97,7 @@ struct channel_oil { uint32_t oif_flags[MAXVIFS]; struct channel_counts cc; struct pim_upstream *up; + time_t mroute_creation; }; extern struct list *pim_channel_oil_list; |