Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki 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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proto/bfd/bfd.c
View file

@ -981,8 +981,10 @@ bfd_start(struct proto *P)
add_tail(&bfd_proto_list, &p->bfd_node); add_tail(&bfd_proto_list, &p->bfd_node);
birdloop_enter(p->loop); birdloop_enter(p->loop);
p->rx_1 = bfd_open_rx_sk(p, 0); p->rx4_1 = bfd_open_rx_sk(p, 0, 4);
p->rx_m = bfd_open_rx_sk(p, 1); p->rx4_m = bfd_open_rx_sk(p, 1, 4);
p->rx6_1 = bfd_open_rx_sk(p, 0, 6);
p->rx6_m = bfd_open_rx_sk(p, 1, 6);
birdloop_leave(p->loop); birdloop_leave(p->loop);
bfd_take_requests(p); bfd_take_requests(p);

8
proto/bfd/bfd.h
View file

@ -84,8 +84,10 @@ struct bfd_proto
sock *notify_ws; sock *notify_ws;
list notify_list; list notify_list;
sock *rx_1; sock *rx4_1;
sock *rx_m; sock *rx6_1;
sock *rx4_m;
sock *rx6_m;
list iface_list; list iface_list;
}; };
@ -184,7 +186,7 @@ void bfd_show_sessions(struct proto *P);
/* packets.c */ /* packets.c */
void bfd_send_ctl(struct bfd_proto *p, struct bfd_session *s, int final); void bfd_send_ctl(struct bfd_proto *p, struct bfd_session *s, int final);
sock * bfd_open_rx_sk(struct bfd_proto *p, int multihop); sock * bfd_open_rx_sk(struct bfd_proto *p, int multihop, int inet_version);
sock * bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa); sock * bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa);

19
proto/bfd/packets.c
View file

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