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

Merge pull request #6056 from sarav511/jpexp

Browse Source 
pimd: Prune->noinfo state has to put off join expiry timer and delete ifchannel
This commit is contained in:
Donald Sharp 2020-05-21 08:08:29 -04:00 committed by GitHub
commit 737d73e519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pimd/pim_ifchannel.c
View File

@ -943,10 +943,13 @@ void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr,
THREAD_OFF(ch->t_ifjoin_expiry_timer); THREAD_OFF(ch->t_ifjoin_expiry_timer);
break; break;
case PIM_IFJOIN_PRUNE: case PIM_IFJOIN_PRUNE:
if (source_flags & PIM_ENCODE_RPT_BIT) if (source_flags & PIM_ENCODE_RPT_BIT) {
pim_ifchannel_ifjoin_switch(__func__, ch, pim_ifchannel_ifjoin_switch(__func__, ch,
PIM_IFJOIN_NOINFO); PIM_IFJOIN_NOINFO);
else THREAD_OFF(ch->t_ifjoin_expiry_timer);
delete_on_noinfo(ch);
return;
} else
pim_ifchannel_ifjoin_handler(ch, pim_ifp); pim_ifchannel_ifjoin_handler(ch, pim_ifp);
break; break;
case PIM_IFJOIN_PRUNE_PENDING: case PIM_IFJOIN_PRUNE_PENDING: