From 44e85a55a1d779cbd68317983c2234360c04098e Mon Sep 17 00:00:00 2001 From: "Barry A. Trent" Date: Tue, 3 Dec 2024 11:17:33 -0800 Subject: [PATCH] pimd: igmp proxy joins should not be written as part of config Signed-off-by: Barry A. Trent (cherry picked from commit d4b8a98019f6a2723089eda88adfa45494a5e8f7) --- pimd/pim_vty.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index b633e81d55..bb620b7a7a 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -325,6 +325,9 @@ static int gm_config_write(struct vty *vty, int writes, struct listnode *node; struct gm_join *ij; for (ALL_LIST_ELEMENTS_RO(pim_ifp->gm_join_list, node, ij)) { + if (ij->join_type == GM_JOIN_PROXY) + continue; + if (pim_addr_is_any(ij->source_addr)) vty_out(vty, " ip igmp join-group %pPAs\n", &ij->group_addr); @@ -395,6 +398,9 @@ static int gm_config_write(struct vty *vty, int writes, struct gm_join *ij; for (ALL_LIST_ELEMENTS_RO(pim_ifp->gm_join_list, node, ij)) { + if (ij->join_type == GM_JOIN_PROXY) + continue; + if (pim_addr_is_any(ij->source_addr)) vty_out(vty, " ipv6 mld join-group %pPAs\n", &ij->group_addr); -- 2.39.5