From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 29 Mar 2019 02:08:37 +0000 (-0400)
Subject: bfdd, nhrpd, pimd: When deleting an interface clean up
X-Git-Tag: frr-6.0.3~8^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=69dd2e5ea613e079887233d75fbce5f7c4107592;p=matthieu%2Ffrr.git

bfdd, nhrpd, pimd: When deleting an interface clean up

When we delete an interface, we need to set the interface
ifindex to an internal value so that we don't end up in
a state where the re-addition of the same ifindex, due to
a rename operation, causes an infinite loop.

Fixes:#4007
Fix-Suggested-by: Saravanan K
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c
index 3a42712748..13297aa344 100644
--- a/nhrpd/nhrp_interface.c
+++ b/nhrpd/nhrp_interface.c
@@ -323,9 +323,11 @@ int nhrp_interface_delete(int cmd, struct zclient *client, zebra_size_t length,
 		return 0;
 
 	debugf(NHRP_DEBUG_IF, "if-delete: %s", ifp->name);
-	if_set_index(ifp, ifp->ifindex);
+
 	nhrp_interface_update(ifp);
-	/* if_delete(ifp); */
+
+	if_set_index(ifp, IFINDEX_INTERNAL);
+
 	return 0;
 }
 
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index ad60e8e3a6..30d66c835b 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -152,6 +152,8 @@ static int pim_zebra_if_del(int command, struct zclient *zclient,
 	if (!if_is_operative(ifp))
 		pim_if_addr_del_all(ifp);
 
+	if_set_index(ifp, IFINDEX_INTERNAL);
+
 	return 0;
 }