From af9106e5440317a9c8a06319de1b3298b17cfc55 Mon Sep 17 00:00:00 2001 From: saravanank Date: Tue, 17 Mar 2020 02:01:35 -0700 Subject: [PATCH] pimd: Join not sent within prune override time when received non local prune. RCA: Periodic join is mostly sent by nbr jp timer except for few scenarios by upstream join timer Fix: If join timer not running, we have to use nbr jp timer to calculate remaining time for next join. Signed-off-by: Saravanan K --- pimd/pim_upstream.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index efa58c1b1f..fb7840ee76 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -462,10 +462,26 @@ void pim_upstream_join_timer_decrease_to_t_override(const char *debug_label, return; } - join_timer_remain_msec = pim_time_timer_remain_msec(up->t_join_timer); t_override_msec = pim_if_t_override_msec(up->rpf.source_nexthop.interface); + if (up->t_join_timer) { + join_timer_remain_msec = + pim_time_timer_remain_msec(up->t_join_timer); + } else { + /* upstream join tracked with neighbor jp timer */ + struct pim_neighbor *nbr; + + nbr = pim_neighbor_find(up->rpf.source_nexthop.interface, + up->rpf.rpf_addr.u.prefix4); + if (nbr) + join_timer_remain_msec = + pim_time_timer_remain_msec(nbr->jp_timer); + else + /* Manipulate such that override takes place */ + join_timer_remain_msec = t_override_msec + 1; + } + if (PIM_DEBUG_PIM_TRACE) { char rpf_str[INET_ADDRSTRLEN]; pim_inet4_dump("", up->rpf.rpf_addr.u.prefix4, rpf_str,