From 39a19cb77dd290852f7ebeef8ce8e2143101a3e8 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 2 Mar 2011 13:43:21 -0700 Subject: [PATCH] Update PROTO_CACHEOBJ to PROTO_CACHE_OBJECT name Also catches several eCAP uses which were missed. --- src/HttpRequest.cc | 2 +- src/adaptation/ecap/Host.cc | 22 ++++++++++----------- src/adaptation/ecap/MessageRep.cc | 32 +++++++++++++++---------------- src/anyp/ProtocolType.h | 2 +- src/client_side_request.cc | 2 +- src/forward.cc | 6 +++--- src/tests/testURLScheme.cc | 4 ++-- src/url.cc | 6 +++--- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 3d5400c4b9..f2e42b17ac 100644 --- 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 27baa73fcb..1ed158730f 100644 --- 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 56281fef3a..19a6e58a70 100644 --- 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(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 031f47c596..769541f6dd 100644 --- 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 bc68a93ebb..1ceccb5c9d 100644 --- 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 baf01c6383..c5add74918 100644 --- 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 dce1c4df50..e6e1b8ac20 100644 --- 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 0da3b61984..2e63319b0e 100644 --- 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; -- 2.47.2