proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 14:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6049 from sarav511/ovrdhold

Browse Source 
pimd: SGRpt prune received during prune didn't override holdtime
This commit is contained in:
Russ White 2021-02-04 07:14:31 -05:00 committed by GitHub
commit 98e3dfaee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pimd/pim_ifchannel.c
View File

@ -729,6 +729,21 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
pim_jp_agg_single_upstream_send(&parent->rpf, pim_jp_agg_single_upstream_send(&parent->rpf,
parent, true); parent, true);
/*
* SGRpt prune pending expiry has to install
* SG entry with empty olist to drop the SG
* traffic incase no other intf exists.
* On that scenario, SG entry wouldn't have
* got installed until Prune pending timer
* expired. So install now.
*/
pim_channel_del_oif(
ch->upstream->channel_oil, ifp,
PIM_OIF_FLAG_PROTO_STAR, __func__);
if (!ch->upstream->channel_oil->installed)
pim_upstream_mroute_add(
ch->upstream->channel_oil,
__PRETTY_FUNCTION__);
} }
} }
/* from here ch may have been deleted */ /* from here ch may have been deleted */
@ -1113,6 +1128,24 @@ void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream,
case PIM_IFJOIN_PRUNE: case PIM_IFJOIN_PRUNE:
if (source_flags & PIM_ENCODE_RPT_BIT) { if (source_flags & PIM_ENCODE_RPT_BIT) {
THREAD_OFF(ch->t_ifjoin_prune_pending_timer); THREAD_OFF(ch->t_ifjoin_prune_pending_timer);
/*
* While in Prune State, Receive SGRpt Prune.
* RFC 7761 Sec 4.5.3:
* The (S,G,rpt) downstream state machine on interface I
* remains in Prune state. The Expiry Timer (ET) is
* restarted and is then set to the maximum of its
* current value and the HoldTime from the triggering
* Join/Prune message.
*/
if (ch->t_ifjoin_expiry_timer) {
unsigned long rem = thread_timer_remain_second(
ch->t_ifjoin_expiry_timer);
if (rem > holdtime)
return;
THREAD_OFF(ch->t_ifjoin_expiry_timer);
}
thread_add_timer(router->master, on_ifjoin_expiry_timer, thread_add_timer(router->master, on_ifjoin_expiry_timer,
ch, holdtime, ch, holdtime,
&ch->t_ifjoin_expiry_timer); &ch->t_ifjoin_expiry_timer);