Moved more WCCPv2 functions into wccp2.h

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 18ebc1dc28b5f54e058d59068a96134249baa4a2..ab0e0ec360d165b9d354b50b2a7b05a74226261a 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -63,6 +63,8 @@
 #include "SwapDir.h"
 #include "wordlist.h"
 #include "neighbors.h"
+/* wccp2 has its own conditional definitions */
+#include "wccp2.h"
 #if USE_ADAPTATION
 #include "adaptation/Config.h"
 #endif

diff --git a/src/protos.h b/src/protos.h
index 2d225a020008f18a313d46bb26381aa942f8f73e..95f505143827a7c700c47bc63435d4c97d6c8377 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -39,8 +39,10 @@
 #include "enums.h"
 /* some parameters stil need this */
 #include "wordlist.h"
-
-/* for parameters that still need these */
+#include "anyp/ProtocolType.h"
+#include "Debug.h"
+#include "HttpHeader.h"
+#include "HttpStatusCode.h"
 #include "lookup_t.h"
 
 
@@ -81,14 +83,12 @@ SQUIDCEXTERN void parse_time_t(time_t * var);
 
 /* client_side.c - FD related client side routines */
 
-#include "anyp/ProtocolType.h"
 SQUIDCEXTERN void clientOpenListenSockets(void);
 SQUIDCEXTERN void clientHttpConnectionsClose(void);
 SQUIDCEXTERN void httpRequestFree(void *);
 
 extern void clientAccessCheck(void *);
 
-#include "Debug.h"
 
 /* packs, then prints an object using debugs() */
 SQUIDCEXTERN void debugObj(int section, int level, const char *label, void *obj, ObjPackMethod pm);
@@ -149,7 +149,6 @@ SQUIDCEXTERN void whoisStart(FwdState *);
 
 /* http.c */
 /* for http_hdr_type field */
-#include "HttpHeader.h"
 SQUIDCEXTERN int httpCachable(const HttpRequestMethod&);
 SQUIDCEXTERN void httpStart(FwdState *);
 SQUIDCEXTERN mb_size_t httpBuildRequestPrefix(HttpRequest * request,
@@ -159,7 +158,6 @@ SQUIDCEXTERN mb_size_t httpBuildRequestPrefix(HttpRequest * request,
         http_state_flags);
 extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply);
 
-#include "HttpStatusCode.h"
 
 /* Http Header Tools */
 class HttpHeaderFieldInfo;
@@ -442,13 +440,6 @@ SQUIDCEXTERN void urlExtMethodConfigure(void);
 SQUIDCEXTERN peer_t parseNeighborType(const char *s);
 
 /* tools.c */
-//UNUSED       #include "dlink.h"
-//UNUSED       SQUIDCEXTERN void dlinkAdd(void *data, dlink_node *, dlink_list *);
-//UNUSED       SQUIDCEXTERN void dlinkAddAfter(void *, dlink_node *, dlink_node *, dlink_list *);
-//UNUSED       SQUIDCEXTERN void dlinkAddTail(void *data, dlink_node *, dlink_list *);
-//UNUSED       SQUIDCEXTERN void dlinkDelete(dlink_node * m, dlink_list * list);
-//UNUSED       SQUIDCEXTERN void dlinkNodeDelete(dlink_node * m);
-//UNUSED       SQUIDCEXTERN dlink_node *dlinkNodeNew(void);
 
 SQUIDCEXTERN void kb_incr(kb_t *, size_t);
 SQUIDCEXTERN int stringHasWhitespace(const char *);
@@ -582,28 +573,6 @@ class StatCounters;
 
                 SQUIDCEXTERN char *strtokFile(void);
 
-#if USE_WCCPv2
-
-                SQUIDCEXTERN void parse_wccp2_method(int *v);
-                SQUIDCEXTERN void free_wccp2_method(int *v);
-                SQUIDCEXTERN void dump_wccp2_method(StoreEntry * e, const char *label, int v);
-                SQUIDCEXTERN void parse_wccp2_amethod(int *v);
-                SQUIDCEXTERN void free_wccp2_amethod(int *v);
-                SQUIDCEXTERN void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
-
-                SQUIDCEXTERN void parse_wccp2_service(void *v);
-                SQUIDCEXTERN void free_wccp2_service(void *v);
-                SQUIDCEXTERN void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
-
-                SQUIDCEXTERN int check_null_wccp2_service(void *v);
-
-                SQUIDCEXTERN void parse_wccp2_service_info(void *v);
-
-                SQUIDCEXTERN void free_wccp2_service_info(void *v);
-
-                SQUIDCEXTERN void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
-
-#endif
 
 #if USE_AUTH
 

diff --git a/src/wccp2.h b/src/wccp2.h
index 5f96046023a1e01b0b5592982d1c18f839807517..647401326abcce8d32e6655ee8b6e2f440ed7480 100644 (file)
--- a/src/wccp2.h
+++ b/src/wccp2.h
@@ -35,9 +35,30 @@
 #define SQUID_WCCP2_H_
 
 #if USE_WCCPv2
+
+class StoreEntry;
+
 extern void wccp2Init(void);
 extern void wccp2ConnectionOpen(void);
 extern void wccp2ConnectionClose(void);
-#endif /* SQUID_USE_WCCPv2 */
+extern void parse_wccp2_method(int *v);
+extern void free_wccp2_method(int *v);
+extern void dump_wccp2_method(StoreEntry * e, const char *label, int v);
+extern void parse_wccp2_amethod(int *v);
+extern void free_wccp2_amethod(int *v);
+extern void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
+
+extern void parse_wccp2_service(void *v);
+extern void free_wccp2_service(void *v);
+extern void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
+
+extern int check_null_wccp2_service(void *v);
+
+extern void parse_wccp2_service_info(void *v);
+
+extern void free_wccp2_service_info(void *v);
+
+extern void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
+#endif /* USE_WCCPv2 */
 
 #endif /* WCCP2_H_ */