Renamed neighbor_type to NeighborTypeDomainList and moved to own header.

diff --git a/src/CachePeer.h b/src/CachePeer.h
index 5634b196f9d69e5950a441034451970cca702c0e..83e7505fac684435b298646f6ac2bd8f40a4610d 100644 (file)
--- a/src/CachePeer.h
+++ b/src/CachePeer.h
@@ -37,9 +37,9 @@
 #include <openssl/ssl.h>
 #endif
 
-class domain_ping;
-class domain_type;
 class acl_access;
+class domain_ping;
+class NeighborTypeDomainList;
 class PeerDigest;
 
 // currently a POD
@@ -86,7 +86,7 @@ public:
 
     unsigned short http_port;
     domain_ping *peer_domain;
-    domain_type *typelist;
+    NeighborTypeDomainList *typelist;
     acl_access *access;
 
     struct {

diff --git a/src/Makefile.am b/src/Makefile.am
index ca9c599d72ae230e497e151175b1b9f868cc88bd..fcddd3450d79fb556439b6905542186304cc8404 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -276,6 +276,7 @@ squid_SOURCES = \
        CacheDigest.h \
        CacheDigest.cc \
        cache_manager.cc \
+       NeighborTypeDomainList.h \
        CachePeer.h \
        CacheManager.h \
        carp.h \

diff --git a/src/NeighborTypeDomainList.h b/src/NeighborTypeDomainList.h
new file mode 100644 (file)
index 0000000..7bb6961
--- /dev/null
+++ b/src/NeighborTypeDomainList.h
@@ -0,0 +1,41 @@
+#ifndef SQUID_NEIGHBORTYPEDOMAINLIST_H_
+#define SQUID_NEIGHBORTYPEDOMAINLIST_H_
+/*
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+/// representation of a neighbor_type_domain configuration directive. A POD
+class NeighborTypeDomainList
+{
+public:
+    char *domain;
+    peer_t type;
+    NeighborTypeDomainList *next;
+};
+
+#endif /* SQUID_NEIGHBORTYPEDOMAINLIST_H_ */

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 92414559c1033d586af270d2f6fba5f27882726c..a58f3602c2ad86fb611b6608a7c66c2c7b4e69aa 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -62,6 +62,7 @@
 #include "Mem.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"
+#include "NeighborTypeDomainList.h"
 #include "Parsing.h"
 #include "PeerDigest.h"
 #include "RefreshPattern.h"
@@ -1976,7 +1977,7 @@ static void
 dump_peer(StoreEntry * entry, const char *name, CachePeer * p)
 {
     domain_ping *d;
-    domain_type *t;
+    NeighborTypeDomainList *t;
     LOCAL_ARRAY(char, xname, 128);
 
     while (p != NULL) {
@@ -2551,8 +2552,8 @@ parse_hostdomaintype(void)
         self_destruct();
 
     while ((domain = strtok(NULL, list_sep))) {
-        domain_type *l = NULL;
-        domain_type **L = NULL;
+        NeighborTypeDomainList *l = NULL;
+        NeighborTypeDomainList **L = NULL;
         CachePeer *p;
 
         if ((p = peerFindByName(host)) == NULL) {
@@ -2560,7 +2561,7 @@ parse_hostdomaintype(void)
             return;
         }
 
-        l = static_cast<domain_type *>(xcalloc(1, sizeof(domain_type)));
+        l = static_cast<NeighborTypeDomainList *>(xcalloc(1, sizeof(NeighborTypeDomainList)));
         l->type = parseNeighborType(type);
         l->domain = xstrdup(domain);
 

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 3a9245786b4bc71aad70b4477b6c8f5582223e20..3b0ac00d4febcaf8fc0e6d6ab487ba101ee71062 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -51,6 +51,7 @@
 #include "MemObject.h"
 #include "mgr/Registration.h"
 #include "multicast.h"
+#include "NeighborTypeDomainList.h"
 #include "neighbors.h"
 #include "PeerDigest.h"
 #include "PeerSelectState.h"
@@ -132,7 +133,7 @@ peer_t
 neighborType(const CachePeer * p, const HttpRequest * request)
 {
 
-    const domain_type *d = NULL;
+    const NeighborTypeDomainList *d = NULL;
 
     for (d = p->typelist; d; d = d->next) {
         if (0 == matchDomainName(request->GetHost(), d->domain))

diff --git a/src/structs.h b/src/structs.h
index f3996bbf6ea869f69e467b000407abe3ee90a7f7..c7879b33fbece46fb8504d185b0a6999c583079f 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -171,15 +171,6 @@ public:
     domain_ping *next;
 };
 
-// POD
-class domain_type
-{
-public:
-    char *domain;
-    peer_t type;
-    domain_type *next;
-};
-
 #if USE_SSL
 struct _sslproxy_cert_sign {
     int alg;