]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: igmp proxy joins should not be written as part of config 17569/head
authorBarry A. Trent <barry.trent@atcorp.com>
Tue, 3 Dec 2024 19:17:33 +0000 (11:17 -0800)
committerBarry A. Trent <barry.trent@atcorp.com>
Tue, 3 Dec 2024 21:44:08 +0000 (13:44 -0800)
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
pimd/pim_vty.c

index 4d83593c17d21237d3344cf9c8e023d299ca5200..ed91d2339b5ff51af5a1399eab156622acdf3274 100644 (file)
@@ -342,6 +342,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);
@@ -412,6 +415,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);