proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-02 16:25:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: stop t_sg_expire in MLD NOINFO transition

Browse Source 
When hitting gm_sg_update from the S,G expiry timer, t_sg_expire will
already be cancelled.  But when arriving there from e.g. the MLD packet
getting cleared out, it'll still be running.

Clear out the timer if we arrive with `has_expired == true`.

Fixes: #12441
Reported-by: Vijay Kumar Gupta <vijayg@vmware.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2023-03-17 13:34:46 +01:00
parent 3bf4d3b45d
commit f4ac0a1c7c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pimd/pim6_mld.c
View File

@ -438,6 +438,13 @@ static void gm_sg_update(struct gm_sg *sg, bool has_expired)
}
if (desired == GM_SG_NOINFO) {
/* multiple paths can lead to the last state going away;
* t_sg_expire can still be running if we're arriving from
* another path.
*/
if (has_expired)
THREAD_OFF(sg->t_sg_expire);
assertf((!sg->t_sg_expire &&
!gm_packet_sg_subs_count(sg->subs_positive) &&
!gm_packet_sg_subs_count(sg->subs_negative)),