diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 18:35:46 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 18:35:46 +0100 |
| commit | 46434a3cad99260b5a659e5df874eab4615bcb36 (patch) | |
| tree | e5f4842fbdcc2ee0c66d6fdb437cb401a7234fb1 /nest/neighbor.c | |
| parent | 4ff15a75c56531fa2d3858d8250dcef1af4e75b6 (diff) | |
| parent | 7b2c5f3d2826e3175bf31b1c36056c9efc587a2b (diff) | |
Merge commit '7b2c5f3d2826e3175bf31b1c36056c9efc587a2b' into int-new
Diffstat (limited to 'nest/neighbor.c')
| -rw-r--r-- | nest/neighbor.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nest/neighbor.c b/nest/neighbor.c index 96475a50..fb05d96c 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() @@ -153,8 +154,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; } |