From: Henrik Nordstrom Date: Sun, 2 May 2010 19:32:42 +0000 (+0200) Subject: rename ip/IpAddress to ip/Address to better reflect the class name after namespace... X-Git-Tag: SQUID_3_2_0_1~237^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96d89ea0c88d024562ad21eadd501473891b5e42;p=thirdparty%2Fsquid.git rename ip/IpAddress to ip/Address to better reflect the class name after namespace change --- diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h index 4ca4de8e26..8597b4e7c7 100644 --- 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 fe40348695..0a44d95574 100644 --- 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 c8b4649f80..2fc9a6801b 100644 --- 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 3ae953a7ed..393fb2aebd 100644 --- 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 db9b65282c..49e7386c76 100644 --- 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 e3afc93694..81e2abaf00 100644 --- 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 **curlist); diff --git a/src/acl/Asn.h b/src/acl/Asn.h index 7097aad44c..f272ec3fda 100644 --- 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 *, Ip::Address &); diff --git a/src/acl/DestinationAsn.h b/src/acl/DestinationAsn.h index 6e98911f94..1df42699e2 100644 --- 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 diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc index d023945316..cd86c4cb21 100644 --- 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 **curlist); diff --git a/src/acl/Ip.h b/src/acl/Ip.h index 3cb83ebcbe..ce75d397b0 100644 --- 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 2ebe5f909f..89c335e6fb 100644 --- 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 { diff --git a/src/auth/User.h b/src/auth/User.h index 1f38e40aac..84a233dc9b 100644 --- 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 bb3f7e48fb..2f8a1c1f1d 100644 --- 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 12d2981117..125aef24f8 100644 --- 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 79b5f03d49..6059e22008 100644 --- 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 795436f0b6..00026672d5 100644 --- 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 diff --git a/src/comm.h b/src/comm.h index 1ed60c89c3..426b9af6bf 100644 --- 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 5d11b8297d..73913fa0ec 100644 --- 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 2cb10dabdc..280ce2b075 100644 --- 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 51406c7e8a..c02d8f1ff6 100644 --- 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 07ec697c2c..57aaa3b661 100644 --- 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 ce776ea98a..752434255d 100644 --- 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 80a7a1a0c5..1c6d332c32 100644 --- 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 fd2ebe6887..ebfbd36022 100644 --- 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 bf144e8376..69f131c4f4 100644 --- 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 75eaf974b6..0ac5ae90c6 100644 --- 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 d1bb44fd02..6427d93fc3 100644 --- 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 d8a79da1e8..3484acd15a 100644 --- 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 f9ab788126..288fd7e561 100644 --- 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 25614857f1..2afd304e89 100644 --- 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 853c652b2c..53eedf5961 100644 --- 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 9deced4241..4412fe90cf 100644 --- 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 fb84c1ab0d..e72888691f 100644 --- 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 cc3c5a0ac1..ba90b6ec14 100644 --- 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 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 529501fae3..5336b3d12d 100644 --- 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 b98698c260..bfc67a8568 100644 --- 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 80facb1f2c..e0f0717fe0 100644 --- 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 370854d7f1..d54dc3c4bf 100644 --- 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 42e10ef7ca..8e6adaf494 100644 --- 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 88fc34c247..4cdda62bb7 100644 --- 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 97f2c97a9f..a27372d902 100644 --- 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 c5df6025ea..edb580d2ed 100644 --- 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 b55b3be157..93ea763cd0 100644 --- 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 e62905acbb..2797bd0c65 100644 --- 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