diff options
author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-01-07 12:02:54 +0100 |
---|---|---|
committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-01-11 09:29:51 +0100 |
commit | 6ffa8f53931e2ae8becf8ec6ef09db88737a6a06 (patch) | |
tree | c4a2a01133834c41f058d24947964184ca779bcc /proto | |
parent | 5b218c3d9bf9357aed0acf535bdfc6684cc5cda4 (diff) |
Hidden AF_INET* inside sysdep/
Diffstat (limited to 'proto')
-rw-r--r-- | proto/bfd/packets.c | 8 | ||||
-rw-r--r-- | proto/ospf/iface.c | 4 | ||||
-rw-r--r-- | proto/radv/packets.c | 2 | ||||
-rw-r--r-- | proto/rip/packets.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/proto/bfd/packets.c b/proto/bfd/packets.c index a28e4c50..b7a057f1 100644 --- a/proto/bfd/packets.c +++ b/proto/bfd/packets.c @@ -204,11 +204,11 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop, int inet_version) switch (inet_version) { case 4: - sk->af = AF_INET; + sk->fam = SK_FAM_IPV4; sk->flags |= SKF_V4ONLY; break; case 6: - sk->af = AF_INET6; + sk->fam = SK_FAM_IPV6; sk->flags |= SKF_V6ONLY; break; default: @@ -247,10 +247,10 @@ bfd_open_tx_sk(struct bfd_proto *p, ip_addr local, struct iface *ifa) sk->flags = SKF_THREAD | SKF_BIND | SKF_HIGH_PORT; if (ipa_is_ip4(local)) { - sk->af = AF_INET; + sk->fam = SK_FAM_IPV4; sk->flags |= SKF_V4ONLY; } else { - sk->af = AF_INET6; + sk->fam = SK_FAM_IPV6; sk->flags |= SKF_V6ONLY; } diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 8c997ced..6001ac26 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -111,7 +111,7 @@ ospf_sk_open(struct ospf_iface *ifa) sk->dport = OSPF_PROTO; sk->saddr = ifa->addr->ip; sk->iface = ifa->iface; - sk->af = ospf_is_v2(p) ? AF_INET : AF_INET6; + sk->fam = ospf_is_v2(p) ? SK_FAM_IPV4 : SK_FAM_IPV6; sk->tos = ifa->cf->tx_tos; sk->priority = ifa->cf->tx_priority; @@ -194,7 +194,7 @@ ospf_open_vlink_sk(struct ospf_proto *p) sock *sk = sk_new(p->p.pool); sk->type = SK_IP; sk->dport = OSPF_PROTO; - sk->af = ospf_is_v2(p) ? AF_INET : AF_INET6; + sk->fam = ospf_is_v2(p) ? SK_FAM_IPV4 : SK_FAM_IPV6; /* FIXME: configurable tos/priority ? */ sk->tos = IP_PREC_INTERNET_CONTROL; diff --git a/proto/radv/packets.c b/proto/radv/packets.c index 3bb38221..8f6a1913 100644 --- a/proto/radv/packets.c +++ b/proto/radv/packets.c @@ -412,7 +412,7 @@ radv_sk_open(struct radv_iface *ifa) sk->type = SK_IP; sk->dport = ICMPV6_PROTO; sk->saddr = ifa->addr->ip; - sk->af = AF_INET6; + sk->fam = SK_FAM_IPV6; sk->ttl = 255; /* Mandatory for Neighbor Discovery packets */ sk->rx_hook = radv_rx_hook; diff --git a/proto/rip/packets.c b/proto/rip/packets.c index 1017eb92..d6968c96 100644 --- a/proto/rip/packets.c +++ b/proto/rip/packets.c @@ -713,7 +713,7 @@ rip_open_socket(struct rip_iface *ifa) sock *sk = sk_new(p->p.pool); sk->type = SK_UDP; - sk->af = rip_is_v2(p) ? AF_INET : AF_INET6; + sk->fam = rip_is_v2(p) ? SK_FAM_IPV4 : SK_FAM_IPV6; sk->sport = ifa->cf->port; sk->dport = ifa->cf->port; sk->iface = ifa->iface; |