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 <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 04689a030fc94e35691abdd20cc0d19f8a57a2b6..0ce12f1ad7139ad070d274711e6612e534958ac2 100644 (file)
--- 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 3a1a1c04a10f1c845909f487216095bedeaf49da..c9dca5333407e1153c2dc8c53bfe708c33be22b2 100644 (file)
--- 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("<grp?>", ij->group_addr, group_str, sizeof(group_str));
-         pim_inet4_dump("<src?>", 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);