summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-07-07 15:09:26 +0000
committerNick Mathewson <nickm@torproject.org>2008-07-07 15:09:26 +0000
commit133f011c495670dbac2ce141f02e64869d6f5b62 (patch)
treed33e1230d7c67087e04488666ca6650af12f68e5
parent0e3efc1140b22e7b8891d109f15ebe5ab12ff9cc (diff)
downloadtor-133f011c495670dbac2ce141f02e64869d6f5b62.tar.gz
tor-133f011c495670dbac2ce141f02e64869d6f5b62.zip
Patch from coderman: detect transparent proxy header correctly on some linux versions.
svn:r15726
-rw-r--r--ChangeLog3
-rw-r--r--configure.in3
2 files changed, 6 insertions, 0 deletions
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