From a277fb849563ee3e1428b117049ade4fc137be3b Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 1 Nov 2016 10:16:03 -0400 Subject: [PATCH] pimd: Fix 'ip igmp join ..' When a static igmp join is issued, before routing has come up, the ability to recover was accidently removed from the code. Ticket: CM-13379 Signed-off-by: Donald Sharp --- pimd/pim_igmp.c | 2 +- pimd/pim_vty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index 04689a030f..0ce12f1ad7 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -48,7 +48,7 @@ static int igmp_sock_open(struct in_addr ifaddr, ifindex_t ifindex, uint32_t pim int join = 0; struct in_addr group; - fd = pim_socket_mcast(IPPROTO_IGMP, ifaddr, ifindex, 0 /* loop=false */); + fd = pim_socket_mcast(IPPROTO_IGMP, ifaddr, ifindex, 1); if (fd < 0) return -1; diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 3a1a1c04a1..c9dca53334 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -258,7 +258,7 @@ int pim_interface_config_write(struct vty *vty) char group_str[INET_ADDRSTRLEN]; char source_str[INET_ADDRSTRLEN]; pim_inet4_dump("", ij->group_addr, group_str, sizeof(group_str)); - pim_inet4_dump("", ij->source_addr, source_str, sizeof(source_str)); + inet_ntop(AF_INET, &ij->source_addr, source_str, sizeof(source_str)); vty_out(vty, " ip igmp join %s %s%s", group_str, source_str, VTY_NEWLINE); -- 2.39.5