diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-12-04 14:16:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 14:16:24 +0100 |
| commit | 6bf42834218d2f89959c998c0d6ce6ab9b722557 (patch) | |
| tree | 51b30d68d07f0036d6ff02a9c00cc9f7bb13fc4d /pimd | |
| parent | Merge pull request #17556 from opensourcerouting/fix/add_route_map_action_reason (diff) | |
| parent | pimd: igmp proxy joins should not be written as part of config (diff) | |
| download | frr-6bf42834218d2f89959c998c0d6ce6ab9b722557.tar.xz frr-6bf42834218d2f89959c998c0d6ce6ab9b722557.zip | |
Merge pull request #17569 from btrent98/igmp-proxy-bugfix
pimd: igmp proxy joins should not be written as part of config
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_vty.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 4d83593c1..ed91d2339 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -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); |