From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Mon, 18 Sep 2017 16:01:21 +0000 (+0000)
Subject: pimd: Do not complain if re-joining an IGMP group
X-Git-Tag: frr-4.0-dev~300^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=53d829f5d4c7d5cccc3ee70c5486279b7dede238;p=matthieu%2Ffrr.git

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 f0b89396b3..d98e5f1f66 100644
--- 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);