Skip to content

Commit

Permalink
pimd: Do not complain if re-joining an IGMP group
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

If you cut-n-paste an existing "ip igmp join 233.200.0.0 0.0.0.0"
command under an interface we should not return an error.
  • Loading branch information
Daniel Walton committed Sep 18, 2017
1 parent a7dd519 commit 53d829f
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions pimd/pim_iface.c
Original file line number Diff line number Diff line change
Expand Up @@ -1292,16 +1292,11 @@ ferr_r pim_if_igmp_join_add(struct interface *ifp, struct in_addr group_addr,
}

ij = igmp_join_find(pim_ifp->igmp_join_list, group_addr, source_addr);

/* This interface has already been configured to join this IGMP group
*/
if (ij) {
char group_str[INET_ADDRSTRLEN];
char source_str[INET_ADDRSTRLEN];
pim_inet4_dump("<grp?>", group_addr, group_str,
sizeof(group_str));
pim_inet4_dump("<src?>", source_addr, source_str,
sizeof(source_str));
return ferr_cfg_invalid(
"can't re-join existing IGMP group %s source %s on interface %s",
group_str, source_str, ifp->name);
return ferr_ok();
}

ij = igmp_join_new(ifp, group_addr, source_addr);
Expand Down

0 comments on commit 53d829f

Please sign in to comment.