From 08b3a24da5bbd1bab09d6a2400cdf7705d5e18a7 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Tue, 17 May 2016 15:21:49 +0200 Subject: IO: Minor changes in socket AF handing AF can be specified implicitly by saddr or daddr, flags SKF_V4ONLY and SKF_V6ONLY are to be removed. --- proto/rip/packets.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'proto/rip/packets.c') diff --git a/proto/rip/packets.c b/proto/rip/packets.c index 488ac9df..f89bb178 100644 --- a/proto/rip/packets.c +++ b/proto/rip/packets.c @@ -715,7 +715,7 @@ rip_open_socket(struct rip_iface *ifa) sock *sk = sk_new(p->p.pool); sk->type = SK_UDP; - sk->fam = rip_is_v2(p) ? SK_FAM_IPV4 : SK_FAM_IPV6; + sk->subtype = rip_is_v2(p) ? SK_IPV4 : SK_IPV6; sk->sport = ifa->cf->port; sk->dport = ifa->cf->port; sk->iface = ifa->iface; @@ -736,8 +736,7 @@ rip_open_socket(struct rip_iface *ifa) sk->tos = ifa->cf->tx_tos; sk->priority = ifa->cf->tx_priority; sk->ttl = ifa->cf->ttl_security ? 255 : 1; - sk->flags = SKF_LADDR_RX | (rip_is_ng(p) ? SKF_V6ONLY : 0) | - ((ifa->cf->ttl_security == 1) ? SKF_TTL_RX : 0); + sk->flags = SKF_LADDR_RX | ((ifa->cf->ttl_security == 1) ? SKF_TTL_RX : 0); /* sk->rbsize and sk->tbsize are handled in rip_iface_update_buffers() */ -- cgit v1.2.3