summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-07-07 15:17:23 +0000
committerNick Mathewson <nickm@torproject.org>2008-07-07 15:17:23 +0000
commit2eda750489196757e1aefff6b2920e8bbace4f2e (patch)
tree5d7c81ed996f529c024cc8fc5512e54562af2601
parentbeeacfde3ad0cc789b417a5848e39f7b94cc6465 (diff)
downloadtor-2eda750489196757e1aefff6b2920e8bbace4f2e.tar.gz
tor-2eda750489196757e1aefff6b2920e8bbace4f2e.zip
Backport: Patch from coderman: detect transparent proxy header correctly on some linux versions.
svn:r15727
-rw-r--r--ChangeLog3
-rw-r--r--configure.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 539615c97b..face8a63ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@ Changes in version 0.2.0.29 - 2008-06-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.0.28-rc - 2008-06-13
diff --git a/configure.in b/configure.in
index d94e0ddab5..b4a84328b1 100644
--- a/configure.in
+++ b/configure.in
@@ -335,6 +335,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