diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-11-01 15:16:03 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-22 02:26:13 +0100 |
| commit | a277fb849563ee3e1428b117049ade4fc137be3b (patch) | |
| tree | d704ffede11aca8b36a102ba9db478ed3b1f5606 /pimd | |
| parent | pimd: When nexthop lookup fails, back out gracefully (diff) | |
| download | frr-a277fb849563ee3e1428b117049ade4fc137be3b.tar.xz frr-a277fb849563ee3e1428b117049ade4fc137be3b.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | pimd/pim_igmp.c | 2 | ||||
| -rw-r--r-- | 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 04689a030..0ce12f1ad 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 3a1a1c04a..c9dca5333 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("<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); |