mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

BFD: split of v4/v6 sockets

Browse Source
This commit is contained in:
Jan Moskyto Matejka
2016-01-07 11:29:05 +01:00
parent b9f5692186
commit 5b218c3d9b
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
proto/bfd/packets.c
View File

@@ -186,7 +186,7 @@ bfd_err_hook(sock *sk, int err)
}
sock *
bfd_open_rx_sk(struct bfd_proto *p, int multihop)
bfd_open_rx_sk(struct bfd_proto *p, int multihop, int inet_version)
{
sock *sk = sk_new(p->tpool);
sk->type = SK_UDP;
@@ -202,7 +202,18 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop)
sk->priority = sk_priority_control;
sk->flags = SKF_THREAD | SKF_LADDR_RX | (!multihop ? SKF_TTL_RX : 0);
sk->af = AF_INET6;
switch (inet_version) {
case 4:
sk->af = AF_INET;
sk->flags |= SKF_V4ONLY;
break;
case 6:
sk->af = AF_INET6;
sk->flags |= SKF_V6ONLY;
break;
default:
ASSERT(0);
}
if (sk_open(sk) < 0)
goto err;
@@ -235,7 +246,13 @@ bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa)
sk->ttl = ifa ? 255 : -1;
sk->flags = SKF_THREAD | SKF_BIND | SKF_HIGH_PORT;
sk->af = AF_INET6;
if (ipa_is_ip4(local)) {
sk->af = AF_INET;
sk->flags |= SKF_V4ONLY;
} else {
sk->af = AF_INET6;
sk->flags |= SKF_V6ONLY;
}
if (sk_open(sk) < 0)
goto err;