From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Tue, 18 Dec 2018 17:00:31 +0000 (+0100)
Subject: zebra: handle multiple events for netns deletion event
X-Git-Tag: frr-7.1-dev~34^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f245bcaebbd499f888c8f9355c73f8d78fded17f;p=mirror%2Ffrr.git

zebra: handle multiple events for netns deletion event

When handling events from /var/run/netns folder, if several netns are
removed at the same time, only the first one is deleted in the frr. Fix
this behaviour by applying continue in the loop.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---

diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c
index a4e1022148..ed9f3899d4 100644
--- a/zebra/zebra_netns_notify.c
+++ b/zebra/zebra_netns_notify.c
@@ -266,9 +266,10 @@ static int zebra_ns_notify_read(struct thread *t)
 			break;
 		}
 
-		if (event->mask & IN_DELETE)
-			return zebra_ns_delete(event->name);
-
+		if (event->mask & IN_DELETE) {
+			zebra_ns_delete(event->name);
+			continue;
+		}
 		netnspath = ns_netns_pathname(NULL, event->name);
 		if (!netnspath)
 			continue;