mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
1454. [port] Use getifaddrs() if available for interface scanning.
--disable-getifaddrs to override. Glibc currently
has a getifaddrs() that does not support IPv6.
Use --enable-getifaddrs=glibc to force the use of
this version under linux machines.
This commit is contained in:
Mark Andrews
parent
e9f2290397
commit
8ca42f6318
6 changed files with 234 additions and 6 deletions
6
CHANGES
6
CHANGES
|
|
@ -1,3 +1,9 @@
|
|||
1454. [port] Use getifaddrs() if available for interface scanning.
|
||||
--disable-getifaddrs to override. Glibc currently
|
||||
has a getifaddrs() that does not support IPv6.
|
||||
Use --enable-getifaddrs=glibc to force the use of
|
||||
this version under linux machines.
|
||||
|
||||
1453. [doc] ARM: $GENERATE example wasn't accurate. [RT #5298]
|
||||
|
||||
1452. [placeholder]
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: acconfig.h,v 1.39 2002/12/04 01:19:27 marka Exp $ */
|
||||
/* $Id: acconfig.h,v 1.40 2003/04/01 05:18:21 marka Exp $ */
|
||||
|
||||
/***
|
||||
*** This file is not to be included by any public header files, because
|
||||
|
|
@ -53,6 +53,9 @@
|
|||
/* define if catgets() is available */
|
||||
#undef HAVE_CATGETS
|
||||
|
||||
/* define if getifaddrs() exists */
|
||||
#undef HAVE_GETIFADDRS
|
||||
|
||||
/* define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */
|
||||
#undef HAVE_IFLIST_SYSCTL
|
||||
|
||||
|
|
|
|||
40
configure.in
40
configure.in
|
|
@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
|
|||
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
|
||||
AC_DIVERT_POP()dnl
|
||||
|
||||
AC_REVISION($Revision: 1.339 $)
|
||||
AC_REVISION($Revision: 1.340 $)
|
||||
|
||||
AC_INIT(lib/dns/name.c)
|
||||
AC_PREREQ(2.13)
|
||||
|
|
@ -1501,6 +1501,44 @@ AC_SUBST(ISC_LWRES_GETIPNODEPROTO)
|
|||
AC_SUBST(ISC_LWRES_GETADDRINFOPROTO)
|
||||
AC_SUBST(ISC_LWRES_GETNAMEINFOPROTO)
|
||||
|
||||
AC_ARG_ENABLE(getifaddrs,
|
||||
[ --enable-getifaddrs Enable the use of getifaddrs() [[yes|no|glibc]].
|
||||
glibc: Use getifaddrs() in glibc if you know it supports IPv6.],
|
||||
want_getifaddrs="$enableval", want_getifaddrs="yes")
|
||||
|
||||
case $want_getifaddrs in
|
||||
yes|libc)
|
||||
#
|
||||
# Do we have getifaddrs() ?
|
||||
#
|
||||
case $host in
|
||||
*-linux*)
|
||||
# Some recent versions of glibc support getifaddrs() which does not
|
||||
# provide AF_INET6 addresses while the function provided by the USAGI
|
||||
# project handles the AF_INET6 case correctly. We need to avoid
|
||||
# using the former but prefer the latter unless overridden by
|
||||
# --enable-getifaddrs=glibc.
|
||||
if $use_getifaddrs = glibc
|
||||
then
|
||||
AC_CHECK_FUNC(getifaddrs, AC_DEFINE(HAVE_GETIFADDRS))
|
||||
else
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="-L/usr/local/v6/lib $LIBS"
|
||||
AC_CHECK_LIB(inet6, getifaddrs,
|
||||
LIBS="$LIBS -linet6"
|
||||
AC_DEFINE(HAVE_GETIFADDRS),
|
||||
LIBS=${save_LIBS})
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_CHECK_FUNC(getifaddrs, AC_DEFINE(HAVE_GETIFADDRS))
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
no)
|
||||
;;
|
||||
esac
|
||||
|
||||
#
|
||||
# Look for a sysctl call to get the list of network interfaces.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: msgs.h,v 1.7 2002/05/27 00:40:18 marka Exp $ */
|
||||
/* $Id: msgs.h,v 1.8 2003/04/01 05:18:22 marka Exp $ */
|
||||
|
||||
#ifndef ISC_MSGS_H
|
||||
#define ISC_MSGS_H 1
|
||||
|
|
@ -48,6 +48,7 @@
|
|||
#define ISC_MSGSET_TASK 18
|
||||
#define ISC_MSGSET_TIMER 19
|
||||
#define ISC_MSGSET_UTIL 20
|
||||
#define ISC_MSGSET_IFITERGETIFADDRS 21
|
||||
|
||||
/*
|
||||
* Message numbers. They are only required to be unique per message set,
|
||||
|
|
@ -176,6 +177,7 @@
|
|||
#define ISC_MSG_UTILWAIT 1710 /* "WAIT" */
|
||||
#define ISC_MSG_WAITED 1711 /* "WAITED" */
|
||||
|
||||
#define ISC_MSG_GETIFADDRS 1801 /* "getting interface addresses: ..." */
|
||||
|
||||
|
||||
#endif /* ISC_MSGS_H */
|
||||
|
|
|
|||
176
lib/isc/unix/ifiter_getifaddrs.c
Normal file
176
lib/isc/unix/ifiter_getifaddrs.c
Normal file
|
|
@ -0,0 +1,176 @@
|
|||
/*
|
||||
* Copyright (C) 1999-2003 Internet Software Consortium.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
|
||||
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
|
||||
* INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
|
||||
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: ifiter_getifaddrs.c,v 1.2 2003/04/01 05:18:22 marka Exp $ */
|
||||
|
||||
/*
|
||||
* Obtain the list of network interfaces using the getifaddrs(3) library.
|
||||
*/
|
||||
|
||||
#include <ifaddrs.h>
|
||||
|
||||
#define IFITER_MAGIC ISC_MAGIC('I', 'F', 'I', 'G')
|
||||
#define VALID_IFITER(t) ISC_MAGIC_VALID(t, IFITER_MAGIC)
|
||||
|
||||
struct isc_interfaceiter {
|
||||
unsigned int magic; /* Magic number. */
|
||||
isc_mem_t *mctx;
|
||||
void *buf; /* (unused) */
|
||||
unsigned int bufsize; /* (always 0) */
|
||||
struct ifaddrs *ifaddrs; /* List of ifaddrs */
|
||||
struct ifaddrs *pos; /* Ptr to current ifaddr */
|
||||
isc_interface_t current; /* Current interface data. */
|
||||
isc_result_t result; /* Last result code. */
|
||||
};
|
||||
|
||||
isc_result_t
|
||||
isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
|
||||
isc_interfaceiter_t *iter;
|
||||
isc_result_t result;
|
||||
char strbuf[ISC_STRERRORSIZE];
|
||||
|
||||
REQUIRE(mctx != NULL);
|
||||
REQUIRE(iterp != NULL);
|
||||
REQUIRE(*iterp == NULL);
|
||||
|
||||
iter = isc_mem_get(mctx, sizeof(*iter));
|
||||
if (iter == NULL)
|
||||
return (ISC_R_NOMEMORY);
|
||||
|
||||
iter->mctx = mctx;
|
||||
iter->buf = NULL;
|
||||
iter->bufsize = 0;
|
||||
iter->ifaddrs = NULL;
|
||||
|
||||
if (getifaddrs(&iter->ifaddrs) < 0) {
|
||||
isc__strerror(errno, strbuf, sizeof(strbuf));
|
||||
UNEXPECTED_ERROR(__FILE__, __LINE__,
|
||||
isc_msgcat_get(isc_msgcat,
|
||||
ISC_MSGSET_IFITERGETIFADDRS,
|
||||
ISC_MSG_GETIFADDRS,
|
||||
"getting interface "
|
||||
"addresses: getifaddrs: %s"),
|
||||
strbuf);
|
||||
result = ISC_R_UNEXPECTED;
|
||||
goto failure;
|
||||
}
|
||||
|
||||
/*
|
||||
* A newly created iterator has an undefined position
|
||||
* until isc_interfaceiter_first() is called.
|
||||
*/
|
||||
iter->pos = NULL;
|
||||
iter->result = ISC_R_FAILURE;
|
||||
|
||||
iter->magic = IFITER_MAGIC;
|
||||
*iterp = iter;
|
||||
return (ISC_R_SUCCESS);
|
||||
|
||||
failure:
|
||||
if (iter->ifaddrs != NULL) /* just in case */
|
||||
freeifaddrs(iter->ifaddrs);
|
||||
isc_mem_put(mctx, iter, sizeof(*iter));
|
||||
return (result);
|
||||
}
|
||||
|
||||
/*
|
||||
* Get information about the current interface to iter->current.
|
||||
* If successful, return ISC_R_SUCCESS.
|
||||
* If the interface has an unsupported address family,
|
||||
* return ISC_R_IGNORE.
|
||||
*/
|
||||
|
||||
static isc_result_t
|
||||
internal_current(isc_interfaceiter_t *iter) {
|
||||
struct ifaddrs *ifa;
|
||||
int family;
|
||||
unsigned int namelen;
|
||||
|
||||
REQUIRE(VALID_IFITER(iter));
|
||||
|
||||
ifa = iter->pos;
|
||||
|
||||
INSIST(ifa != NULL);
|
||||
INSIST(ifa->ifa_name != NULL);
|
||||
INSIST(ifa->ifa_addr != NULL);
|
||||
|
||||
family = ifa->ifa_addr->sa_family;
|
||||
if (family != AF_INET && family != AF_INET6)
|
||||
return (ISC_R_IGNORE);
|
||||
|
||||
memset(&iter->current, 0, sizeof(iter->current));
|
||||
|
||||
namelen = strlen(ifa->ifa_name);
|
||||
if (namelen > sizeof(iter->current.name) - 1)
|
||||
namelen = sizeof(iter->current.name) - 1;
|
||||
|
||||
memset(iter->current.name, 0, sizeof(iter->current.name));
|
||||
memcpy(iter->current.name, ifa->ifa_name, namelen);
|
||||
|
||||
iter->current.flags = 0;
|
||||
|
||||
if ((ifa->ifa_flags & IFF_UP) != 0)
|
||||
iter->current.flags |= INTERFACE_F_UP;
|
||||
|
||||
if ((ifa->ifa_flags & IFF_POINTOPOINT) != 0)
|
||||
iter->current.flags |= INTERFACE_F_POINTTOPOINT;
|
||||
|
||||
if ((ifa->ifa_flags & IFF_LOOPBACK) != 0)
|
||||
iter->current.flags |= INTERFACE_F_LOOPBACK;
|
||||
|
||||
iter->current.af = family;
|
||||
|
||||
get_addr(family, &iter->current.address, ifa->ifa_addr);
|
||||
|
||||
if (ifa->ifa_netmask != NULL)
|
||||
get_addr(family, &iter->current.netmask, ifa->ifa_netmask);
|
||||
|
||||
if (ifa->ifa_dstaddr != NULL &&
|
||||
(iter->current.flags & IFF_POINTOPOINT) != 0)
|
||||
get_addr(family, &iter->current.dstaddress, ifa->ifa_dstaddr);
|
||||
|
||||
return (ISC_R_SUCCESS);
|
||||
}
|
||||
|
||||
/*
|
||||
* Step the iterator to the next interface. Unlike
|
||||
* isc_interfaceiter_next(), this may leave the iterator
|
||||
* positioned on an interface that will ultimately
|
||||
* be ignored. Return ISC_R_NOMORE if there are no more
|
||||
* interfaces, otherwise ISC_R_SUCCESS.
|
||||
*/
|
||||
static isc_result_t
|
||||
internal_next(isc_interfaceiter_t *iter) {
|
||||
iter->pos = iter->pos->ifa_next;
|
||||
|
||||
if (iter->pos == NULL)
|
||||
return (ISC_R_NOMORE);
|
||||
|
||||
return (ISC_R_SUCCESS);
|
||||
}
|
||||
|
||||
static void
|
||||
internal_destroy(isc_interfaceiter_t *iter) {
|
||||
if (iter->ifaddrs)
|
||||
freeifaddrs(iter->ifaddrs);
|
||||
iter->ifaddrs = NULL;
|
||||
}
|
||||
|
||||
static
|
||||
void internal_first(isc_interfaceiter_t *iter) {
|
||||
iter->pos = iter->ifaddrs;
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: interfaceiter.c,v 1.32 2003/03/03 01:42:59 marka Exp $ */
|
||||
/* $Id: interfaceiter.c,v 1.33 2003/04/01 05:18:22 marka Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -118,7 +118,9 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
|
|||
* Include system-dependent code.
|
||||
*/
|
||||
|
||||
#if HAVE_IFLIST_SYSCTL
|
||||
#if HAVE_GETIFADDRS
|
||||
#include "ifiter_getifaddrs.c"
|
||||
#elif HAVE_IFLIST_SYSCTL
|
||||
#include "ifiter_sysctl.c"
|
||||
#else
|
||||
#include "ifiter_ioctl.c"
|
||||
|
|
@ -184,7 +186,8 @@ isc_interfaceiter_destroy(isc_interfaceiter_t **iterp)
|
|||
REQUIRE(VALID_IFITER(iter));
|
||||
|
||||
internal_destroy(iter);
|
||||
isc_mem_put(iter->mctx, iter->buf, iter->bufsize);
|
||||
if (iter->buf != NULL)
|
||||
isc_mem_put(iter->mctx, iter->buf, iter->bufsize);
|
||||
|
||||
iter->magic = 0;
|
||||
isc_mem_put(iter->mctx, iter, sizeof(*iter));
|
||||
|
|
|
|||
Loading…
Reference in a new issue