Nest: VRF support for neighbor cache and olock code

Actually much simpler than expected.

1 files changed, 5 insertions, 3 deletions

diff --git a/nest/neighbor.c b/nest/neighbor.c
index d974fa51..f8159d35 100644
--- a/nest/neighbor.c
+++ b/nest/neighbor.c
@@ -30,7 +30,8 @@
  * when the protocol has explicitly requested it via the %NEF_STICKY
  * flag because it wishes to be notified when the node will again become
  * a neighbor. Such entries are enqueued in a special list which is walked
- * whenever an interface changes its state to up.
+ * whenever an interface changes its state to up. Neighbor entry VRF
+ * association is implied by respective protocol.
  *
  * When a neighbor event occurs (a neighbor gets disconnected or a sticky
  * inactive neighbor becomes connected), the protocol hook neigh_notify()
@@ -152,8 +153,9 @@ neigh_find2(struct proto *p, ip_addr *a, struct iface *ifa, unsigned flags)
     }
   else
     WALK_LIST(i, iface_list)
-      if ((scope = if_connected(a, i, &addr)) >= 0)
-	{
+      if ((!p->vrf || p->vrf == i->master) &&
+	  ((scope = if_connected(a, i, &addr)) >= 0))
+        {
 	  ifa = i;
 	  break;
 	}