pimd: Do not complain if re-joining an IGMP group

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.

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index f0b89396b34e3a8ea9d728fa963ab9cb7aaf985b..d98e5f1f66614d339e17bf7f4787e4dc8d6bb5eb 100644 (file)
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -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);