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

pimd: fix order of operations for evaluating join

Browse Source 
join_desired looks at whether up->channel_oil is empty.  up->channel_oil
is updated from pim_forward_stop(), calling pim_channel_del_oif().  But
that was being called *after* updating join_desired, so join_desired saw
a non-empty OIL.  Pull up the pim_forward_stop() call to before updating
join_desired.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
(cherry picked from commit fdb1a6fed5)
This commit is contained in:
David Lamparter 2022-12-12 17:50:59 +01:00 committed by Mergify
parent 20c7a92378
commit 66e45b9ce8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pimd/pim_ifchannel.c
View File

@ -342,6 +342,13 @@ void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch,
ch->sg_str, ch->interface->name);
}
/* pim_upstream_update_join_desired looks at up->channel_oil,
* but that's updated from pim_forward_stop(). Need this here
* so we correctly determine join_desired right below.
*/
if (new_state == PIM_IFJOIN_NOINFO)
pim_forward_stop(ch);
/*
Record uptime of state transition to/from NOINFO
*/
@ -619,7 +626,6 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, pim_sgaddr *sg,
static void ifjoin_to_noinfo(struct pim_ifchannel *ch)
{
pim_ifchannel_ifjoin_switch(__func__, ch, PIM_IFJOIN_NOINFO);
pim_forward_stop(ch);
PIM_UPSTREAM_FLAG_UNSET_SRC_PIM(ch->upstream->flags);