diff options
| author |   florian <florian@openbsd.org> | 2017-11-01 12:13:54 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2017-11-01 12:13:54 +0000 |
| commit | bd5f5a9a5e8881879d701917f94b5ec11a949e22 (patch) | |
| tree | ed5cd44326a026d84ccec064e2f9ceeebd89a1fc | |
| parent | Make ip-transparent option work by using SO_BINDANY. (diff) | |
| download | wireguard-openbsd-bd5f5a9a5e8881879d701917f94b5ec11a949e22.tar.xz wireguard-openbsd-bd5f5a9a5e8881879d701917f94b5ec11a949e22.zip | |
Make ip-transparent option work by using SO_BINDANY.
OK jca, benno
jca also points out that Delan Azabani (delan _AT_ azabani.com) wrote
exactly the same diff in 2016. It was OK bluhm but apparently never
commited.
| -rw-r--r-- | usr.sbin/nsd/server.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.sbin/nsd/server.c b/usr.sbin/nsd/server.c index c0835ce8c11..fe74f9a1b56 100644 --- a/usr.sbin/nsd/server.c +++ b/usr.sbin/nsd/server.c @@ -567,7 +567,7 @@ server_init_ifs(struct nsd *nsd, size_t from, size_t to, int* reuseport_works) { struct addrinfo* addr; size_t i; -#if defined(SO_REUSEPORT) || defined(SO_REUSEADDR) || (defined(INET6) && (defined(IPV6_V6ONLY) || defined(IPV6_USE_MIN_MTU) || defined(IPV6_MTU) || defined(IP_TRANSPARENT)) || defined(IP_FREEBIND)) +#if defined(SO_REUSEPORT) || defined(SO_REUSEADDR) || (defined(INET6) && (defined(IPV6_V6ONLY) || defined(IPV6_USE_MIN_MTU) || defined(IPV6_MTU) || defined(IP_TRANSPARENT)) || defined(IP_FREEBIND) || defined(SO_BINDANY)) int on = 1; #endif @@ -757,6 +757,12 @@ server_init_ifs(struct nsd *nsd, size_t from, size_t to, int* reuseport_works) strerror(errno)); } #endif /* IP_TRANSPARENT */ +#ifdef SO_BINDANY + if (setsockopt(nsd->udp[i].s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)) < 0) { + log_msg(LOG_ERR, "setsockopt(...,SO_BINDANY, ...) failed for udp: %s", + strerror(errno)); + } +#endif /* SO_BINDANY */ } if (bind(nsd->udp[i].s, (struct sockaddr *) addr->ai_addr, addr->ai_addrlen) != 0) { @@ -887,6 +893,12 @@ server_init_ifs(struct nsd *nsd, size_t from, size_t to, int* reuseport_works) strerror(errno)); } #endif /* IP_TRANSPARENT */ +#ifdef SO_BINDANY + if (setsockopt(nsd->tcp[i].s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)) < 0) { + log_msg(LOG_ERR, "setsockopt(...,SO_BINDANY, ...) failed for tcp: %s", + strerror(errno)); + } +#endif /* SO_BINDANY */ } if (bind(nsd->tcp[i].s, (struct sockaddr *) addr->ai_addr, addr->ai_addrlen) != 0) { |