]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 2895: Disable setsockopt(IP_TRANSPARENT) for TPROXYv2
authorAmos Jeffries <squid3@treenet.co.nz>
Fri, 23 Apr 2010 01:17:20 +0000 (13:17 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Fri, 23 Apr 2010 01:17:20 +0000 (13:17 +1200)
src/comm.cc

index 702e6d912fdeda19fd458809a81fff9325bf665e..3128c2e73f08bfc61717f25e8f87381f4f72d82a 100644 (file)
@@ -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 */
 }
 
 /**