From 2e55b493c6fd8a55e3b19e8131bf93165971f7e2 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Wed, 16 Mar 2016 07:20:35 +0000 Subject: [PATCH] - Fix ip-transparent for ipv6 on FreeBSD. git-svn-id: file:///svn/unbound/trunk@3675 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ services/listen_dnsport.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 9024031fb..83401e3fa 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +16 March 2016: Wouter + - Fix ip-transparent for ipv6 on FreeBSD. + 15 March 2016: Wouter - ip_freebind: yesno option in unbound.conf sets IP_FREEBIND for binding to an IP address while the interface or address is down. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 6b844b0c9..0aa3a3c98 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -202,9 +202,10 @@ create_udp_sock(int family, int socktype, struct sockaddr* addr, #elif defined(IP_BINDANY) if (transparent && setsockopt(s, (family==AF_INET6? IPPROTO_IPV6:IPPROTO_IP), - IP_BINDANY, (void*)&on, (socklen_t)sizeof(on)) < 0) { - log_warn("setsockopt(.. IP_BINDANY ..) failed: %s", - strerror(errno)); + (family == AF_INET6? IPV6_BINDANY:IP_BINDANY), + (void*)&on, (socklen_t)sizeof(on)) < 0) { + log_warn("setsockopt(.. IP%s_BINDANY ..) failed: %s", + (family==AF_INET6?"V6":""), strerror(errno)); } #endif /* IP_TRANSPARENT || IP_BINDANY */ }