Split ICMP library in two. Move Net DB protos into icmp/net_db.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 015839a02477cd544a67913a8536634f54818cdb..a1d9c5edfd91c86874964df5dc22747cee781bb3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -681,7 +681,7 @@ nodist_squid_SOURCES = \
 squid_LDADD = \
        libsquid.la \
        libauth.la \
-       libsquid-icmp.la \
+       icmp/libicmp.la icmp/libicmp-core.la \
        -L../lib \
        @XTRA_OBJS@ \
        @DISK_LINKOBJS@ \
@@ -904,7 +904,7 @@ ufsdump_SOURCES = \
 ufsdump_LDADD = \
        libsquid.la \
        libauth.la \
-       libsquid-icmp.la \
+       icmp/libicmp.la icmp/libicmp-core.la \
        -L../lib \
        @XTRA_OBJS@ \
        @REPL_OBJS@ \
@@ -1447,7 +1447,7 @@ nodist_tests_testCacheManager_SOURCES = \
 tests_testCacheManager_LDADD = \
        libsquid.la \
        libauth.la \
-       libsquid-icmp.la \
+       icmp/libicmp.la icmp/libicmp-core.la \
        @REPL_OBJS@ \
        ${ADAPTATION_LIBS} \
        @REGEXLIB@ \

diff --git a/src/icmp/net_db.h b/src/icmp/net_db.h
new file mode 100644 (file)
index 0000000..60596ab
--- /dev/null
+++ b/src/icmp/net_db.h
@@ -0,0 +1,37 @@
+#ifndef ICMP_NET_DB_H
+#define ICMP_NET_DB_H
+
+
+class IPAddress;
+class StoreEntry;
+class HttpRequest;
+
+/* for struct peer */
+#include "structs.h"
+
+
+SQUIDCEXTERN void netdbInit(void);
+
+SQUIDCEXTERN void netdbHandlePingReply(const IPAddress &from, int hops, int rtt);
+SQUIDCEXTERN void netdbPingSite(const char *hostname);
+SQUIDCEXTERN void netdbDump(StoreEntry *);
+
+#if 0 // AYJ: Looks to be unused now.
+SQUIDCEXTERN int netdbHops(IPAddress &);
+#endif
+
+SQUIDCEXTERN void netdbFreeMemory(void);
+SQUIDCEXTERN int netdbHostHops(const char *host);
+SQUIDCEXTERN int netdbHostRtt(const char *host);
+SQUIDCEXTERN void netdbUpdatePeer(HttpRequest *, peer * e, int rtt, int hops);
+
+SQUIDCEXTERN void netdbDeleteAddrNetwork(IPAddress &addr);
+SQUIDCEXTERN void netdbBinaryExchange(StoreEntry *);
+SQUIDCEXTERN void netdbExchangeStart(void *);
+
+SQUIDCEXTERN void netdbExchangeUpdatePeer(IPAddress &, peer *, double, double);
+SQUIDCEXTERN peer *netdbClosestParent(HttpRequest *);
+SQUIDCEXTERN void netdbHostData(const char *host, int *samp, int *rtt, int *hops);
+
+
+#endif /* ICMP_NET_DB_H */

diff --git a/src/protos.h b/src/protos.h
index 94379bfb8f3e42c32aa900d14af90a78102aebf7..a8ce6819081afacd03faeb3f3a2fc958837fc3e0 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -413,28 +413,6 @@ SQUIDCEXTERN int peerHTTPOkay(const peer *, HttpRequest *);
 
 SQUIDCEXTERN peer *whichPeer(const IPAddress &from);
 
-SQUIDCEXTERN void netdbInit(void);
-
-SQUIDCEXTERN void netdbHandlePingReply(const IPAddress &from, int hops, int rtt);
-SQUIDCEXTERN void netdbPingSite(const char *hostname);
-SQUIDCEXTERN void netdbDump(StoreEntry *);
-
-#if 0 // AYJ: Looks to be unused now.
-SQUIDCEXTERN int netdbHops(IPAddress &);
-#endif
-SQUIDCEXTERN void netdbFreeMemory(void);
-SQUIDCEXTERN int netdbHostHops(const char *host);
-SQUIDCEXTERN int netdbHostRtt(const char *host);
-SQUIDCEXTERN void netdbUpdatePeer(HttpRequest *, peer * e, int rtt, int hops);
-
-SQUIDCEXTERN void netdbDeleteAddrNetwork(IPAddress &addr);
-SQUIDCEXTERN void netdbBinaryExchange(StoreEntry *);
-SQUIDCEXTERN void netdbExchangeStart(void *);
-
-SQUIDCEXTERN void netdbExchangeUpdatePeer(IPAddress &, peer *, double, double);
-SQUIDCEXTERN peer *netdbClosestParent(HttpRequest *);
-SQUIDCEXTERN void netdbHostData(const char *host, int *samp, int *rtt, int *hops);
-
 SQUIDCEXTERN void peerSelect(HttpRequest *, StoreEntry *, PSC *, void *data);
 SQUIDCEXTERN void peerSelectInit(void);