From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Tue, 26 Mar 2019 14:02:00 +0000 (+0100)
Subject: bfdd: check bfd on upon interface presence from separate vrf
X-Git-Tag: base_7.2~355^2~9
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b4335515957e9469ed7df30607a8200a80cc7ea2;p=matthieu%2Ffrr.git

bfdd: check bfd on upon interface presence from separate vrf

if a separate vrf detects a new interface, then some bfd sessions may be
run.

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

diff --git a/bfdd/ptm_adapter.c b/bfdd/ptm_adapter.c
index abfb4e4a26..6d24c64206 100644
--- a/bfdd/ptm_adapter.c
+++ b/bfdd/ptm_adapter.c
@@ -563,15 +563,21 @@ static void bfdd_sessions_enable_interface(struct interface *ifp)
 {
 	struct bfd_session_observer *bso;
 	struct bfd_session *bs;
+	struct vrf *vrf;
 
 	TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) {
+		bs = bso->bso_bs;
 		if (bso->bso_isinterface == false)
 			continue;
-
 		/* Interface name mismatch. */
-		bs = bso->bso_bs;
 		if (strcmp(ifp->name, bs->key.ifname))
 			continue;
+		vrf = vrf_lookup_by_id(ifp->vrf_id);
+		if (!vrf)
+			continue;
+		if (bs->key.vrfname[0] &&
+		    strcmp(vrf->name, bs->key.vrfname))
+			continue;
 		/* Skip enabled sessions. */
 		if (bs->sock != -1)
 			continue;