proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-10 21:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11559 from patrasar/fix_clear_ipv6_mroute

Browse Source 
pim6d: fix clear ipv6 mroute
This commit is contained in:
Donald Sharp 2022-08-05 07:43:12 -04:00 committed by GitHub
commit ddfc81f3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pimd/pim6_mld.c
View File

@ -2280,6 +2280,22 @@ void gm_ifp_update(struct interface *ifp)
} }
} }
void gm_group_delete(struct gm_if *gm_ifp)
{
struct gm_sg *sg, *sg_start;
sg_start = gm_sgs_first(gm_ifp->sgs);
/* clean up all mld groups */
frr_each_from (gm_sgs, gm_ifp->sgs, sg, sg_start) {
THREAD_OFF(sg->t_sg_expire);
if (sg->oil)
pim_channel_oil_del(sg->oil, __func__);
gm_sgs_del(gm_ifp->sgs, sg);
gm_sg_free(sg);
}
}
/* /*
* CLI (show commands only) * CLI (show commands only)
*/ */

1
pimd/pim6_mld.h
View File

@ -352,6 +352,7 @@ struct gm_if {
#if PIM_IPV == 6 #if PIM_IPV == 6
extern void gm_ifp_update(struct interface *ifp); extern void gm_ifp_update(struct interface *ifp);
extern void gm_ifp_teardown(struct interface *ifp); extern void gm_ifp_teardown(struct interface *ifp);
extern void gm_group_delete(struct gm_if *gm_ifp);
#else #else
static inline void gm_ifp_update(struct interface *ifp) static inline void gm_ifp_update(struct interface *ifp)
{ {

7
pimd/pim_cmd_common.c
View File

@ -57,6 +57,7 @@
#include "pim_addr.h" #include "pim_addr.h"
#include "pim_static.h" #include "pim_static.h"
#include "pim_util.h" #include "pim_util.h"
#include "pim6_mld.h"
/** /**
* Get current node VRF name. * Get current node VRF name.
@ -4016,6 +4017,12 @@ void clear_mroute(struct pim_instance *pim)
igmp_group_delete(grp); igmp_group_delete(grp);
} }
} }
#else
struct gm_if *gm_ifp;
gm_ifp = pim_ifp->mld;
if (gm_ifp)
gm_group_delete(gm_ifp);
#endif #endif
} }