diff options
| author |   florian <florian@openbsd.org> | 2020-01-09 13:45:33 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-01-09 13:45:33 +0000 |
| commit | 3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363 (patch) | |
| tree | d7ed8d04fb3e623e5b0154f396089b9933cee0ac /usr.sbin/bind/lib/isc/unix/net.c | |
| parent | Move peer related code from rde.c to rde_peer.c. (diff) | |
| download | wireguard-openbsd-3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363.tar.xz wireguard-openbsd-3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363.zip | |
unifdef network defines:
#define ISC_PLATFORM_HAVESALEN 1
#define ISC_PLATFORM_HAVEIPV6 1
#undef ISC_PLATFORM_NEEDIN6ADDRANY
#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
#define ISC_PLATFORM_HAVEIN6PKTINFO 1
#undef ISC_PLATFORM_HAVEINADDR6
#define ISC_PLATFORM_HAVESCOPEID 1
#undef ISC_PLATFORM_NEEDNTOP
#undef ISC_PLATFORM_NEEDPTON
#undef ISC_PLATFORM_NEEDPORTT
#undef ISC_PLATFORM_HAVELIFCONF
#undef ISC_PLATFORM_HAVEIF_LADDRCONF
#undef ISC_PLATFORM_HAVEIF_LADDRREQ
#define ISC_NET_BSD44MSGHDR 1
#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
#undef ISC_PLATFORM_FIXIN6ISADDR
#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1
#define ISC_PLATFORM_HAVEKQUEUE 1
#undef ISC_PLATFORM_HAVEEPOLL
#undef ISC_PLATFORM_HAVEDEVPOLL
prodding deraadt@
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix/net.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/net.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/net.c b/usr.sbin/bind/lib/isc/unix/net.c index d88dbd65616..9988989e3dd 100644 --- a/usr.sbin/bind/lib/isc/unix/net.c +++ b/usr.sbin/bind/lib/isc/unix/net.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: net.c,v 1.9 2019/12/19 03:57:28 deraadt Exp $ */ +/* $Id: net.c,v 1.10 2020/01/09 13:45:33 florian Exp $ */ #include <config.h> @@ -98,23 +98,11 @@ #endif /* HAVE_SYSCTLBYNAME */ -#if defined(ISC_PLATFORM_HAVEIPV6) -# if defined(ISC_PLATFORM_NEEDIN6ADDRANY) -const struct in6_addr isc_net_in6addrany = IN6ADDR_ANY_INIT; -# endif - -# if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK) -const struct in6_addr isc_net_in6addrloop = IN6ADDR_LOOPBACK_INIT; -# endif - # if defined(WANT_IPV6) static isc_once_t once_ipv6only = ISC_ONCE_INIT; -# if defined(ISC_PLATFORM_HAVEIN6PKTINFO) static isc_once_t once_ipv6pktinfo = ISC_ONCE_INIT; -# endif # endif /* WANT_IPV6 */ -#endif /* ISC_PLATFORM_HAVEIPV6 */ #ifndef ISC_CMSG_IP_TOS #ifdef __APPLE__ @@ -170,9 +158,7 @@ try_proto(int domain) { } } -#ifdef ISC_PLATFORM_HAVEIPV6 #ifdef WANT_IPV6 -#ifdef ISC_PLATFORM_HAVEIN6PKTINFO if (domain == PF_INET6) { struct sockaddr_in6 sin6; unsigned int len; @@ -211,8 +197,6 @@ try_proto(int domain) { } } #endif -#endif -#endif (void)close(s); @@ -222,13 +206,9 @@ try_proto(int domain) { static void initialize_action(void) { ipv4_result = try_proto(PF_INET); -#ifdef ISC_PLATFORM_HAVEIPV6 #ifdef WANT_IPV6 -#ifdef ISC_PLATFORM_HAVEIN6PKTINFO ipv6_result = try_proto(PF_INET6); #endif -#endif -#endif } static void @@ -254,7 +234,6 @@ isc_net_probeunix(void) { return (unix_result); } -#ifdef ISC_PLATFORM_HAVEIPV6 #ifdef WANT_IPV6 static void try_ipv6only(void) { @@ -333,7 +312,6 @@ initialize_ipv6only(void) { } #endif /* WANT_IPV6 */ -#ifdef ISC_PLATFORM_HAVEIN6PKTINFO #ifdef WANT_IPV6 static void try_ipv6pktinfo(void) { @@ -387,32 +365,24 @@ initialize_ipv6pktinfo(void) { try_ipv6pktinfo) == ISC_R_SUCCESS); } #endif /* WANT_IPV6 */ -#endif /* ISC_PLATFORM_HAVEIN6PKTINFO */ -#endif /* ISC_PLATFORM_HAVEIPV6 */ isc_result_t isc_net_probe_ipv6only(void) { -#ifdef ISC_PLATFORM_HAVEIPV6 #ifdef WANT_IPV6 initialize_ipv6only(); #else ipv6only_result = ISC_R_NOTFOUND; #endif -#endif return (ipv6only_result); } isc_result_t isc_net_probe_ipv6pktinfo(void) { -#ifdef ISC_PLATFORM_HAVEIPV6 -#ifdef ISC_PLATFORM_HAVEIN6PKTINFO #ifdef WANT_IPV6 initialize_ipv6pktinfo(); #else ipv6pktinfo_result = ISC_R_NOTFOUND; #endif -#endif -#endif return (ipv6pktinfo_result); } |