[or-cvs] r9272: Look in netinet/in6.h header when looking for struct in6_add (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-01-05 17:12:15 -0500 (Fri, 05 Jan 2007)
New Revision: 9272

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/configure.in
   tor/trunk/src/or/eventdns.c
Log:
 r11850 at 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.)



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/branches/0125alpha [r11850] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-01-05 06:59:36 UTC (rev 9271)
+++ tor/trunk/ChangeLog	2007-01-05 22:12:15 UTC (rev 9272)
@@ -138,6 +138,7 @@
     - 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.

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-01-05 06:59:36 UTC (rev 9271)
+++ tor/trunk/configure.in	2007-01-05 22:12:15 UTC (rev 9272)
@@ -472,7 +472,7 @@
 
 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_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, [

Modified: tor/trunk/src/or/eventdns.c
===================================================================
--- tor/trunk/src/or/eventdns.c	2007-01-05 06:59:36 UTC (rev 9271)
+++ tor/trunk/src/or/eventdns.c	2007-01-05 22:12:15 UTC (rev 9272)
@@ -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