diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-09-12 15:49:36 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-09-12 15:49:36 +0200 |
| commit | 9f4908fe78cb3e5191bca721588ee1acb10876e3 (patch) | |
| tree | 93a6d5858e941ebec3b7acc99e6225b5011176bc /proto | |
| parent | 943478b00f585725c3e7406909ee867dcfac5f87 (diff) | |
Nest: VRF support for neighbor cache and olock code
Actually much simpler than expected.
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/bgp/bgp.c | 1 | ||||
| -rw-r--r-- | proto/radv/radv.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index 913685a4..8a6b2f02 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -1181,6 +1181,7 @@ bgp_start(struct proto *P) lock->addr = p->cf->remote_ip; lock->port = p->cf->remote_port; lock->iface = p->cf->iface; + lock->vrf = p->cf->iface ? NULL : p->p.vrf; lock->type = OBJLOCK_TCP; lock->hook = bgp_start_locked; lock->data = p; diff --git a/proto/radv/radv.c b/proto/radv/radv.c index 227c8ef6..c53a0a95 100644 --- a/proto/radv/radv.c +++ b/proto/radv/radv.c @@ -321,7 +321,6 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf ifa->timer = tm; struct object_lock *lock = olock_new(pool); - lock->addr = IPA_NONE; lock->type = OBJLOCK_IP; lock->port = ICMPV6_PROTO; lock->iface = iface; |