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 /proto/radv | |
| parent | 4ff15a75c56531fa2d3858d8250dcef1af4e75b6 (diff) | |
| parent | 7b2c5f3d2826e3175bf31b1c36056c9efc587a2b (diff) | |
Merge commit '7b2c5f3d2826e3175bf31b1c36056c9efc587a2b' into int-new
Diffstat (limited to 'proto/radv')
| -rw-r--r-- | proto/radv/packets.c | 1 | ||||
| -rw-r--r-- | proto/radv/radv.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/proto/radv/packets.c b/proto/radv/packets.c index e07296e1..7c148b7d 100644 --- a/proto/radv/packets.c +++ b/proto/radv/packets.c @@ -387,6 +387,7 @@ radv_sk_open(struct radv_iface *ifa) sk->subtype = SK_IPV6; sk->dport = ICMPV6_PROTO; sk->saddr = ifa->addr->ip; + sk->vrf = ifa->ra->p.vrf; sk->ttl = 255; /* Mandatory for Neighbor Discovery packets */ sk->rx_hook = radv_rx_hook; diff --git a/proto/radv/radv.c b/proto/radv/radv.c index c96d7724..e9140115 100644 --- a/proto/radv/radv.c +++ b/proto/radv/radv.c @@ -297,7 +297,6 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf ifa->timer = tm_new_init(pool, radv_timer, ifa, 0, 0); struct object_lock *lock = olock_new(pool); - lock->addr = IPA_NONE; lock->type = OBJLOCK_IP; lock->port = ICMPV6_PROTO; lock->iface = iface; |