From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Fri, 11 Jul 2008 20:43:43 +0000 (+0200)
Subject: The rest of the needed glue needed for peer_userhash and sourcehash to compile
X-Git-Tag: SQUID_3_1_0_1~49^2~145^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4a216502a7db972c31140a78cddb66ae8cc0b9e;p=thirdparty%2Fsquid.git

The rest of the needed glue needed for peer_userhash and sourcehash to compile
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 734626394d..8f3d229ef8 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -593,6 +593,8 @@ squid_SOURCES = \
 	PeerDigest.h \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	PeerSelectState.h \
 	PingData.h \
 	protos.h \
@@ -890,6 +892,8 @@ ufsdump_SOURCES = \
 	pconn.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	protos.h \
 	redirect.cc \
 	referer.cc \
@@ -1435,6 +1439,8 @@ tests_testCacheManager_SOURCES = \
 	pconn.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	redirect.cc \
 	referer.cc \
 	refresh.cc \
@@ -1606,6 +1612,8 @@ tests_testEvent_SOURCES = \
 	pconn.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	redirect.cc \
 	referer.cc \
 	refresh.cc \
@@ -1762,6 +1770,8 @@ tests_testEventLoop_SOURCES = \
 	pconn.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	redirect.cc \
 	referer.cc \
 	refresh.cc \
@@ -1907,6 +1917,8 @@ tests_test_http_range_SOURCES = \
 	Parsing.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	pconn.cc \
 	redirect.cc \
 	referer.cc \
@@ -2068,6 +2080,8 @@ tests_testHttpRequest_SOURCES = \
 	pconn.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	redirect.cc \
 	referer.cc \
 	refresh.cc \
@@ -2430,6 +2444,8 @@ tests_testURL_SOURCES = \
 	pconn.cc \
 	peer_digest.cc \
 	peer_select.cc \
+	peer_sourcehash.cc \
+	peer_userhash.cc \
 	redirect.cc \
 	referer.cc \
 	refresh.cc \
diff --git a/src/enums.h b/src/enums.h
index 8d590dceb6..ed4e5f135b 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -175,6 +175,8 @@ typedef enum {
 #endif
     CARP,
     ANY_OLD_PARENT,
+    USERHASH_PARENT,
+    SOURCEHASH_PARENT,
     HIER_MAX
 } hier_code;
 
diff --git a/src/peer_select.cc b/src/peer_select.cc
index 1da61149d4..952f2341c9 100644
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -65,6 +65,8 @@ const char *hier_strings[] =
 #endif
         "CARP",
         "ANY_PARENT",
+	"USERHASH",
+	"SOURCEHASH",
         "INVALID CODE"
     };
 
diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc
index a220554339..25e2224492 100644
--- a/src/peer_sourcehash.cc
+++ b/src/peer_sourcehash.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "CacheManager.h"
 #include "Store.h"
+#include "HttpRequest.h"
 
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
 
@@ -153,7 +154,7 @@ peerSourceHashInit(void)
 void
 peerSourceHashRegisterWithCacheManager(CacheManager & manager)
 {
-    manager.registerAction("sourcehash", "CARP information", peerSourceHashCachemgr, 0, 1);
+    manager.registerAction("sourcehash", "peer sourcehash information", peerSourceHashCachemgr, 0, 1);
 }
 
 peer *
diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc
index a5853c7a9a..d484ade69b 100644
--- a/src/peer_userhash.cc
+++ b/src/peer_userhash.cc
@@ -37,6 +37,8 @@
 #include "squid.h"
 #include "CacheManager.h"
 #include "Store.h"
+#include "HttpRequest.h"
+#include "AuthUserRequest.h"
 
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
 
@@ -153,7 +155,7 @@ peerUserHashInit(void)
 void
 peerUserHashRegisterWithCacheManager(CacheManager & manager)
 {
-    manager.registerAction("userhash", "CARP information", peerUserHashCachemgr, 0, 1);
+    manager.registerAction("userhash", "peer userhash information", peerUserHashCachemgr, 0, 1);
 }
 
 peer *