From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 29 Nov 2012 10:38:43 +0000 (-0700)
Subject: Fix accept_filter on Linux
X-Git-Tag: SQUID_3_3_0_2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac5d9cbaec535939038d137213ffd7ba4237568;p=thirdparty%2Fsquid.git

Fix accept_filter on Linux

accept_filter directive on Linux requires TCP_DEFER_ACCEPT which
in turn requires netinet/tcp.h. This was removed when splitting comm
into libcomm.la.
---

diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 6f388157a9..95bbca92a3 100644
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -53,11 +53,12 @@
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_NETINET_TCP_H
+// required for accept_filter to build.
+#include <netinet/tcp.h>
+#endif
 
-namespace Comm
-{
-CBDATA_CLASS_INIT(TcpAcceptor);
-};
+CBDATA_NAMESPACED_CLASS_INIT(Comm, TcpAcceptor);
 
 Comm::TcpAcceptor::TcpAcceptor(const Comm::ConnectionPointer &newConn, const char *note, const Subscription::Pointer &aSub) :
         AsyncJob("Comm::TcpAcceptor"),