upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix ip-transparent for tcp on freebsd.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3676 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-03-16 08:13:25 +00:00
parent 2e55b493c6
commit 1ce7fded61
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,5 +1,6 @@
16 March 2016: Wouter 16 March 2016: Wouter
- Fix ip-transparent for ipv6 on FreeBSD. - Fix ip-transparent for ipv6 on FreeBSD.
- Fix ip-transparent for tcp on freebsd.
15 March 2016: Wouter 15 March 2016: Wouter
- ip_freebind: yesno option in unbound.conf sets IP_FREEBIND for - ip_freebind: yesno option in unbound.conf sets IP_FREEBIND for

14
services/listen_dnsport.c
View file

@ -506,10 +506,10 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
int* reuseport, int transparent, int mss, int freebind) int* reuseport, int transparent, int mss, int freebind)
{ {
int s; int s;
#if defined(SO_REUSEADDR) || defined(SO_REUSEPORT) || defined(IPV6_V6ONLY) || defined(IP_TRANSPARENT) || defined(IP_FREEBIND) #if defined(SO_REUSEADDR) || defined(SO_REUSEPORT) || defined(IPV6_V6ONLY) || defined(IP_TRANSPARENT) || defined(IP_BINDANY) || defined(IP_FREEBIND)
int on = 1; int on = 1;
#endif #endif
#ifndef IP_TRANSPARENT #if !defined(IP_TRANSPARENT) && !defined(IP_BINDANY)
(void)transparent; (void)transparent;
#endif #endif
#if !defined(IP_FREEBIND) #if !defined(IP_FREEBIND)
@ -622,7 +622,15 @@ create_tcp_accept_sock(struct addrinfo *addr, int v6only, int* noproto,
log_warn("setsockopt(.. IP_TRANSPARENT ..) failed: %s", log_warn("setsockopt(.. IP_TRANSPARENT ..) failed: %s",
strerror(errno)); strerror(errno));
} }
#endif /* IP_TRANSPARENT */ #elif defined(IP_BINDANY)
if (transparent &&
setsockopt(s, (family==AF_INET6? IPPROTO_IPV6:IPPROTO_IP),
(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 */
if(bind(s, addr->ai_addr, addr->ai_addrlen) != 0) { if(bind(s, addr->ai_addr, addr->ai_addrlen) != 0) {
#ifndef USE_WINSOCK #ifndef USE_WINSOCK
/* detect freebsd jail with no ipv6 permission */ /* detect freebsd jail with no ipv6 permission */