Assign Squid-specific IDs to libecap-provided names.

Add a few Squid-specific names.

diff --git a/src/eCAP/Host.cc b/src/eCAP/Host.cc
index e070c11328f46ed8a3d898829c8973308ae4eae9..813f9fa1aebaf034bbb0e2959620c7a4e53d73b8 100644 (file)
--- a/src/eCAP/Host.cc
+++ b/src/eCAP/Host.cc
@@ -1,9 +1,36 @@
 #include "squid.h"
 #include <libecap/adapter/service.h>
+#include <libecap/common/names.h>
 #include "TextException.h"
 #include "eCAP/ServiceRep.h"
 #include "eCAP/Host.h"
 
+const libecap::Name Ecap::protocolInternal("internal", libecap::Name::NextId());
+const libecap::Name Ecap::protocolCacheObj("cache_object", libecap::Name::NextId());
+const libecap::Name Ecap::protocolIcp("ICP", libecap::Name::NextId());
+#if USE_HTCP
+const libecap::Name Ecap::protocolHtcp("Htcp", libecap::Name::NextId());
+#endif
+
+Ecap::Host::Host()
+{
+    // assign our host-specific IDs to well-known names
+    libecap::headerReferer.assignHostId(HDR_REFERER);
+
+    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);
+#if USE_HTCP
+    protocolHtcp.assignHostId(PROTO_HTCP);
+#endif
+}
 
 std::string
 Ecap::Host::uri() const

diff --git a/src/eCAP/Host.h b/src/eCAP/Host.h
index a0cf043084d9ebe83c567efa2346499d6dd33689..569f6190d52a3b028f94c0799836118fca16bdd8 100644 (file)
--- a/src/eCAP/Host.h
+++ b/src/eCAP/Host.h
@@ -14,18 +14,27 @@ namespace Ecap {
 class Host : public libecap::host::Host
 {
 public:
-               // About
-               virtual std::string uri() const; // unique across all vendors
-               virtual void describe(std::ostream &os) const; // free-format info
+        Host();
 
-               // Service management
-               virtual void noteService(const libecap::weak_ptr<libecap::adapter::Service> &s);
+        // About
+        virtual std::string uri() const; // unique across all vendors
+        virtual void describe(std::ostream &os) const; // free-format info
 
-               // Logging
-               virtual std::ostream *openDebug(libecap::LogVerbosity lv);
-               virtual void closeDebug(std::ostream *debug);
+        // Service management
+        virtual void noteService(const libecap::weak_ptr<libecap::adapter::Service> &s);
+
+        // Logging
+        virtual std::ostream *openDebug(libecap::LogVerbosity lv);
+        virtual void closeDebug(std::ostream *debug);
 };
 
+extern const libecap::Name protocolInternal;
+extern const libecap::Name protocolCacheObj;
+extern const libecap::Name protocolIcp;
+#if USE_HTCP
+extern const libecap::Name protocolHtcp;
+#endif
+
 } // namespace Ecap
 
 #endif /* SQUID_ECAP_HOST_H */