rename ip/IpAddress to ip/Address to better reflect the class name after namespace...

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 4ca4de8e26b0dc65d786860199fc7de9255fab88..8597b4e7c78d491db4495bf778b32c6a6340f980 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -33,7 +33,7 @@
 #include "HttpVersion.h"
 #include "HttpRequestMethod.h"
 #include "HierarchyLogEntry.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "HttpRequestMethod.h"
 #if ICAP_CLIENT
 #include "adaptation/icap/Elements.h"

diff --git a/src/ClientInfo.h b/src/ClientInfo.h
index fe403486952f8d22992245fb292ea6ee544111a2..0a44d955743f8c60febc54f34a7977eb4f40b582 100644 (file)
--- a/src/ClientInfo.h
+++ b/src/ClientInfo.h
@@ -1,7 +1,7 @@
 #ifndef SQUID__SRC_CLIENTINFO_H
 #define SQUID__SRC_CLIENTINFO_H
 
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "hash.h"
 #include "enums.h"
 #include "typedefs.h"

diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h
index c8b4649f804d4d6a96b8683356c7dc275c7719c0..2fc9a6801bd0ff04246141956c62beefc27551b0 100644 (file)
--- a/src/CompositePoolNode.h
+++ b/src/CompositePoolNode.h
@@ -44,7 +44,7 @@
 #include "DelayPools.h"
 #include "DelayIdComposite.h"
 #include "CommRead.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 class StoreEntry;
 

diff --git a/src/ConnectionDetail.h b/src/ConnectionDetail.h
index 3ae953a7ed83f99a2fd8b937e910a2d16c7107e2..393fb2aebd23002b35fb07e548f72acaeebaab56 100644 (file)
--- a/src/ConnectionDetail.h
+++ b/src/ConnectionDetail.h
@@ -35,7 +35,7 @@
 #ifndef _SQUIDCONNECTIONDETAIL_H_
 #define _SQUIDCONNECTIONDETAIL_H_
 
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 class ConnectionDetail
 {

diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index db9b65282cbe22c3ed75ada8eb1e8d54f860311c..49e7386c763cbcaa209d805c83a0d60eeb51c602 100644 (file)
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -35,7 +35,7 @@
 
 #include "cbdata.h"
 #include "PingData.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 class ps_state
 {

diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc
index e3afc936947c2c25d810d32e6841dfa93a866859..81e2abaf007ba9da7d3e2c1980aa1200fe3e580d 100644 (file)
--- a/src/acl/Arp.cc
+++ b/src/acl/Arp.cc
@@ -39,7 +39,7 @@
 #include "acl/Arp.h"
 #include "acl/FilledChecklist.h"
 #include "eui/Eui48.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "wordlist.h"
 
 static void aclParseArpList(SplayNode<Eui::Eui48 *> **curlist);

diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index 7097aad44cec854964c5ec22c3cb965178fcf713..f272ec3fda65fa1ecd4cef5c66cc784c4eaeb40c 100644 (file)
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -36,7 +36,7 @@
 #include "CbDataList.h"
 #include "acl/Strategised.h"
 #include "acl/Checklist.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 SQUIDCEXTERN int asnMatchIp(CbDataList<int> *, Ip::Address &);
 

diff --git a/src/acl/DestinationAsn.h b/src/acl/DestinationAsn.h
index 6e98911f94899ca35d0d1c517ff9a690344871c0..1df42699e223a6129ddf06f9514fe417630d4a55 100644 (file)
--- a/src/acl/DestinationAsn.h
+++ b/src/acl/DestinationAsn.h
@@ -34,7 +34,7 @@
 
 #include "acl/Asn.h"
 #include "acl/Strategy.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /// \ingroup ACLAPI
 class ACLDestinationASNStrategy : public ACLStrategy<Ip::Address>

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index d023945316342a84a509e1cff4c210d4b188616a..cd86c4cb215351730c76ccd202bae157248c8eaf 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -39,7 +39,7 @@
 #include "acl/Eui64.h"
 #include "acl/FilledChecklist.h"
 #include "eui/Eui64.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "wordlist.h"
 
 static void aclParseEuiList(SplayNode<Eui::Eui64 *> **curlist);

diff --git a/src/acl/Ip.h b/src/acl/Ip.h
index 3cb83ebcbe57818f90a6a1c80a5b8d13a9a2bd5b..ce75d397b032552b155aaf352d380a506a35a52c 100644 (file)
--- a/src/acl/Ip.h
+++ b/src/acl/Ip.h
@@ -34,7 +34,7 @@
 
 #include "acl/Acl.h"
 #include "splay.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /// \ingroup ACLAPI
 class acl_ip_data

diff --git a/src/acl/SourceAsn.h b/src/acl/SourceAsn.h
index 2ebe5f909fb269b778b1e10a27b18c73bd031b5f..89c335e6fbb23325bd8b3884d8dd6334e4f9ecb3 100644 (file)
--- a/src/acl/SourceAsn.h
+++ b/src/acl/SourceAsn.h
@@ -38,7 +38,7 @@
 class ACLChecklist;
 
 #include "acl/Strategy.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 class ACLSourceASNStrategy : public ACLStrategy<Ip::Address>
 {

diff --git a/src/auth/User.h b/src/auth/User.h
index 1f38e40aac3bf5b494a48023cf98c6f8b4c53eb9..84a233dc9b8bdae7980281a65f3bc7a31673273e 100644 (file)
--- a/src/auth/User.h
+++ b/src/auth/User.h
@@ -41,7 +41,7 @@ class AuthUserHashPointer;
 /* for auth_type_t */
 #include "enums.h"
 
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "dlink.h"
 
 /**

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index bb3f7e48fb9eae978c39c99a5027bb083b9b1d67..2f8a1c1f1d53be649bb0d43414ed47e36413a23e 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -56,7 +56,7 @@
 #endif
 #include "HttpRequestMethod.h"
 #include "ident/Config.h"
-#include "ip/IpIntercept.h"
+#include "ip/Intercept.h"
 #include "ip/QosConfig.h"
 #include "log/Config.h"
 #include "MemBuf.h"

diff --git a/src/client_db.cc b/src/client_db.cc
index 12d2981117bdeeafd6e1a7abab3fc90da982f9c5..125aef24f8293b578c1b6246fcda95a6655c6a10 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -36,7 +36,7 @@
 #include "event.h"
 #include "CacheManager.h"
 #include "ClientInfo.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 79b5f03d49291c15463d630e479223ac2890f1f0..6059e220088f2a44114b450158c295c4cfebb7d0 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -101,7 +101,7 @@
 #include "HttpRequest.h"
 #include "ident/Config.h"
 #include "ident/Ident.h"
-#include "ip/IpIntercept.h"
+#include "ip/Intercept.h"
 #include "MemBuf.h"
 #include "MemObject.h"
 #include "ProtoPort.h"

diff --git a/src/comm.cc b/src/comm.cc
index 795436f0b64ef22f4ea92217ed50934d59dcc8fa..00026672d52e2a0d4df4cbef9f027ed54b39da14 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -49,8 +49,8 @@
 #include "CommCalls.h"
 #include "DescriptorSet.h"
 #include "icmp/net_db.h"
-#include "ip/IpAddress.h"
-#include "ip/IpIntercept.h"
+#include "ip/Address.h"
+#include "ip/Intercept.h"
 
 #if defined(_SQUID_CYGWIN_)
 #include <sys/ioctl.h>

diff --git a/src/comm.h b/src/comm.h
index 1ed60c89c335a8edb0356a62ce60874b8ea458b5..426b9af6bf1ea5a59c8672356e0c84b09e0ba8dd 100644 (file)
--- a/src/comm.h
+++ b/src/comm.h
@@ -6,7 +6,7 @@
 #include "base/AsyncCall.h"
 #include "StoreIOBuffer.h"
 #include "Array.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 #define COMMIO_FD_READCB(fd)    (&commfd_table[(fd)].readcb)
 #define COMMIO_FD_WRITECB(fd)   (&commfd_table[(fd)].writecb)

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index 5d11b8297d14dae450445266ea16ac0a01dd266a..73913fa0ecb140dbac76f33cf88847e064e5dd29 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -64,7 +64,7 @@
 #include "DelayBucket.h"
 #include "DelayUser.h"
 #include "DelayTagged.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /// \ingroup DelayPoolsInternal
 long DelayPools::MemoryUsed = 0;

diff --git a/src/dnsserver.cc b/src/dnsserver.cc
index 2cb10dabdc7a0da6b7f3003d9cec21e67597a098..280ce2b0753e7bd6aedc741ded0084f135a073ba 100644 (file)
--- a/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@ -150,7 +150,7 @@ usage: dnsserver -Dhv -s nameserver
  \endverbatim
  */
 
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 #if LIBRESOLV_DNS_TTL_HACK
 /// \ingroup dnsserver

diff --git a/src/errorpage.h b/src/errorpage.h
index 51406c7e8ab402065307a0400b879ffc386fab23..c02d8f1ff6dca11047a2b8a6490c68995c7edeae 100644 (file)
--- a/src/errorpage.h
+++ b/src/errorpage.h
@@ -36,7 +36,7 @@
 
 #include "squid.h"
 #include "cbdata.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /**
  \defgroup ErrorPageAPI Error Pages API

diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index 07ec697c2c199f7e87137f97c97f49e53c8ba045..57aaa3b6615d534a4bed55184eee77071a602ac5 100644 (file)
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -56,7 +56,7 @@
 #include "esi/Expression.h"
 #include "HttpRequest.h"
 #include "MemBuf.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /* quick reference on behaviour here.
  * The ESI specification 1.0 requires the ESI processor to be able to

diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc
index ce776ea98a591d76f4dbdc69cc64d789d2b3f92c..752434255df91a6b331331839bae1244286578db 100644 (file)
--- a/src/eui/Eui48.cc
+++ b/src/eui/Eui48.cc
@@ -39,7 +39,7 @@
 #include "Debug.h"
 #include "eui/Eui48.h"
 #include "globals.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 
 #if _SQUID_CYGWIN_

diff --git a/src/eui/Eui64.cc b/src/eui/Eui64.cc
index 80a7a1a0c589656ccaeb29220bbed36d1bce09c7..1c6d332c32bc812ed8b6051466a900be3da0d66e 100644 (file)
--- a/src/eui/Eui64.cc
+++ b/src/eui/Eui64.cc
@@ -13,7 +13,7 @@
 #include "Debug.h"
 #include "eui/Eui64.h"
 #include "globals.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 bool
 Eui::Eui64::decode(const char *asc)

diff --git a/src/fde.h b/src/fde.h
index fd2ebe688780f7a52710e768e16e1eb801c639a6..ebfbd36022a9a37fd55a4edae76ddb10d097e197 100644 (file)
--- a/src/fde.h
+++ b/src/fde.h
@@ -31,7 +31,7 @@
 #define SQUID_FDE_H
 
 #include "comm.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 class PconnPool;
 

diff --git a/src/forward.cc b/src/forward.cc
index bf144e8376bfd78dc91df568f59ed3ab294721b2..69f131c4f4a95d09295b2f86e985631e1935db2a 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -47,7 +47,7 @@
 #include "SquidTime.h"
 #include "Store.h"
 #include "icmp/net_db.h"
-#include "ip/IpIntercept.h"
+#include "ip/Intercept.h"
 
 static PSC fwdStartCompleteWrapper;
 static PF fwdServerClosedWrapper;

diff --git a/src/forward.h b/src/forward.h
index 75eaf974b6cc56759cd720a9c22ddd571a056552..0ac5ae90c6ac841cdaf2ab8c262bb8e5df7ac0ff 100644 (file)
--- a/src/forward.h
+++ b/src/forward.h
@@ -8,7 +8,7 @@ class HttpRequest;
 
 #include "comm.h"
 #include "hier_code.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 class FwdServer
 {

diff --git a/src/helper.h b/src/helper.h
index d1bb44fd02aeb9800b35896a3a4fe3588b253da6..6427d93fc37374746bb3770e83f0dd9459d39e26 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -35,7 +35,7 @@
 
 #include "squid.h"
 #include "cbdata.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "HelperChildConfig.h"
 
 class helper_request;

diff --git a/src/icmp/Icmp.h b/src/icmp/Icmp.h
index d8a79da1e815e68550a8479d35e7a901d7f84d1e..3484acd15ac3697f845850ea9f99473d2faa99d6 100644 (file)
--- a/src/icmp/Icmp.h
+++ b/src/icmp/Icmp.h
@@ -33,7 +33,7 @@
 #define _INCLUDE_ICMP_H
 
 #include "config.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 #define PINGER_PAYLOAD_SZ      8192
 

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index f9ab788126b752acb1e67528fbf1bac492405a6f..288fd7e561ef6655d6b9504a3d9e7e29d845a37a 100644 (file)
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -53,7 +53,7 @@
 #include "forward.h"
 #include "SquidTime.h"
 #include "wordlist.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 #if USE_ICMP
 #include "icmp/IcmpSquid.h"

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 25614857f1c6f13c0ea65bd51c7d631eaf26bb52..2afd304e893f7bf1857f7c49e6fcc687c6ea16fc 100644 (file)
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -47,7 +47,7 @@
 #include "SquidTime.h"
 #include "SwapDir.h"
 #include "icmp/net_db.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "rfc1738.h"
 
 /// \ingroup ServerProtocolICPInternal2

diff --git a/src/ip/IpAddress.cc b/src/ip/Address.cc
similarity index 99%
rename from src/ip/IpAddress.cc
rename to src/ip/Address.cc
index 853c652b2cbd34c1994363fa02cf017832c093d4..53eedf59616295e919e337078d53494223692276 100644 (file)
--- a/src/ip/IpAddress.cc
+++ b/src/ip/Address.cc
@@ -38,7 +38,7 @@
 #include "compat/inet_ntop.h"
 #include "compat/getaddrinfo.h"
 #include "Debug.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "util.h"
 
 #if HAVE_ASSERT_H

diff --git a/src/ip/IpAddress.h b/src/ip/Address.h
similarity index 100%
rename from src/ip/IpAddress.h
rename to src/ip/Address.h

diff --git a/src/ip/IpIntercept.cc b/src/ip/Intercept.cc
similarity index 99%
rename from src/ip/IpIntercept.cc
rename to src/ip/Intercept.cc
index 9deced42419dcaaf2b29188223403e15036badc4..4412fe90cf92913a7e8be51e92441d1db82a833e 100644 (file)
--- a/src/ip/IpIntercept.cc
+++ b/src/ip/Intercept.cc
@@ -31,7 +31,7 @@
  *
  */
 #include "config.h"
-#include "ip/IpIntercept.h"
+#include "ip/Intercept.h"
 #include "fde.h"
 
 #if IPF_TRANSPARENT

diff --git a/src/ip/IpIntercept.h b/src/ip/Intercept.h
similarity index 100%
rename from src/ip/IpIntercept.h
rename to src/ip/Intercept.h

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index fb84c1ab0d72d97d8ae5e0beb2b21b882b2898e3..e72888691f5b7b8052b367609534eb3dfd48e7bb 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -4,10 +4,10 @@ include $(top_srcdir)/src/TestHeaders.am
 noinst_LTLIBRARIES = libip.la
 
 libip_la_SOURCES = \
-       IpAddress.h \
-       IpAddress.cc \
-       IpIntercept.h \
-       IpIntercept.cc \
+       Address.h \
+       Address.cc \
+       Intercept.h \
+       Intercept.cc \
        QosConfig.h \
        QosConfig.cc
 
@@ -16,8 +16,8 @@ check_PROGRAMS += testIpAddress
 TESTS += testIpAddress
 
 testIpAddress_SOURCES= \
-       testIpAddress.cc \
-       testIpAddress.h
+       testAddress.cc \
+       testAddress.h
 nodist_testIpAddress_SOURCES= \
        $(top_srcdir)/src/tests/testMain.cc \
        $(top_srcdir)/test-suite/test_tools.cc

diff --git a/src/ip/testIpAddress.cc b/src/ip/testAddress.cc
similarity index 99%
rename from src/ip/testIpAddress.cc
rename to src/ip/testAddress.cc
index cc3c5a0ac128cb9cbb1dbf17169b555d4cd6a7b9..ba90b6ec14ceb89d44f6f3b64f5df4d024cc1e2d 100644 (file)
--- a/src/ip/testIpAddress.cc
+++ b/src/ip/testAddress.cc
@@ -1,8 +1,8 @@
 #define SQUID_UNIT_TEST 1
 #include "config.h"
 #include "compat/getaddrinfo.h"
-#include "testIpAddress.h"
-#include "ip/IpAddress.h"
+#include "testAddress.h"
+#include "ip/Address.h"
 
 #if HAVE_CSTRING
 #include <cstring>

diff --git a/src/ip/testIpAddress.h b/src/ip/testAddress.h
similarity index 100%
rename from src/ip/testIpAddress.h
rename to src/ip/testAddress.h

diff --git a/src/ipc.cc b/src/ipc.cc
index 529501fae3c8838c7f94042c035b1ca4d351e88d..5336b3d12dab636241b7e82bd3de972fdbc3e659 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -33,7 +33,7 @@
 #include "squid.h"
 #include "comm.h"
 #include "fde.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "rfc1738.h"
 
 static const char *hello_string = "hi there\n";

diff --git a/src/ipcache.cc b/src/ipcache.cc
index b98698c260fa0a88669e855c5ab966b50f708200..bfc67a85685673de8ef86f672e51c0fc278abed6 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -37,7 +37,7 @@
 #include "SquidTime.h"
 #include "Store.h"
 #include "wordlist.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /**
  \defgroup IPCacheAPI IP Cache API

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 80facb1f2cdfaeb6e67a1d8d50b3ac2a39e052fd..e0f0717fe036043d8b9ee8c7f60d45139b96cf56 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -45,7 +45,7 @@
 #include "SquidTime.h"
 #include "Store.h"
 #include "icmp/net_db.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 /* count mcast group peers every 15 minutes */
 #define MCAST_COUNT_RATE 900

diff --git a/src/protos.h b/src/protos.h
index 370854d7f1704f30f9771fae90a02d1f1a4e209c..d54dc3c4bfe46f455b6cf651f597db5ae565002e 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -34,7 +34,7 @@
  */
 #include "Packer.h"
 /* for routines still in this file that take CacheManager parameters */
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 /* for parameters that still need these */
 #include "enums.h"
 /* some parameters stil need this */

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 42e10ef7ca4c8fbf05b873c885d4fe58cb68b7a2..8e6adaf494f5a1ccdcef4e324c5cf9436d5d8a2d 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -34,7 +34,7 @@
 #include "cache_snmp.h"
 #include "comm.h"
 #include "compat/strsep.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 #define SNMP_REQUEST_SIZE 4096
 #define MAX_PROTOSTAT 5

diff --git a/src/squid.h b/src/squid.h
index 88fc34c247f9ff79986acb231849576709559aa6..4cdda62bb7c2fb1dd3006a1574e9629e1e47e1aa 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -168,7 +168,7 @@ using namespace Squid;
 #include "util.h"
 #include "profiling.h"
 #include "MemPool.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "structs.h"
 #include "protos.h"
 #include "globals.h"

diff --git a/src/tools.cc b/src/tools.cc
index 97f2c97a9fd98ff18f476f21d2117c32adbe2018..a27372d902e8403e1d9ee6d1d2216d96188d2b46 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -38,7 +38,7 @@
 #include "compat/getnameinfo.h"
 #include "compat/tempnam.h"
 #include "fde.h"
-#include "ip/IpIntercept.h"
+#include "ip/Intercept.h"
 #include "MemBuf.h"
 #include "ProtoPort.h"
 #include "SquidMath.h"

diff --git a/src/wccp2.cc b/src/wccp2.cc
index c5df6025eade06f897a97985fdd1bef5c818af84..edb580d2ed61ac28072c9041f67fb822769fc949 100644 (file)
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -37,7 +37,7 @@
 #include "comm.h"
 #include "compat/strsep.h"
 #include "event.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "Parsing.h"
 #include "Store.h"
 #include "SwapDir.h"

diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc
index b55b3be1574cd00697efab2b813e03cee263e5ba..93ea763cd0b664a21bf5768f01724cd171098672 100644 (file)
--- a/tools/cachemgr.cc
+++ b/tools/cachemgr.cc
@@ -115,7 +115,7 @@ extern "C" {
 #endif
 
 #include "util.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 #include "getfullhostname.h"
 
 #ifndef DEFAULT_CACHEMGR_CONFIG

diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index e62905acbbe5218adff4d75c2766c405c759f86a..2797bd0c654db400dbd73488c22426d5dbdbbf20 100644 (file)
--- a/tools/squidclient.cc
+++ b/tools/squidclient.cc
@@ -78,7 +78,7 @@ using namespace Squid;
 #endif
 
 #include "util.h"
-#include "ip/IpAddress.h"
+#include "ip/Address.h"
 
 #ifndef BUFSIZ
 #define BUFSIZ         8192