pimd: igmp proxy joins should not be written as part of config

Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
(cherry picked from commit d4b8a98019f6a2723089eda88adfa45494a5e8f7)

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index b633e81d5536fc183f672e19c0c38fad8553fb11..bb620b7a7a57b94ee2213ef2da817099efcc2d9a 100644 (file)
--- 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);