From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 23 Apr 2010 01:17:20 +0000 (+1200)
Subject: Bug 2895: Disable setsockopt(IP_TRANSPARENT) for TPROXYv2
X-Git-Tag: SQUID_3_1_2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4031961bb768a20cf1292706c2b8c89fb1af208;p=thirdparty%2Fsquid.git

Bug 2895: Disable setsockopt(IP_TRANSPARENT) for TPROXYv2
---

diff --git a/src/comm.cc b/src/comm.cc
index 702e6d912f..3128c2e73f 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -681,6 +681,7 @@ comm_set_v6only(int fd, int tos)
 void
 comm_set_transparent(int fd)
 {
+#if !LINUX_TPROXY2
 #if defined(IP_TRANSPARENT)
     int tos = 1;
     if (setsockopt(fd, SOL_IP, IP_TRANSPARENT, (char *) &tos, sizeof(int)) < 0) {
@@ -692,6 +693,7 @@ comm_set_transparent(int fd)
 #else
     debugs(50, DBG_CRITICAL, "WARNING: comm_open: setsockopt(IP_TRANSPARENT) not supported on this platform");
 #endif /* sockopt */
+#endif /* !LINUX_TPROXY2 */
 }
 
 /**