From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Jul 2008 15:09:26 +0000 (+0000)
Subject: Patch from coderman: detect transparent proxy header correctly on some linux versions.
X-Git-Tag: tor-0.2.1.3-alpha~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=133f011c495670dbac2ce141f02e64869d6f5b62;p=thirdparty%2Ftor.git

Patch from coderman: detect transparent proxy header correctly on some linux versions.

svn:r15726
---

diff --git a/ChangeLog b/ChangeLog
index 9ea244bf47..eaa8781ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,9 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
     - When opening /dev/null in finish_daemonize(), do not pass the
       O_CREAT flag.  Fortify was complaining, and correctly so.  Fixes
       bug 742; fix from Michael Scherer.  Bugfix on 0.0.2pre19.
+    - Correctly detect transparent proxy support on Linux hosts that
+      require in.h to be included before netfilter_ipv4.h.  Patch from
+      coderman.
 
 
 Changes in version 0.2.1.2-alpha - 2008-06-20
diff --git a/configure.in b/configure.in
index 3c55f06200..c266e31b5e 100644
--- a/configure.in
+++ b/configure.in
@@ -349,6 +349,9 @@ AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
 #endif])
 
 if test x$transparent = xtrue ; then