diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-01-05 22:12:15 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-01-05 22:12:15 +0000 |
| commit | 135aed567096cf45e64bea34326469c41daec67c (patch) | |
| tree | 602f6ee430650544b076a2af3f37549740bd0366 | |
| parent | 48a9fe4bbd82b30cacffa7211db4dd76ac398c21 (diff) | |
| download | tor-135aed567096cf45e64bea34326469c41daec67c.tar.gz tor-135aed567096cf45e64bea34326469c41daec67c.zip | |
r11850@Kushana: nickm | 2007-01-05 17:12:08 -0500
Look in netinet/in6.h header when looking for struct in6_addr. (Issue found by saeftl.)
svn:r9272
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | src/or/eventdns.c | 4 |
3 files changed, 15 insertions, 3 deletions
@@ -138,6 +138,7 @@ Changes in version 0.1.2.5-alpha - 2007-01-03 - When the user uses bad syntax in the Log config line, stop suggesting other bad syntax as a replacement. - Avoid a double-free when parsing malformed DirServer lines. + - Correctly detect ipv6 DNS capability on OpenBSD. o Controller features: - Have GETINFO dir/status/* work on hosts with DirPort disabled. diff --git a/configure.in b/configure.in index 3e5e540d0d..f495370d7a 100644 --- a/configure.in +++ b/configure.in @@ -472,7 +472,7 @@ AC_CHECK_HEADERS(zlib.h, , AC_MSG_ERROR(Zlib header (zlib.h) not found. Tor requ dnl These headers are not essential -AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h) +AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h inttypes.h utime.h sys/utime.h sys/mman.h netintet/in.h netinet/in6.h) AC_CHECK_HEADERS(net/if.h, [net_if_found=1], [net_if_found=0], [#ifdef HAVE_SYS_TYPES_H @@ -555,8 +555,15 @@ AC_CHECK_SIZEOF(size_t) AC_CHECK_TYPES([uint, u_char]) AC_CHECK_TYPES([struct in6_addr, struct sockaddr_storage], , , -[#include <netinet/in.h> -#include <sys/socket.h>]) +[#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN6_H +#include <netinet/in6.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif]) if test -z "$CROSS_COMPILE"; then AC_CACHE_CHECK([whether time_t is signed], tor_cv_time_t_signed, [ diff --git a/src/or/eventdns.c b/src/or/eventdns.c index cd5b386c07..97ee71bdb3 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -96,6 +96,10 @@ #include <arpa/inet.h> #endif +#ifdef HAVE_NETINET_IN6_H +#include <netinet/in6.h> +#endif + #ifdef WIN32 typedef int socklen_t; #endif |