Moved some client_side.cc prototypes to client_side.h

diff --git a/src/Makefile.am b/src/Makefile.am
index a5332d385a57f166c426832cddef05dd21a2e17b..3903ababd8664885591ff64e9230fcbf7a22b615 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -277,6 +277,7 @@ squid_SOURCES = \
        ChunkedCodingParser.h \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side.h \
        client_side_reply.cc \
@@ -1333,6 +1334,7 @@ tests_testCacheManager_SOURCES = \
        ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side_reply.cc \
        client_side_request.cc \
@@ -1683,6 +1685,7 @@ tests_testEvent_SOURCES = \
        ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side_reply.cc \
        client_side_request.cc \
@@ -1893,6 +1896,7 @@ tests_testEventLoop_SOURCES = \
        ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side_reply.cc \
        client_side_request.cc \
@@ -2102,6 +2106,7 @@ tests_test_http_range_SOURCES = \
        ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side_reply.cc \
        client_side_request.cc \
@@ -2363,6 +2368,7 @@ tests_testHttpRequest_SOURCES = \
        ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side_reply.cc \
        client_side_request.cc \
@@ -3333,6 +3339,7 @@ tests_testURL_SOURCES = \
        ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
+       client_side.h \
        client_side.cc \
        client_side_reply.cc \
        client_side_request.cc \

diff --git a/src/client_side.h b/src/client_side.h
index 8e0bb1cc56feea41045fcf20ee9240c26da24944..405d9b722f2d46a8ffcfd1f871b6d905144c542a 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -416,4 +416,9 @@ const char *findTrailingHTTPVersion(const char *uriAndHTTPVersion, const char *e
 /* Vary support functions */
 extern int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req);
 
+/* client_side.c - FD related client side routines */
+extern void clientOpenListenSockets(void);
+extern void clientHttpConnectionsClose(void);
+extern void httpRequestFree(void *);
+
 #endif /* SQUID_CLIENTSIDE_H */

diff --git a/src/esi/Include.cc b/src/esi/Include.cc
index 1b65dc049381e408db151a0c2792a1d7f6bef7bb..2452a3e3aac104d72a44b10f3317434c85448053 100644 (file)
--- a/src/esi/Include.cc
+++ b/src/esi/Include.cc
@@ -42,6 +42,7 @@
 #if (USE_SQUID_ESI == 1)
 
 #include "client_side_request.h"
+#include "client_side.h"
 #include "esi/Include.h"
 #include "esi/VarState.h"
 #include "HttpReply.h"

diff --git a/src/main.cc b/src/main.cc
index 5fd8749f9eeed571e3e6e6ee36459704b27ecf83..85f568046cc493a0c716bc00d14b294318bda9e7 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -42,6 +42,7 @@
 #include "cache_cf.h"
 #include "carp.h"
 #include "client_db.h"
+#include "client_side.h"
 #include "comm.h"
 #include "ConfigParser.h"
 #include "CpuAffinity.h"

diff --git a/src/protos.h b/src/protos.h
index e604e03914dc344cb4137239e4170d81b22bc8e0..d0da45df80aac6f35f20b117902ee70b56b94691 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -51,13 +51,8 @@ class HttpRequestMethod;
 class ClientInfo;
 #endif
 
-/* client_side.c - FD related client side routines */
 
-SQUIDCEXTERN void clientOpenListenSockets(void);
-SQUIDCEXTERN void clientHttpConnectionsClose(void);
-SQUIDCEXTERN void httpRequestFree(void *);
-
-extern void clientAccessCheck(void *);
+//extern void clientAccessCheck(void *);
 
 
 /* packs, then prints an object using debugs() */

diff --git a/src/tools.cc b/src/tools.cc
index 25080c00d199b256a4ee3d7516961b0fd46de05e..078771eff6c8ed458609978081dae64571e0ae2d 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -34,6 +34,7 @@
 
 #include "squid.h"
 #include "base/Subscription.h"
+#include "client_side.h"
 #include "fde.h"
 #include "fqdncache.h"
 #include "htcp.h"