Moved multicast.cc-related prototypes to newly-created multicast.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 827dba440574530747f986b101ad226e5c9fd09a..48995659e17b8e1d89989550a1d0b921cb8d1c95 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -415,6 +415,7 @@ squid_SOURCES = \
        mime.cc \
        mime_header.h \
        mime_header.cc \
+       multicast.h \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
@@ -1418,6 +1419,7 @@ tests_testCacheManager_SOURCES = \
        internal.h \
        internal.cc \
        list.cc \
+       multicast.h \
        multicast.cc \
        mem_node.cc \
        MemBuf.cc \
@@ -1801,6 +1803,7 @@ tests_testEvent_SOURCES = \
        mime.cc \
        mime_header.h \
        mime_header.cc \
+       multicast.h \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
@@ -2021,6 +2024,7 @@ tests_testEventLoop_SOURCES = \
        mime.cc \
        mime_header.h \
        mime_header.cc \
+       multicast.h \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
@@ -2238,6 +2242,7 @@ tests_test_http_range_SOURCES = \
        mime.cc \
        mime_header.h \
        mime_header.cc \
+       multicast.h \
        multicast.cc \
        neighbors.h \
        neighbors.cc \
@@ -2490,6 +2495,7 @@ tests_testHttpRequest_SOURCES = \
        internal.h \
        internal.cc \
        list.cc \
+       multicast.h \
        multicast.cc \
        mem_node.cc \
        MemBuf.cc \
@@ -3505,6 +3511,7 @@ tests_testURL_SOURCES = \
        internal.h \
        internal.cc \
        list.cc \
+       multicast.h \
        multicast.cc \
        Mem.h \
        mem.cc \

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index ce1e6d6353aa532f30a8ddf1f7719e08e4d2cd0c..e0aaf923ddcbf2205971228a1fef24814e239934 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -52,6 +52,7 @@
 #include "ip/tools.h"
 #include "ipcache.h"
 #include "md5.h"
+#include "multicast.h"
 #include "neighbors.h"
 #include "protos.h"
 #include "refresh.h"

diff --git a/src/main.cc b/src/main.cc
index 5091e692ff526986667ccd41336edeab0b903ed2..9e1c474d4bb501412c8bda0359eb9da0d3979b35 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -64,6 +64,7 @@
 #include "icmp/net_db.h"
 #include "ICP.h"
 #include "ident/Ident.h"
+#include "ipcache.h"
 #include "ipc/Coordinator.h"
 #include "ipc/Kids.h"
 #include "ipc/Strand.h"

diff --git a/src/multicast.cc b/src/multicast.cc
index 842823d013cc4a910bf045fbca3024b26d16c298..8ea8fcebd2f2c3406c0825ce953141b4739c53ab 100644 (file)
--- a/src/multicast.cc
+++ b/src/multicast.cc
@@ -39,6 +39,7 @@
 // XXX: for icpIncomingConn - need to pass it as a generic parameter.
 #include "ICP.h"
 #include "ipcache.h"
+#include "multicast.h"
 
 int
 mcastSetTtl(int fd, int mcast_ttl)

diff --git a/src/multicast.h b/src/multicast.h
new file mode 100644 (file)
index 0000000..66e4d6f
--- /dev/null
+++ b/src/multicast.h
@@ -0,0 +1,41 @@
+/*
+ * 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_MULTICAST_H_
+#define SQUID_MULTICAST_H_
+
+#include "ipcache.h"
+
+extern int mcastSetTtl(int, int);
+extern IPH mcastJoinGroups;
+
+#endif /* SQUID_MULTICAST_H_ */

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 373dc27ddfb211ed9b75fa83470bc2cbedc2ade2..568065ec1022841c6f03ae3074724afc5613ea3c 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -47,6 +47,7 @@
 #include "ipcache.h"
 #include "MemObject.h"
 #include "mgr/Registration.h"
+#include "multicast.h"
 #include "neighbors.h"
 #include "PeerDigest.h"
 #include "PeerSelectState.h"

diff --git a/src/protos.h b/src/protos.h
index ac2dd1407799feb005322167f916ffe6df8441fb..e5ba6bf14685488b0a09fa2342a092993681e167 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -80,11 +80,6 @@ extern variable_list *snmp_meshPtblFn(variable_list *, snint *);
 extern variable_list *snmp_meshCtblFn(variable_list *, snint *);
 #endif /* SQUID_SNMP */
 
-
-#include "ipcache.h"
-extern int mcastSetTtl(int, int);
-extern IPH mcastJoinGroups;
-
 #include "comm/forward.h"
 extern void getOutgoingAddress(HttpRequest * request, Comm::ConnectionPointer conn);
 extern Ip::Address getOutgoingAddr(HttpRequest * request, struct peer *dst_peer);