Moved neighbors prototypes from protos.h to neighbors.h

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 58a693b974653e56305e0b74a51dc612a4e55b33..7a78d0fdcbbb5e9e38bb6edbf34e64bb5682feb3 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -61,6 +61,7 @@
 #include "structs.h"
 #include "SwapDir.h"
 #include "wordlist.h"
+#include "neighbors.h"
 #if USE_ADAPTATION
 #include "adaptation/Config.h"
 #endif

diff --git a/src/carp.cc b/src/carp.cc
index 982bd5770b439154e5b0b718457dee9f0adab314..53424235c3ca470da2aeb871130d4915e5aeec57 100644 (file)
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "Store.h"
 #include "URLScheme.h"

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 64b9cd46d8a58981643ebdc993b26ff8d0fac1c1..3fdedcc45ae28e92b0a2d9bfa3003a5fec20ec41 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -50,6 +50,7 @@
 #include "ip/QosConfig.h"
 #include "ipcache.h"
 #include "MemObject.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/forward.cc b/src/forward.cc
index 96b8f5938f0e5753de3065bff39b50d8687190a6..f3abfe250c5f5e8db67365d4b7cbafa2323bb50f 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -57,6 +57,7 @@
 #include "ip/tools.h"
 #include "MemObject.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "pconn.h"
 #include "PeerSelectState.h"
 #include "protos.h"

diff --git a/src/http.cc b/src/http.cc
index 412a8a9727d77aa9d0cca8cc97ceec00ce9641af..d6046f6357abd0bc458057f12b7383efea662fcf 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -59,6 +59,7 @@
 #include "HttpRequest.h"
 #include "MemBuf.h"
 #include "MemObject.h"
+#include "neighbors.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
 #include "rfc1738.h"

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 80b94799fd78b5c723324cfedd5694d0deecc7b5..0b633bcb280b531e47334c2f91a1d537d708fd70 100644 (file)
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -55,6 +55,8 @@
 #include "SquidTime.h"
 #include "wordlist.h"
 #include "ip/Address.h"
+#include "neighbors.h"
+
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 6ff79657c2d85d3e282423a04f91b13aa47f9b79..a4d1df6353eb545300088a796c75dd8d86900008 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -51,6 +51,7 @@
 #include "ip/tools.h"
 #include "ipcache.h"
 #include "md5.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "rfc1738.h"
 #include "SquidTime.h"

diff --git a/src/main.cc b/src/main.cc
index 0854137598ad35ae87c806729004dab8b6315fba..c17fda818d8998da64762b30a6b26da62f2418f7 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -65,6 +65,7 @@
 #include "ip/tools.h"
 #include "Mem.h"
 #include "MemPool.h"
+#include "neighbors.h"
 #include "pconn.h"
 #include "PeerSelectState.h"
 #include "profiler/Profiler.h"

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 10a07e60befd7d3307c45a47282893ef68864a33..9f64003c7e021245ab0d5fd44e5651ecfd3b6e22 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -46,6 +46,7 @@
 #include "ipcache.h"
 #include "MemObject.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "PeerDigest.h"
 #include "PeerSelectState.h"
 #include "protos.h"

diff --git a/src/neighbors.h b/src/neighbors.h
new file mode 100644 (file)
index 0000000..3bfa7c7
--- /dev/null
+++ b/src/neighbors.h
@@ -0,0 +1,88 @@
+/*
+ * DEBUG: section 
+ * AUTHOR: 
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef SQUID_NEIGHBORS_H_
+#define SQUID_NEIGHBORS_H_
+
+#include "enums.h"
+#include "HttpRequestMethod.h"
+#include "lookup_t.h"
+#include "ip/Address.h"
+#include "typedefs.h"
+
+class HttpRequest;
+class peer;
+class StoreEntry;
+
+SQUIDCEXTERN peer *getFirstPeer(void);
+SQUIDCEXTERN peer *getFirstUpParent(HttpRequest *);
+SQUIDCEXTERN peer *getNextPeer(peer *);
+SQUIDCEXTERN peer *getSingleParent(HttpRequest *);
+SQUIDCEXTERN int neighborsCount(HttpRequest *);
+SQUIDCEXTERN int neighborsUdpPing(HttpRequest *,
+                                  StoreEntry *,
+                                  IRCB * callback,
+                                  void *data,
+                                  int *exprep,
+                                  int *timeout);
+SQUIDCEXTERN void neighborAddAcl(const char *, const char *);
+
+SQUIDCEXTERN void neighborsUdpAck(const cache_key *, icp_common_t *, const Ip::Address &);
+SQUIDCEXTERN void neighborAdd(const char *, const char *, int, int, int, int, int);
+SQUIDCEXTERN void neighbors_init(void);
+#if USE_HTCP
+SQUIDCEXTERN void neighborsHtcpClear(StoreEntry *, const char *, HttpRequest *, const HttpRequestMethod &, htcp_clr_reason);
+#endif
+SQUIDCEXTERN peer *peerFindByName(const char *);
+SQUIDCEXTERN peer *peerFindByNameAndPort(const char *, unsigned short);
+SQUIDCEXTERN peer *getDefaultParent(HttpRequest * request);
+SQUIDCEXTERN peer *getRoundRobinParent(HttpRequest * request);
+SQUIDCEXTERN peer *getWeightedRoundRobinParent(HttpRequest * request);
+SQUIDCEXTERN void peerClearRRStart(void);
+SQUIDCEXTERN void peerClearRR(void);
+SQUIDCEXTERN lookup_t peerDigestLookup(peer * p, HttpRequest * request);
+SQUIDCEXTERN peer *neighborsDigestSelect(HttpRequest * request);
+SQUIDCEXTERN void peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup);
+SQUIDCEXTERN void peerNoteDigestGone(peer * p);
+SQUIDCEXTERN int neighborUp(const peer * e);
+SQUIDCEXTERN CBDUNL peerDestroy;
+SQUIDCEXTERN const char *neighborTypeStr(const peer * e);
+SQUIDCEXTERN peer_t neighborType(const peer *, const HttpRequest *);
+SQUIDCEXTERN void peerConnectFailed(peer *);
+SQUIDCEXTERN void peerConnectSucceded(peer *);
+SQUIDCEXTERN void dump_peer_options(StoreEntry *, peer *);
+SQUIDCEXTERN int peerHTTPOkay(const peer *, HttpRequest *);
+
+SQUIDCEXTERN peer *whichPeer(const Ip::Address &from);
+
+#endif /* SQUID_NEIGHBORS_H_ */

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 3452281b1112b690d29c9b711a985be73c0676c1..b66000e96d032ef7897dbec1149fbb90129b477b 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -40,6 +40,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "MemObject.h"
+#include "neighbors.h"
 #include "PeerDigest.h"
 #include "protos.h"
 #include "SquidTime.h"

diff --git a/src/peer_select.cc b/src/peer_select.cc
index de8e41cc2b645cda4989be299c5da0d0e0ad5d1c..4d8b5b876517af9a43b7eb351ec9fcea125bc4ef 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -45,6 +45,7 @@
 #include "icmp/net_db.h"
 #include "ICP.h"
 #include "ipcache.h"
+#include "neighbors.h"
 #include "PeerSelectState.h"
 #include "protos.h"
 #include "SquidTime.h"

diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc
index 57ad36ab07c795c51e48c1529f7864fdef33bc31..eac8fd96079571d5d819ffceb8f9c200890187a1 100644 (file)
--- a/src/peer_sourcehash.cc
+++ b/src/peer_sourcehash.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "Store.h"
 

diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc
index 342119209ce21e48f51170b9171a6aeb6e011ece..3f7d28673d6d1bbc0fe7d7b1b323a6f64539e586 100644 (file)
--- a/src/peer_userhash.cc
+++ b/src/peer_userhash.cc
@@ -42,6 +42,7 @@
 #include "globals.h"
 #include "HttpRequest.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "Store.h"
 

diff --git a/src/protos.h b/src/protos.h
index c2b63a997da32b3ff2b9aea02b2a29b3be240a56..0ac488f25b5c8f2b88b28ec3908ad4831061610f 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -225,46 +225,6 @@ extern int mimeGetViewOption(const char *fn);
 extern int mcastSetTtl(int, int);
 extern IPH mcastJoinGroups;
 
-SQUIDCEXTERN peer *getFirstPeer(void);
-SQUIDCEXTERN peer *getFirstUpParent(HttpRequest *);
-SQUIDCEXTERN peer *getNextPeer(peer *);
-SQUIDCEXTERN peer *getSingleParent(HttpRequest *);
-SQUIDCEXTERN int neighborsCount(HttpRequest *);
-SQUIDCEXTERN int neighborsUdpPing(HttpRequest *,
-                                  StoreEntry *,
-                                  IRCB * callback,
-                                  void *data,
-                                  int *exprep,
-                                  int *timeout);
-SQUIDCEXTERN void neighborAddAcl(const char *, const char *);
-
-SQUIDCEXTERN void neighborsUdpAck(const cache_key *, icp_common_t *, const Ip::Address &);
-SQUIDCEXTERN void neighborAdd(const char *, const char *, int, int, int, int, int);
-SQUIDCEXTERN void neighbors_init(void);
-#if USE_HTCP
-SQUIDCEXTERN void neighborsHtcpClear(StoreEntry *, const char *, HttpRequest *, const HttpRequestMethod &, htcp_clr_reason);
-#endif
-SQUIDCEXTERN peer *peerFindByName(const char *);
-SQUIDCEXTERN peer *peerFindByNameAndPort(const char *, unsigned short);
-SQUIDCEXTERN peer *getDefaultParent(HttpRequest * request);
-SQUIDCEXTERN peer *getRoundRobinParent(HttpRequest * request);
-SQUIDCEXTERN peer *getWeightedRoundRobinParent(HttpRequest * request);
-SQUIDCEXTERN void peerClearRRStart(void);
-SQUIDCEXTERN void peerClearRR(void);
-SQUIDCEXTERN lookup_t peerDigestLookup(peer * p, HttpRequest * request);
-SQUIDCEXTERN peer *neighborsDigestSelect(HttpRequest * request);
-SQUIDCEXTERN void peerNoteDigestLookup(HttpRequest * request, peer * p, lookup_t lookup);
-SQUIDCEXTERN void peerNoteDigestGone(peer * p);
-SQUIDCEXTERN int neighborUp(const peer * e);
-SQUIDCEXTERN CBDUNL peerDestroy;
-SQUIDCEXTERN const char *neighborTypeStr(const peer * e);
-SQUIDCEXTERN peer_t neighborType(const peer *, const HttpRequest *);
-SQUIDCEXTERN void peerConnectFailed(peer *);
-SQUIDCEXTERN void peerConnectSucceded(peer *);
-SQUIDCEXTERN void dump_peer_options(StoreEntry *, peer *);
-SQUIDCEXTERN int peerHTTPOkay(const peer *, HttpRequest *);
-
-SQUIDCEXTERN peer *whichPeer(const Ip::Address &from);
 
 /* peer_digest.c */
 class PeerDigest;

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index d0ab68419e245dfad4f19c36aa40e3eb62c6bb01..eeff365aff389beccd3fd0bbfeb36c62df44ddfa 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -36,6 +36,7 @@
 #include "cache_snmp.h"
 #include "globals.h"
 #include "mem_node.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "StatCounters.h"
 #include "StatHist.h"

diff --git a/src/stat.cc b/src/stat.cc
index b6f63e3062aab07e728e9b7eb912582eb917dd01..70902acfcf63319673f6d54210463bd3312212de 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -52,6 +52,7 @@
 #include "mgr/IoAction.h"
 #include "mgr/Registration.h"
 #include "mgr/ServiceTimesAction.h"
+#include "neighbors.h"
 #include "protos.h"
 #include "SquidMath.h"
 #include "SquidTime.h"