Update PROTO_CACHEOBJ to PROTO_CACHE_OBJECT name

Also catches several eCAP uses which were missed.

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 3d5400c4b95c891e2dc263065ee993ad757e524c..f2e42b17ac288238053f3ed342374b05dc853ff5 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -583,7 +583,7 @@ HttpRequest::cacheable() const
     if (protocol == AnyP::PROTO_GOPHER)
         return gopherCachable(this);
 
-    if (protocol == AnyP::PROTO_CACHEOBJ)
+    if (protocol == AnyP::PROTO_CACHE_OBJECT)
         return false;
 
     return true;

diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc
index 27baa73fcbfa8842b639f790703773de30b69821..1ed158730f1a10f6dcc0f4a23acea30a990753aa 100644 (file)
--- a/src/adaptation/ecap/Host.cc
+++ b/src/adaptation/ecap/Host.cc
@@ -30,18 +30,18 @@ Adaptation::Ecap::Host::Host()
     libecap::headerReferer.assignHostId(HDR_REFERER);
     libecap::headerContentLength.assignHostId(HDR_CONTENT_LENGTH);
 
-    libecap::protocolHttp.assignHostId(PROTO_HTTP);
-    libecap::protocolHttps.assignHostId(PROTO_HTTPS);
-    libecap::protocolFtp.assignHostId(PROTO_FTP);
-    libecap::protocolGopher.assignHostId(PROTO_GOPHER);
-    libecap::protocolWais.assignHostId(PROTO_WAIS);
-    libecap::protocolUrn.assignHostId(PROTO_URN);
-    libecap::protocolWhois.assignHostId(PROTO_WHOIS);
-    protocolInternal.assignHostId(PROTO_INTERNAL);
-    protocolCacheObj.assignHostId(PROTO_CACHEOBJ);
-    protocolIcp.assignHostId(PROTO_ICP);
+    libecap::protocolHttp.assignHostId(AnyP::PROTO_HTTP);
+    libecap::protocolHttps.assignHostId(AnyP::PROTO_HTTPS);
+    libecap::protocolFtp.assignHostId(AnyP::PROTO_FTP);
+    libecap::protocolGopher.assignHostId(AnyP::PROTO_GOPHER);
+    libecap::protocolWais.assignHostId(AnyP::PROTO_WAIS);
+    libecap::protocolUrn.assignHostId(AnyP::PROTO_URN);
+    libecap::protocolWhois.assignHostId(AnyP::PROTO_WHOIS);
+    protocolInternal.assignHostId(AnyP::PROTO_INTERNAL);
+    protocolCacheObj.assignHostId(AnyP::PROTO_CACHE_OBJECT);
+    protocolIcp.assignHostId(AnyP::PROTO_ICP);
 #if USE_HTCP
-    protocolHtcp.assignHostId(PROTO_HTCP);
+    protocolHtcp.assignHostId(AnyP::PROTO_HTCP);
 #endif
 }
 

diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index 56281fef3ace759a6cfbf271217225c0bd63b5f4..19a6e58a70f7ad716ea9c6decea4a764a71a6d6b 100644 (file)
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -124,38 +124,38 @@ Adaptation::Ecap::FirstLineRep::protocol() const
 {
     // TODO: optimize?
     switch (theMessage.protocol) {
-    case PROTO_HTTP:
+    case AnyP::PROTO_HTTP:
         return libecap::protocolHttp;
-    case PROTO_HTTPS:
+    case AnyP::PROTO_HTTPS:
         return libecap::protocolHttps;
-    case PROTO_FTP:
+    case AnyP::PROTO_FTP:
         return libecap::protocolFtp;
-    case PROTO_GOPHER:
+    case AnyP::PROTO_GOPHER:
         return libecap::protocolGopher;
-    case PROTO_WAIS:
+    case AnyP::PROTO_WAIS:
         return libecap::protocolWais;
-    case PROTO_WHOIS:
+    case AnyP::PROTO_WHOIS:
         return libecap::protocolWhois;
-    case PROTO_URN:
+    case AnyP::PROTO_URN:
         return libecap::protocolUrn;
-    case PROTO_ICP:
+    case AnyP::PROTO_ICP:
         return protocolIcp;
 #if USE_HTCP
-    case PROTO_HTCP:
+    case AnyP::PROTO_HTCP:
         return protocolHtcp;
 #endif
-    case PROTO_CACHEOBJ:
+    case AnyP::PROTO_CACHE_OBJECT:
         return protocolCacheObj;
-    case PROTO_INTERNAL:
+    case AnyP::PROTO_INTERNAL:
         return protocolInternal;
-    case PROTO_ICY:
+    case AnyP::PROTO_ICY:
         return Name();
-    case PROTO_NONE:
+    case AnyP::PROTO_NONE:
         return Name();
 
-    case PROTO_MAX:
+    case AnyP::PROTO_MAX:
         break; // should not happen
-        // no default to catch PROTO_ additions
+        // no default to catch AnyP::PROTO_ additions
     }
     Must(false); // not reached
     return Name();
@@ -173,7 +173,7 @@ Adaptation::Ecap::FirstLineRep::TranslateProtocolId(const Name &name)
 {
     if (name.assignedHostId())
         return static_cast<protocol_t>(name.hostId());
-    return PROTO_NONE; // no PROTO_OTHER
+    return AnyP::PROTO_NONE; // no AnyP::PROTO_OTHER
 }
 
 

diff --git a/src/anyp/ProtocolType.h b/src/anyp/ProtocolType.h
index 031f47c596c8fa0ef18c1fb45b6239e29d69d6c2..769541f6dd2a10ceb1cf7209b0951960301f964e 100644 (file)
--- a/src/anyp/ProtocolType.h
+++ b/src/anyp/ProtocolType.h
@@ -19,7 +19,7 @@ typedef enum {
     PROTO_HTTPS,
     PROTO_GOPHER,
     PROTO_WAIS,
-    PROTO_CACHEOBJ,
+    PROTO_CACHE_OBJECT,
     PROTO_ICP,
 #if USE_HTCP
     PROTO_HTCP,

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index bc68a93ebbc913ec41d9c38d369c91032f2ad50a..1ceccb5c9d72893ad54fff2763e2432ce84ffd2e 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -769,7 +769,7 @@ clientHierarchical(ClientHttpRequest * http)
     if (request->protocol == AnyP::PROTO_GOPHER)
         return gopherCachable(request);
 
-    if (request->protocol == AnyP::PROTO_CACHEOBJ)
+    if (request->protocol == AnyP::PROTO_CACHE_OBJECT)
         return 0;
 
     return 1;

diff --git a/src/forward.cc b/src/forward.cc
index baf01c63830d5a8d3c1545e48f8a47a5d9a5449f..c5add74918914405d7b83c09d6404ebaa1b12797 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -203,7 +203,7 @@ FwdState::fwdStart(int client_fd, StoreEntry *entry, HttpRequest *request)
      */
 
     if ( Config.accessList.miss && !request->client_addr.IsNoAddr() &&
-            request->protocol != AnyP::PROTO_INTERNAL && request->protocol != AnyP::PROTO_CACHEOBJ) {
+            request->protocol != AnyP::PROTO_INTERNAL && request->protocol != AnyP::PROTO_CACHE_OBJECT) {
         /**
          * Check if this host is allowed to fetch MISSES from us (miss_access)
          */
@@ -251,7 +251,7 @@ FwdState::fwdStart(int client_fd, StoreEntry *entry, HttpRequest *request)
         internalStart(request, entry);
         return;
 
-    case AnyP::PROTO_CACHEOBJ:
+    case AnyP::PROTO_CACHE_OBJECT:
         CacheManager::GetInstance()->Start(client_fd, request, entry);
         return;
 
@@ -1086,7 +1086,7 @@ FwdState::dispatch()
             ftpStart(this);
             break;
 
-        case AnyP::PROTO_CACHEOBJ:
+        case AnyP::PROTO_CACHE_OBJECT:
 
         case AnyP::PROTO_INTERNAL:
 

diff --git a/src/tests/testURLScheme.cc b/src/tests/testURLScheme.cc
index dce1c4df50ff70dc46c9dd0968e1244458385d7b..e6e1b8ac209a93b4a145b7ca1213f1181c3fffd4 100644 (file)
--- a/src/tests/testURLScheme.cc
+++ b/src/tests/testURLScheme.cc
@@ -98,7 +98,7 @@ testURLScheme::testConstructprotocol_t()
     URLScheme lhs_none(AnyP::PROTO_NONE), rhs_none(AnyP::PROTO_NONE);
     CPPUNIT_ASSERT_EQUAL(lhs_none, rhs_none);
 
-    URLScheme lhs_cacheobj(AnyP::PROTO_CACHEOBJ), rhs_cacheobj(AnyP::PROTO_CACHEOBJ);
+    URLScheme lhs_cacheobj(AnyP::PROTO_CACHE_OBJECT), rhs_cacheobj(AnyP::PROTO_CACHE_OBJECT);
     CPPUNIT_ASSERT_EQUAL(lhs_cacheobj, rhs_cacheobj);
     CPPUNIT_ASSERT(lhs_none != rhs_cacheobj);
 }
@@ -125,7 +125,7 @@ testURLScheme::testEqualprotocol_t()
     CPPUNIT_ASSERT(URLScheme() == AnyP::PROTO_NONE);
     CPPUNIT_ASSERT(not (URLScheme(AnyP::PROTO_WAIS) == AnyP::PROTO_HTTP));
     CPPUNIT_ASSERT(AnyP::PROTO_HTTP == URLScheme(AnyP::PROTO_HTTP));
-    CPPUNIT_ASSERT(not (AnyP::PROTO_CACHEOBJ == URLScheme(AnyP::PROTO_HTTP)));
+    CPPUNIT_ASSERT(not (AnyP::PROTO_CACHE_OBJECT == URLScheme(AnyP::PROTO_HTTP)));
 }
 
 /*

diff --git a/src/url.cc b/src/url.cc
index 0da3b619845a4e53090f263cde0b909cd4bc8025..2e63319b0ed5802e74cd9c0b8ce17ac0cb98f89b 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -132,7 +132,7 @@ urlParseProtocol(const char *b, const char *e)
         return AnyP::PROTO_WAIS;
 
     if (strncasecmp(b, "cache_object", len) == 0)
-        return AnyP::PROTO_CACHEOBJ;
+        return AnyP::PROTO_CACHE_OBJECT;
 
     if (strncasecmp(b, "urn", len) == 0)
         return AnyP::PROTO_URN;
@@ -166,7 +166,7 @@ urlDefaultPort(AnyP::ProtocolType p)
     case AnyP::PROTO_WAIS:
         return 210;
 
-    case AnyP::PROTO_CACHEOBJ:
+    case AnyP::PROTO_CACHE_OBJECT:
 
     case AnyP::PROTO_INTERNAL:
         return CACHE_HTTP_PORT;
@@ -815,7 +815,7 @@ urlCheckRequest(const HttpRequest * r)
 
     case AnyP::PROTO_HTTP:
 
-    case AnyP::PROTO_CACHEOBJ:
+    case AnyP::PROTO_CACHE_OBJECT:
         rc = 1;
         break;