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 734626394d7a3308803abc450a056653218d340f..8f3d229ef8505436aea00628fd01bab7149331e6 100755 (executable)
--- 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 8d590dceb692095fa86365cb9ab0005f0e0d5580..ed4e5f135b0d18637c85e0d521021cc9c2d9e622 100644 (file)
--- 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 1da61149d4f0d34f95dc7515e59d3b274c91616f..952f2341c93331b3906bec80356631cd72d2dcce 100644 (file)
--- 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 a2205543394f6e95dc14a6cbc7056fd75046ac4e..25e2224492c99c6339834c2d0cddf085e5ac8051 100644 (file)
--- 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 a5853c7a9ad67fd8708cc83b74ab2b1a03b07fb2..d484ade69b2c859311004791d4ba1f00e5683fbb 100644 (file)
--- 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 *