Fix link errors

diff --git a/configure.in b/configure.in
index 45bfd2af0583d1f75f12fe356ad82e4033d3695f..e3665a96f712db70f41b44f40805eb8b9daf1461 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -3715,6 +3715,7 @@ AC_CONFIG_FILES([\
        src/auth/Makefile \
        src/adaptation/Makefile \
        src/ICAP/Makefile \
+       src/icmp/Makefile \
        src/eCAP/Makefile \
        contrib/Makefile \
        snmplib/Makefile \

diff --git a/src/Debug.h b/src/Debug.h
index 9d0aa7f7a5d3fb9a997c67709e1177c8020f7bdf..9d0293ba6ed55b1b63cab295fca0c25992b314fc 100644 (file)
--- a/src/Debug.h
+++ b/src/Debug.h
@@ -78,6 +78,8 @@ private:
     static int TheDepth; // level of nested debugging calls
 };
 
+extern FILE *debug_log;
+
 /* Debug stream */
 #define debugs(SECTION, LEVEL, CONTENT) \
    do { \

diff --git a/src/Makefile.am b/src/Makefile.am
index 15b5fa298d27809df5a061e72b56ba8cd5eed7f4..2472d4581ec1e8c84180c45aa6632eb8d1930a0a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -566,7 +566,6 @@ squid_SOURCES = \
        mime.cc \
        multicast.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Packer.h \
        Parsing.cc \
@@ -853,7 +852,6 @@ ufsdump_SOURCES = \
        mime.cc \
        multicast.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Parsing.cc \
        $(XPROF_STATS_SOURCE) \
@@ -1393,7 +1391,6 @@ tests_testCacheManager_SOURCES = \
        MemObject.cc \
        mime.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -1568,7 +1565,6 @@ tests_testEvent_SOURCES = \
        MemObject.cc \
        mime.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -1725,7 +1721,6 @@ tests_testEventLoop_SOURCES = \
        MemObject.cc \
        mime.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -1873,7 +1868,6 @@ tests_test_http_range_SOURCES = \
        mime.cc \
        multicast.cc \
        neighbors.cc \
-       net_db.cc \
        Parsing.cc \
        peer_digest.cc \
        peer_select.cc \
@@ -2033,7 +2027,6 @@ tests_testHttpRequest_SOURCES = \
        MemObject.cc \
        mime.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \
@@ -2381,7 +2374,6 @@ tests_testURL_SOURCES = \
        MemObject.cc \
        mime.cc \
        neighbors.cc \
-       net_db.cc \
        Packer.cc \
        Parsing.cc \
        pconn.cc \

diff --git a/src/comm.cc b/src/comm.cc
index 3652667ac4310d36e5da7435099c712f33078566..d1257cfd876a1d98a0de963f1feedd44c69ff91d 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1515,6 +1515,7 @@ void
 comm_close_start(int fd, void *data)
 {
 #if USE_SSL
+    fde *F = &fd_table[fd];
 
     if (F->ssl)
         ssl_shutdown_method(fd);

diff --git a/src/debug.cc b/src/debug.cc
index 25d15ee06b098272ce98498a0a93893a5878f455..0a7fdb20cf3f59d929aa0921e75927ddbfe6e018 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -40,7 +40,7 @@
 
 int Debug::Levels[MAX_DEBUG_SECTIONS];
 int Debug::level;
-
+FILE *debug_log = NULL;
 static char *debug_log_file = NULL;
 static int Ctx_Lock = 0;
 static const char *debugLogTime(void);

diff --git a/src/globals.h b/src/globals.h
index 3af974ff1199fb9ccef41622fbb709c6be765766..aaeacb895519c5a475905fa1b550a2c9fa795944 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -50,7 +50,7 @@ extern "C"
 {
 #endif
 
-    extern FILE *debug_log;            /* NULL */
+//MOVED:Debug.h    extern FILE *debug_log;             /* NULL */
 //MOVED:structs.h    extern SquidConfig Config;
 //MOVED:structs.h    extern SquidConfig2 Config2;
     extern char *ConfigFile;   /* NULL */

diff --git a/src/pinger.cc b/src/icmp/pinger.cc
similarity index 98%
rename from src/pinger.cc
rename to src/icmp/pinger.cc
index 5aa9a7862226d8fa024e70651ef7989a6ac67c52..8be6bb336954fb6afd3b192fe3bcefcaab578610 100644 (file)
--- a/src/pinger.cc
+++ b/src/icmp/pinger.cc
@@ -68,9 +68,9 @@
 
 #if USE_ICMP
 
-#include "ICMPv4.h"
-#include "ICMPv6.h"
-#include "ICMPPinger.h"
+#include "Icmp4.h"
+#include "Icmp6.h"
+#include "IcmpPinger.h"
 
 #ifdef _SQUID_MSWIN_
 
@@ -107,10 +107,10 @@ Win32__WSAFDIsSet(int fd, fd_set FAR * set)
 #endif /* _SQUID_MSWIN_ */
 
 // ICMP Engines are declared global here so they can call each other easily.
-ICMPPinger control;
-ICMPv4 icmp4;
+IcmpPinger control;
+Icmp4 icmp4;
 #if USE_IPV6
-ICMPv6 icmp6;
+Icmp6 icmp6;
 #endif
 
 int icmp_pkts_sent = 0;

diff --git a/src/structs.h b/src/structs.h
index ba763e7ed125ecf843f11a4f6f574374a52080c7..cdb36706cd5c31e2ebe7eab74c4ab28fb803f446 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -130,7 +130,7 @@ struct relist
 #endif
 
 #if USE_ICMP
-#include "ICMPConfig.h"
+#include "icmp/IcmpConfig.h"
 #endif
 
 /* forward decl for SquidConfig, see RemovalPolicy.h */
@@ -259,7 +259,7 @@ struct SquidConfig
 #endif
 
 #if USE_ICMP
-    ICMPConfig pinger;
+    IcmpConfig pinger;
 #endif
 
     char *as_whois_server;