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/interfaceiter.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/interfaceiter.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/interfaceiter.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/interfaceiter.c b/usr.sbin/bind/lib/isc/unix/interfaceiter.c index acb88b6aa96..7f01777f8c1 100644 --- a/usr.sbin/bind/lib/isc/unix/interfaceiter.c +++ b/usr.sbin/bind/lib/isc/unix/interfaceiter.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfaceiter.c,v 1.3 2019/12/17 01:46:37 sthen Exp $ */ +/* $Id: interfaceiter.c,v 1.4 2020/01/09 13:45:33 florian Exp $ */ /*! \file */ @@ -67,11 +67,6 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, { struct sockaddr_in6 *sa6; -#if !defined(ISC_PLATFORM_HAVEIFNAMETOINDEX) || \ - !defined(ISC_PLATFORM_HAVESCOPEID) - UNUSED(ifname); -#endif - /* clear any remaining value for safety */ memset(dst, 0, sizeof(*dst)); @@ -86,7 +81,6 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, sa6 = (struct sockaddr_in6 *)src; memmove(&dst->type.in6, &sa6->sin6_addr, sizeof(struct in6_addr)); -#ifdef ISC_PLATFORM_HAVESCOPEID if (sa6->sin6_scope_id != 0) isc_netaddr_setzone(dst, sa6->sin6_scope_id); else { @@ -113,7 +107,6 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, (isc_uint32_t)zone16); dst->type.in6.s6_addr[2] = 0; dst->type.in6.s6_addr[3] = 0; -#ifdef ISC_PLATFORM_HAVEIFNAMETOINDEX } else if (ifname != NULL) { unsigned int zone; @@ -128,11 +121,9 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src, isc_netaddr_setzone(dst, (isc_uint32_t)zone); } -#endif } } } -#endif break; default: INSIST(0); |