diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-04-14 08:32:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 08:32:32 -0400 |
| commit | f32b16b09f78060445ce1af6d9f45dd413fa71fb (patch) | |
| tree | 5352e887444f32881c8c628e08fca04c4c814623 | |
| parent | 682cb2a455bd1a612a85c62705d49382b7efc4a5 (diff) | |
| parent | af9106e5440317a9c8a06319de1b3298b17cfc55 (diff) | |
Merge pull request #6017 from sarav511/ovrride
pimd: Join not sent within prune override time when received non local prune
| -rw-r--r-- | pimd/pim_upstream.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 872883dfde..982fb7e5a5 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("<rpf?>", up->rpf.rpf_addr.u.prefix4, rpf_str, |