mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

Remove support for legacy platforms without in6addr_loopback

Browse Source
This commit is contained in:
Ondřej Surý
2018-08-21 13:07:05 +02:00
parent 5083a42072
commit 4150a86046
5 changed files with 2 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
configure vendored
View File

@@ -750,7 +750,6 @@ ISC_PLATFORM_HAVEIF_LADDRREQ
ISC_PLATFORM_HAVESCOPEID ISC_PLATFORM_HAVESCOPEID
ISC_PLATFORM_HAVESOCKADDRSTORAGE ISC_PLATFORM_HAVESOCKADDRSTORAGE
ISC_PLATFORM_HAVEIN6PKTINFO ISC_PLATFORM_HAVEIN6PKTINFO
ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
BIND9_CO_RULE BIND9_CO_RULE
LIBTOOL_ALLOW_UNDEFINED LIBTOOL_ALLOW_UNDEFINED
LIBTOOL_MODE_UNINSTALL LIBTOOL_MODE_UNINSTALL
@@ -17847,6 +17846,7 @@ main ()
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
struct in6_addr in6; struct in6_addr in6;
in6 = in6addr_any; in6 = in6addr_any;
in6 = in6addr_loopback;
return (0); return (0);
; ;
@@ -17864,37 +17864,6 @@ See \`config.log' for more details" "$LINENO" 5; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in6addr_loopback" >&5
$as_echo_n "checking for in6addr_loopback... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
$isc_in_addr6_hack
int
main ()
{
struct in6_addr in6; in6 = in6addr_loopback; return (in6.s6_addr[0]);
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#define ISC_PLATFORM_NEEDIN6ADDRLOOPBACK 1"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin6_scope_id in struct sockaddr_in6" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin6_scope_id in struct sockaddr_in6" >&5
$as_echo_n "checking for sin6_scope_id in struct sockaddr_in6... " >&6; } $as_echo_n "checking for sin6_scope_id in struct sockaddr_in6... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17987,7 +17956,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct if_laddrreq" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct if_laddrreq" >&5
$as_echo_n "checking for struct if_laddrreq... " >&6; } $as_echo_n "checking for struct if_laddrreq... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext

19
configure.in
View File

@@ -1946,28 +1946,12 @@ AC_COMPILE_IFELSE(
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
struct in6_addr in6; struct in6_addr in6;
in6 = in6addr_any; in6 = in6addr_any;
in6 = in6addr_loopback;
return (0); return (0);
]])], ]])],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])],
[AC_MSG_FAILURE([IPv6 support is mandatory])]) [AC_MSG_FAILURE([IPv6 support is mandatory])])
AC_MSG_CHECKING([for in6addr_loopback])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
$isc_in_addr6_hack
]],
[[
struct in6_addr in6; in6 = in6addr_loopback; return (in6.s6_addr[0]);
]])],
[AC_MSG_RESULT(yes)
ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK"],
[AC_MSG_RESULT(no)
ISC_PLATFORM_NEEDIN6ADDRLOOPBACK="#define ISC_PLATFORM_NEEDIN6ADDRLOOPBACK 1"])
AC_MSG_CHECKING([for sin6_scope_id in struct sockaddr_in6]) AC_MSG_CHECKING([for sin6_scope_id in struct sockaddr_in6])
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
@@ -2011,7 +1995,6 @@ ISC_PLATFORM_HAVESOCKADDRSTORAGE="#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1"],
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
ISC_PLATFORM_HAVESOCKADDRSTORAGE="#undef ISC_PLATFORM_HAVESOCKADDRSTORAGE"]) ISC_PLATFORM_HAVESOCKADDRSTORAGE="#undef ISC_PLATFORM_HAVESOCKADDRSTORAGE"])
AC_SUBST(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
AC_SUBST(ISC_PLATFORM_HAVEIN6PKTINFO) AC_SUBST(ISC_PLATFORM_HAVEIN6PKTINFO)
AC_SUBST(ISC_PLATFORM_HAVESOCKADDRSTORAGE) AC_SUBST(ISC_PLATFORM_HAVESOCKADDRSTORAGE)
AC_SUBST(ISC_PLATFORM_HAVESCOPEID) AC_SUBST(ISC_PLATFORM_HAVESCOPEID)

6
lib/isc/include/isc/platform.h.in
View File

@@ -36,12 +36,6 @@
*/ */
@ISC_PLATFORM_HAVESALEN@ @ISC_PLATFORM_HAVESALEN@
/*! \brief
* If this system is missing in6addr_loopback, ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
* will be defined.
*/
@ISC_PLATFORM_NEEDIN6ADDRLOOPBACK@
/*! \brief /*! \brief
* If this system has in6_pktinfo, ISC_PLATFORM_HAVEIN6PKTINFO will be * If this system has in6_pktinfo, ISC_PLATFORM_HAVEIN6PKTINFO will be
* defined. * defined.

5
lib/isc/unix/include/isc/net.h
View File

@@ -193,11 +193,6 @@ struct sockaddr_storage {
}; };
#endif #endif
#if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
extern const struct in6_addr isc_net_in6addrloop;
#define in6addr_loopback isc_net_in6addrloop
#endif
#ifdef ISC_PLATFORM_NEEDPORTT #ifdef ISC_PLATFORM_NEEDPORTT
/*% /*%
* Ensure type in_port_t is defined. * Ensure type in_port_t is defined.

4
lib/isc/unix/net.c
View File

@@ -93,10 +93,6 @@
#endif /* HAVE_SYSCTLBYNAME */ #endif /* HAVE_SYSCTLBYNAME */
#if defined(ISC_PLATFORM_NEEDIN6ADDRLOOPBACK)
const struct in6_addr isc_net_in6addrloop = IN6ADDR_LOOPBACK_INIT;
#endif
static isc_once_t once_ipv6only = ISC_ONCE_INIT; static isc_once_t once_ipv6only = ISC_ONCE_INIT;
#if defined(ISC_PLATFORM_HAVEIN6PKTINFO) #if defined(ISC_PLATFORM_HAVEIN6PKTINFO)