proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-01 16:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6017 from sarav511/ovrride

Browse Source 
pimd: Join not sent within prune override time when received non local prune
This commit is contained in:
Donald Sharp 2020-04-14 08:32:32 -04:00 committed by GitHub
commit f32b16b09f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pimd/pim_upstream.c
View File

@ -462,10 +462,26 @@ void pim_upstream_join_timer_decrease_to_t_override(const char *debug_label,
return; return;
} }
join_timer_remain_msec = pim_time_timer_remain_msec(up->t_join_timer);
t_override_msec = t_override_msec =
pim_if_t_override_msec(up->rpf.source_nexthop.interface); 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) { if (PIM_DEBUG_PIM_TRACE) {
char rpf_str[INET_ADDRSTRLEN]; char rpf_str[INET_ADDRSTRLEN];
pim_inet4_dump("<rpf?>", up->rpf.rpf_addr.u.prefix4, rpf_str, pim_inet4_dump("<rpf?>", up->rpf.rpf_addr.u.prefix4, rpf_str,