From 582c2af2e0ac15b9e59843f35f7093a7154491a9 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 14 Aug 2012 13:53:07 +0200 Subject: [PATCH] Removed squid-old.h --- compat/compat.dox | 5 +- compat/stdio.h | 4 + scripts/source-maintenance.sh | 8 +- src/AccessLogEntry.cc | 1 + src/AclRegs.cc | 2 +- src/AsyncEngine.h | 3 - src/BodyPipe.cc | 2 +- src/CacheDigest.cc | 4 +- src/CacheManager.h | 1 + src/ChunkedCodingParser.cc | 3 +- src/ClientDelayConfig.cc | 7 +- src/ClientRequestContext.h | 14 +- src/CommCalls.cc | 5 +- src/CommRead.h | 1 - src/CommonPool.h | 1 - src/CompletionDispatcher.h | 3 - src/CompositePoolNode.h | 6 +- src/ConfigOption.cc | 2 +- src/ConfigParser.cc | 2 + src/ConfigParser.h | 3 +- src/CpuAffinity.cc | 2 + src/DelayBucket.cc | 1 - src/DelayConfig.cc | 9 +- src/DelayId.cc | 10 +- src/DelayIdComposite.h | 2 +- src/DelayPool.h | 1 - src/DelaySpec.cc | 4 +- src/DelayTagged.cc | 1 - src/DelayTagged.h | 1 - src/DelayUser.cc | 5 +- src/DelayUser.h | 1 - src/DelayVector.cc | 3 +- src/DescriptorSet.cc | 1 + src/DescriptorSet.h | 1 - src/DiskIO/AIO/AIODiskFile.cc | 3 +- src/DiskIO/AIO/AIODiskFile.h | 1 + src/DiskIO/AIO/AIODiskIOModule.cc | 2 +- src/DiskIO/AIO/AIODiskIOStrategy.cc | 2 +- src/DiskIO/AIO/aio_win32.cc | 2 +- src/DiskIO/Blocking/BlockingDiskIOModule.cc | 2 +- src/DiskIO/Blocking/BlockingFile.cc | 2 + src/DiskIO/Blocking/BlockingIOStrategy.cc | 1 + .../DiskDaemon/DiskDaemonDiskIOModule.cc | 2 +- src/DiskIO/DiskDaemon/DiskdAction.cc | 7 +- src/DiskIO/DiskDaemon/DiskdFile.cc | 2 +- src/DiskIO/DiskDaemon/DiskdIOStrategy.cc | 14 +- src/DiskIO/DiskFile.h | 2 +- src/DiskIO/DiskIOModule.cc | 2 +- src/DiskIO/DiskIOModule.h | 1 - src/DiskIO/DiskIOStrategy.h | 4 +- src/DiskIO/DiskThreads/CommIO.cc | 3 +- src/DiskIO/DiskThreads/CommIO.h | 1 + src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc | 8 +- .../DiskThreads/DiskThreadsDiskIOModule.cc | 2 +- .../DiskThreads/DiskThreadsIOStrategy.cc | 2 +- src/DiskIO/DiskThreads/aiops.cc | 2 +- src/DiskIO/DiskThreads/aiops_win32.cc | 2 +- src/DiskIO/DiskThreads/async_io.cc | 2 +- src/DiskIO/IORequestor.h | 2 - src/DiskIO/IpcIo/IpcIoDiskIOModule.cc | 2 +- src/DiskIO/IpcIo/IpcIoFile.cc | 2 + src/DiskIO/IpcIo/IpcIoFile.h | 1 + src/DiskIO/IpcIo/IpcIoIOStrategy.cc | 1 + src/DiskIO/Mmapped/MmappedDiskIOModule.cc | 2 +- src/DiskIO/Mmapped/MmappedFile.cc | 9 + src/DiskIO/Mmapped/MmappedIOStrategy.cc | 1 + src/DiskIO/ReadRequest.h | 2 - src/DiskIO/WriteRequest.h | 2 - src/EventLoop.cc | 1 + src/EventLoop.h | 1 - src/ExternalACLEntry.cc | 2 +- src/FadingCounter.cc | 6 +- src/HelperChildConfig.cc | 2 + src/HttpBody.cc | 2 +- src/HttpHdrCc.cc | 3 +- src/HttpHdrCc.cci | 4 + src/HttpHdrCc.h | 2 + src/HttpHdrContRange.cc | 6 +- src/HttpHdrRange.cc | 3 +- src/HttpHdrSc.cc | 7 +- src/HttpHdrSc.h | 2 + src/HttpHdrScTarget.cc | 2 +- src/HttpHdrScTarget.h | 8 +- src/HttpHeader.cc | 6 +- src/HttpHeaderTools.cc | 11 +- src/HttpHeaderTools.h | 4 + src/HttpMsg.cc | 5 +- src/HttpMsg.h | 1 + src/HttpParser.cc | 1 + src/HttpReply.cc | 14 +- src/HttpReply.h | 1 + src/HttpRequest.cc | 24 ++- src/HttpRequest.h | 22 +-- src/HttpRequestMethod.cc | 2 +- src/HttpRequestMethod.h | 5 +- src/HttpStatusLine.cc | 5 +- src/HttpStatusLine.h | 3 + src/ICP.h | 3 + src/LeakFinder.cc | 2 +- src/LoadableModule.cc | 2 +- src/LoadableModules.cc | 5 +- src/Makefile.am | 2 - src/MemBuf.cc | 9 +- src/MemObject.cc | 13 +- src/MemObject.h | 1 + src/MemStore.cc | 3 +- src/NullDelayId.cc | 3 +- src/NullDelayId.h | 2 +- src/Packer.cc | 2 +- src/Parsing.cc | 1 + src/Parsing.h | 2 +- src/PeerDigest.h | 3 - src/ProfStats.cc | 3 +- src/RemovalPolicy.h | 1 - src/Server.cc | 15 +- src/SquidNew.cc | 2 +- src/StatHist.cc | 3 + src/Store.h | 13 +- src/StoreClient.h | 1 + src/StoreFileSystem.cc | 2 +- src/StoreFileSystem.h | 1 - src/StoreIOState.cc | 4 +- src/StoreMeta.cc | 2 +- src/StoreMetaMD5.cc | 8 +- src/StoreMetaSTD.cc | 2 +- src/StoreMetaSTDLFS.cc | 2 +- src/StoreMetaURL.cc | 2 +- src/StoreMetaUnpacker.cc | 4 +- src/StoreMetaVary.cc | 2 +- src/StoreSearch.h | 1 - src/StoreSwapLogData.h | 4 +- src/String.cc | 8 +- src/String.cci | 2 +- src/SwapDir.cc | 7 +- src/WinSvc.cc | 2 +- src/acl/Acl.cc | 3 +- src/acl/Acl.h | 3 + src/acl/Arp.cc | 4 +- src/acl/Asn.cc | 3 +- src/acl/Browser.cc | 2 +- src/acl/Certificate.cc | 6 +- src/acl/CertificateData.cc | 3 +- src/acl/Checklist.cc | 4 +- src/acl/DestinationDomain.cc | 3 +- src/acl/DestinationIp.cc | 4 +- src/acl/DomainData.cc | 4 +- src/acl/Eui64.cc | 4 +- src/acl/ExtUser.cc | 3 +- src/acl/FilledChecklist.cc | 13 +- src/acl/FilledChecklist.h | 1 + src/acl/Gadgets.cc | 4 +- src/acl/HierCode.cc | 2 +- src/acl/HierCodeData.cc | 3 +- src/acl/HttpHeaderData.cc | 4 +- src/acl/HttpRepHeader.cc | 2 +- src/acl/HttpReqHeader.cc | 2 +- src/acl/HttpStatus.cc | 10 +- src/acl/IntRange.cc | 4 +- src/acl/Ip.cc | 5 +- src/acl/LocalIp.cc | 2 +- src/acl/LocalPort.cc | 2 +- src/acl/MaxConnection.cc | 6 +- src/acl/Method.cc | 2 +- src/acl/Method.h | 3 +- src/acl/MethodData.cc | 3 +- src/acl/MethodData.h | 1 + src/acl/MyPortName.cc | 2 +- src/acl/PeerName.cc | 2 +- src/acl/Protocol.cc | 2 +- src/acl/ProtocolData.cc | 4 +- src/acl/Random.cc | 4 +- src/acl/Referer.cc | 2 +- src/acl/RegexData.cc | 6 +- src/acl/ReplyMimeType.cc | 2 +- src/acl/RequestMimeType.cc | 2 +- src/acl/SourceDomain.cc | 3 +- src/acl/SourceIp.cc | 2 +- src/acl/SslError.cc | 2 +- src/acl/SslErrorData.cc | 3 +- src/acl/Strategised.cc | 2 +- src/acl/StringData.cc | 4 +- src/acl/Tag.cc | 2 +- src/acl/Time.cc | 2 +- src/acl/TimeData.cc | 4 +- src/acl/Url.cc | 3 +- src/acl/UrlPath.cc | 2 +- src/acl/UrlPort.cc | 2 +- src/acl/UserData.cc | 3 +- src/adaptation/AccessCheck.cc | 19 +- src/adaptation/AccessRule.cc | 4 +- src/adaptation/Config.cc | 20 +-- src/adaptation/Config.h | 3 + src/adaptation/Elements.cc | 2 +- src/adaptation/History.cc | 1 + src/adaptation/Initiate.cc | 2 +- src/adaptation/Initiator.cc | 2 +- src/adaptation/Iterator.cc | 2 +- src/adaptation/Message.cc | 2 +- src/adaptation/Service.cc | 2 +- src/adaptation/ServiceConfig.cc | 6 +- src/adaptation/ServiceFilter.cc | 2 +- src/adaptation/ServiceGroups.cc | 10 +- src/adaptation/ecap/Config.cc | 2 +- src/adaptation/ecap/Host.cc | 2 +- src/adaptation/ecap/MessageRep.cc | 2 +- src/adaptation/ecap/ServiceRep.cc | 2 +- src/adaptation/ecap/XactionRep.cc | 2 +- src/adaptation/icap/Client.cc | 3 +- src/adaptation/icap/Config.cc | 4 +- src/adaptation/icap/Elements.cc | 2 +- src/adaptation/icap/History.cc | 3 +- src/adaptation/icap/History.h | 3 +- src/adaptation/icap/Launcher.cc | 3 +- src/adaptation/icap/ModXact.cc | 7 +- src/adaptation/icap/OptXact.cc | 14 +- src/adaptation/icap/Options.cc | 3 +- src/adaptation/icap/Options.h | 2 +- src/adaptation/icap/ServiceRep.cc | 8 +- src/adaptation/icap/Xaction.cc | 24 +-- src/adaptation/icap/icap_log.cc | 2 +- src/adaptation/icap/icap_log.h | 1 + src/auth/Acl.cc | 3 +- src/auth/AclMaxUserIp.cc | 35 +--- src/auth/AclMaxUserIp.h | 2 - src/auth/AclProxyAuth.cc | 4 +- src/auth/AclProxyAuth.h | 3 - src/auth/Config.cc | 4 +- src/auth/Gadgets.cc | 3 +- src/auth/Scheme.cc | 3 +- src/auth/User.cc | 3 +- src/auth/UserRequest.cc | 3 +- src/auth/basic/Scheme.cc | 1 + src/auth/basic/User.cc | 1 + src/auth/basic/UserRequest.cc | 1 + src/auth/basic/auth_basic.cc | 3 +- src/auth/digest/Scheme.cc | 2 + src/auth/digest/User.cc | 1 + src/auth/digest/UserRequest.cc | 1 + src/auth/digest/auth_digest.cc | 3 +- src/auth/negotiate/Scheme.cc | 1 + src/auth/negotiate/UserRequest.cc | 3 + src/auth/negotiate/auth_negotiate.cc | 3 +- src/auth/ntlm/Scheme.cc | 1 + src/auth/ntlm/UserRequest.cc | 2 + src/auth/ntlm/auth_ntlm.cc | 3 +- src/base/AsyncCall.cc | 4 +- src/base/AsyncCallQueue.cc | 1 + src/base/AsyncCallQueue.h | 7 - src/base/AsyncJob.cc | 2 +- src/base/AsyncJobCalls.h | 1 + src/base/TextException.cc | 2 +- src/cache_cf.cc | 65 ++++--- src/cache_diff.cc | 2 +- src/carp.cc | 7 +- src/cbdata.cc | 4 + src/cbdata.h | 2 +- src/clientStream.cc | 2 +- src/clientStream.h | 5 +- src/client_db.cc | 3 +- src/client_side.cc | 35 ++-- src/client_side.h | 7 +- src/client_side_reply.cc | 34 ++-- src/client_side_request.cc | 37 ++-- src/client_side_request.h | 5 - src/comm.cc | 28 ++- src/comm.h | 2 +- src/comm/AcceptLimiter.cc | 1 + src/comm/ConnOpener.cc | 2 + src/comm/Connection.h | 1 + src/comm/IoCallback.cc | 1 + src/comm/ModDevPoll.cc | 2 +- src/comm/ModEpoll.cc | 3 +- src/comm/ModKqueue.cc | 4 +- src/comm/ModPoll.cc | 5 +- src/comm/ModSelect.cc | 6 +- src/comm/ModSelectWin32.cc | 2 - src/comm/TcpAcceptor.cc | 5 +- src/comm/Write.cc | 3 + src/comm/Write.h | 2 + src/delay_pools.cc | 35 ++-- src/disk.cc | 4 +- src/dns.cc | 2 +- src/dns_internal.cc | 10 +- src/errorpage.cc | 3 +- src/errorpage.h | 10 +- src/esi/Assign.cc | 2 +- src/esi/Assign.h | 3 +- src/esi/Attempt.h | 1 - src/esi/Context.cc | 2 +- src/esi/Context.h | 5 +- src/esi/CustomParser.cc | 5 +- src/esi/Element.h | 3 +- src/esi/ElementList.h | 1 - src/esi/Esi.cc | 26 +-- src/esi/Except.h | 1 - src/esi/ExpatParser.cc | 2 +- src/esi/Expression.cc | 8 +- src/esi/Expression.h | 2 - src/esi/Include.cc | 5 +- src/esi/Include.h | 5 +- src/esi/Libxml2Parser.cc | 2 +- src/esi/Literal.h | 1 - src/esi/Module.cc | 2 +- src/esi/Parser.cc | 3 +- src/esi/Segment.cc | 3 +- src/esi/Segment.h | 1 + src/esi/Sequence.cc | 4 +- src/esi/Sequence.h | 2 +- src/esi/Var.h | 1 - src/esi/VarState.cc | 3 +- src/event.cc | 2 + src/event.h | 3 +- src/external_acl.cc | 39 ++-- src/fd.cc | 6 +- src/fde.cc | 6 +- src/fde.h | 1 + src/format/Format.cc | 2 + src/forward.cc | 19 +- src/forward.h | 12 +- src/fqdncache.cc | 3 +- src/fs/Module.cc | 2 +- src/fs/aufs/StoreFSaufs.cc | 8 - src/fs/coss/store_dir_coss.cc | 9 +- src/fs/coss/store_io_coss.cc | 2 +- src/fs/rock/RockIoState.cc | 1 + src/fs/rock/RockRebuild.cc | 3 + src/fs/rock/RockStoreFileSystem.h | 1 + src/fs/rock/RockSwapDir.cc | 5 + src/fs/ufs/RebuildState.cc | 8 + src/fs/ufs/UFSStoreState.cc | 4 +- src/fs/ufs/UFSSwapDir.cc | 8 +- src/fs/ufs/UFSSwapLogParser.cc | 5 + src/ftp.cc | 9 +- src/globals.h | 31 +--- src/gopher.cc | 20 ++- src/helper.cc | 5 +- src/helper.h | 4 +- src/htcp.cc | 9 +- src/htcp.h | 4 +- src/http.cc | 23 +-- src/icmp/Icmp.cc | 2 +- src/icmp/Icmp4.cc | 3 +- src/icmp/Icmp6.cc | 3 +- src/icmp/IcmpPinger.cc | 2 +- src/icmp/IcmpSquid.cc | 3 +- src/icmp/net_db.cc | 7 +- src/icmp/pinger.cc | 3 +- src/icmp/testIcmp.cc | 2 +- src/icp_v2.cc | 22 +-- src/icp_v3.cc | 2 +- src/ident/AclIdent.cc | 3 +- src/ident/Ident.cc | 2 +- src/int.cc | 7 +- src/internal.cc | 5 +- src/ip/Qos.cci | 1 + src/ip/QosConfig.cc | 4 +- src/ip/stubQosConfig.cc | 2 +- src/ipc.cc | 4 +- src/ipc/Coordinator.cc | 1 + src/ipc/ReadWriteLock.cc | 2 +- src/ipc/SharedListen.cc | 2 + src/ipc/StartListening.cc | 2 +- src/ipc/StoreMap.cc | 3 +- src/ipc/Strand.cc | 1 + src/ipc/UdsOp.h | 1 + src/ipc/mem/Pages.cc | 1 + src/ipc_win32.cc | 2 +- src/ipcache.cc | 4 +- src/list.cc | 4 +- src/log/File.cc | 2 +- src/log/FormatHttpdCombined.cc | 1 + src/log/FormatHttpdCommon.cc | 1 + src/log/FormatSquidIcap.cc | 1 + src/log/FormatSquidNative.cc | 1 + src/log/ModDaemon.cc | 4 +- src/log/ModStdio.cc | 4 +- src/log/ModSyslog.cc | 3 +- src/log/ModTcp.cc | 4 +- src/log/ModUdp.cc | 4 +- src/log/access_log.cc | 3 +- src/main.cc | 83 ++++----- src/mem.cc | 10 +- src/mem_node.cc | 3 +- src/mem_node.h | 2 + src/mgr/BasicActions.cc | 2 +- src/mgr/CountersAction.cc | 1 + src/mgr/Forwarder.cc | 1 + src/mgr/FunAction.cc | 2 + src/mgr/InfoAction.cc | 2 + src/mgr/Inquirer.cc | 1 + src/mgr/IntervalAction.cc | 1 + src/mgr/IoAction.cc | 1 + src/mgr/ServiceTimesAction.cc | 2 +- src/mgr/StoreIoAction.cc | 1 + src/mgr/StoreToCommWriter.cc | 1 + src/mime.cc | 16 +- src/mime_header.cc | 19 +- src/multicast.cc | 3 +- src/neighbors.cc | 11 +- src/pconn.cc | 10 +- src/peer_digest.cc | 8 +- src/peer_select.cc | 18 +- src/peer_sourcehash.cc | 9 +- src/peer_userhash.cc | 12 +- src/protos.h | 109 ++++++----- src/redirect.cc | 22 +-- src/refresh.cc | 9 +- src/repl/heap/store_heap_replacement.cc | 6 +- src/repl/heap/store_repl_heap.cc | 3 +- src/repl/lru/store_repl_lru.cc | 2 +- src/send-announce.cc | 4 +- src/snmp/Forwarder.cc | 1 + src/snmp_agent.cc | 6 +- src/snmp_core.cc | 3 +- src/squid-old.h | 170 ------------------ src/ssl/ErrorDetail.cc | 5 +- src/ssl/ErrorDetailManager.cc | 3 +- src/ssl/ServerBump.cc | 1 + src/ssl/ServerBump.h | 1 + src/ssl/support.cc | 6 +- src/stat.cc | 36 ++-- src/stmem.cc | 7 +- src/store.cc | 28 +-- src/store_client.cc | 12 +- src/store_digest.cc | 13 +- src/store_dir.cc | 12 +- src/store_io.cc | 2 +- src/store_key_md5.cc | 4 +- src/store_log.cc | 2 +- src/store_rebuild.cc | 5 +- src/store_swapin.cc | 3 +- src/store_swapmeta.cc | 9 +- src/store_swapout.cc | 3 +- src/structs.h | 4 + src/test_cache_digest.cc | 2 +- src/tests/TestSwapDir.cc | 2 - src/tests/TestSwapDir.h | 1 - src/tests/stub_DelayId.cc | 1 - src/tests/stub_access_log.cc | 2 +- src/tests/stub_acl.cc | 2 +- src/tests/stub_cache_cf.cc | 3 +- src/tests/stub_cache_manager.cc | 3 +- src/tests/stub_errorpage.cc | 1 + src/tests/stub_fd.cc | 1 + src/tests/stub_http.cc | 5 +- src/tests/stub_stat.cc | 2 +- src/tests/stub_store.cc | 2 +- src/tests/stub_store_client.cc | 3 +- src/tests/stub_store_rebuild.cc | 4 +- src/tests/stub_store_stats.cc | 2 +- src/tests/testACLMaxUserIP.cc | 2 +- src/tests/testAuth.cc | 2 +- src/tests/testBoilerplate.cc | 2 +- src/tests/testCacheManager.cc | 2 +- src/tests/testCoss.cc | 2 +- src/tests/testDiskIO.cc | 2 +- src/tests/testEvent.cc | 5 +- src/tests/testEventLoop.cc | 7 +- src/tests/testHttpParser.cc | 1 + src/tests/testHttpReply.cc | 1 + src/tests/testHttpRequest.cc | 1 + src/tests/testHttpRequestMethod.cc | 2 +- src/tests/testNull.cc | 2 +- src/tests/testRock.cc | 7 +- src/tests/testStore.cc | 2 +- src/tests/testStore.h | 1 - src/tests/testStoreController.cc | 2 +- src/tests/testStoreEntryStream.cc | 2 +- src/tests/testStoreHashIndex.cc | 2 +- src/tests/testURLScheme.cc | 3 +- src/tests/testUfs.cc | 8 +- src/tools.cc | 12 +- src/tunnel.cc | 14 +- src/typedefs.h | 5 +- src/unlinkd.cc | 8 +- src/url.cc | 6 +- src/urn.cc | 4 +- src/wccp.cc | 4 +- src/wccp2.cc | 4 +- src/whois.cc | 7 +- src/win32.cc | 2 +- src/wordlist.h | 3 +- test-suite/ESIExpressions.cc | 2 +- test-suite/MemPoolTest.cc | 2 +- test-suite/StackTest.cc | 2 +- test-suite/VirtualDeleteOperator.cc | 2 +- test-suite/debug.cc | 5 +- test-suite/mem_hdr_test.cc | 2 +- test-suite/mem_node_test.cc | 2 +- test-suite/refcount.cc | 2 +- test-suite/syntheticoperators.cc | 2 +- test-suite/test_tools.cc | 3 +- tools/purge/conffile.hh | 4 +- tools/purge/purge.cc | 9 +- tools/purge/socket.hh | 2 +- 495 files changed, 1473 insertions(+), 1213 deletions(-) delete mode 100644 src/squid-old.h diff --git a/compat/compat.dox b/compat/compat.dox index 2193544ef0..d9af22df68 100644 --- a/compat/compat.dox +++ b/compat/compat.dox @@ -69,12 +69,9 @@ The strict dependency requirements which exist within the compat API make includ individual part separately a risky operation. \par -Squid coding guidelines require each .c and .cc file to include squid-old.h or squid.h first +Squid coding guidelines require each .c and .cc file to include squid.h first in their included files. squid.h begin with an order-specific sequence of defines and includes compat/compat.h to incorporate the compat layer appropriately in every soure file. -squid-old.h begins by including squid.h to prepare for its sub-includes and definitions. -It is recommended to include squid.h and not squid-old.h for new developments; squid-old.h -is being deprecated. \par Internally the compat/ directory contains the public API file compat/compat.h which structures diff --git a/compat/stdio.h b/compat/stdio.h index 8bcc117e2d..9db46782c4 100644 --- a/compat/stdio.h +++ b/compat/stdio.h @@ -50,4 +50,8 @@ inline FILE * tmpfile(void) { return tmpfile64(); } #include #endif +#ifndef MAXPATHLEN +#define MAXPATHLEN SQUID_MAXPATHLEN +#endif + #endif /* _SQUID_COMPAT_STDIO_H */ diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh index 9198f7efc0..b201f5110f 100755 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -68,18 +68,18 @@ for FILENAME in `ls -1`; do fi # - # REQUIRE squid.h/squid-old.h as first #include + # REQUIRE squid.h first #include # case ${FILENAME} in *.c|*.cc) FI=`grep "#include" ${FILENAME} | head -1`; - if test "${FI}" != "#include \"squid.h\"" -a "${FI}" != "#include \"squid-old.h\"" -a "${FILENAME}" != "cf_gen.cc"; then - echo "ERROR: ${PWD}/${FILENAME} does not include squid.h or squid-old.h first!" + if test "${FI}" != "#include \"squid.h\"" -a "${FILENAME}" != "cf_gen.cc"; then + echo "ERROR: ${PWD}/${FILENAME} does not include squid.h first!" fi ;; *.h|*.cci) FI=`grep "#include \"squid.h\"" ${FILENAME}`; - if test "x${FI}" != "x" -a "${FILENAME}" != "squid-old.h" ; then + if test "x${FI}" != "x" ; then echo "ERROR: ${PWD}/${FILENAME} duplicate include of squid.h" fi ;; diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc index cfab6e533b..3b646cc416 100644 --- a/src/AccessLogEntry.cc +++ b/src/AccessLogEntry.cc @@ -1,5 +1,6 @@ #include "squid.h" #include "AccessLogEntry.h" +#include "HttpReply.h" #include "HttpRequest.h" #include "ssl/support.h" diff --git a/src/AclRegs.cc b/src/AclRegs.cc index 8953c736f1..e644d95a77 100644 --- a/src/AclRegs.cc +++ b/src/AclRegs.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" /** This file exists to provide satic registration code to executables that need ACLs. We cannot place this code in acl/lib*.la because it diff --git a/src/AsyncEngine.h b/src/AsyncEngine.h index 35f42146b2..9b60137716 100644 --- a/src/AsyncEngine.h +++ b/src/AsyncEngine.h @@ -34,9 +34,6 @@ #ifndef SQUID_ASYNCENGINE_H #define SQUID_ASYNCENGINE_H -#include "squid-old.h" - - /* Abstract interface for async engines which an event loop can utilise. * * Some implementations will be truely async, others like the event engine diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc index b792623e41..4abd535943 100644 --- a/src/BodyPipe.cc +++ b/src/BodyPipe.cc @@ -1,5 +1,5 @@ -#include "squid-old.h" +#include "squid.h" #include "base/AsyncJobCalls.h" #include "base/TextException.h" #include "BodyPipe.h" diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc index 9c7ed7e99c..47b6788d7e 100644 --- a/src/CacheDigest.cc +++ b/src/CacheDigest.cc @@ -33,7 +33,9 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "md5.h" +#include "protos.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/CacheManager.h b/src/CacheManager.h index 696f481828..4f27246040 100644 --- a/src/CacheManager.h +++ b/src/CacheManager.h @@ -49,6 +49,7 @@ \ingroup CacheManagerAPI */ +class HttpRequest; /** \ingroup CacheManagerAPI * a CacheManager - the menu system for interacting with squid. diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc index 3b99f4ef8c..db8c5f375c 100644 --- a/src/ChunkedCodingParser.cc +++ b/src/ChunkedCodingParser.cc @@ -1,5 +1,6 @@ -#include "squid-old.h" +#include "squid.h" #include "base/TextException.h" +#include "Debug.h" #include "Parsing.h" #include "ChunkedCodingParser.h" #include "MemBuf.h" diff --git a/src/ClientDelayConfig.cc b/src/ClientDelayConfig.cc index 23e0de95ef..d72e7a282d 100644 --- a/src/ClientDelayConfig.cc +++ b/src/ClientDelayConfig.cc @@ -1,11 +1,10 @@ #include "squid.h" -#include "squid-old.h" -#include "ConfigParser.h" +#include "acl/Acl.h" +#include "acl/Gadgets.h" #include "ClientDelayConfig.h" +#include "ConfigParser.h" #include "Parsing.h" #include "Store.h" -#include "acl/Acl.h" -#include "acl/Gadgets.h" void ClientDelayPool::dump(StoreEntry * entry, unsigned int poolNumberMinusOne) const { diff --git a/src/ClientRequestContext.h b/src/ClientRequestContext.h index 74233cebc0..f597107598 100644 --- a/src/ClientRequestContext.h +++ b/src/ClientRequestContext.h @@ -1,19 +1,19 @@ #ifndef SQUID_CLIENTREQUESTCONTEXT_H #define SQUID_CLIENTREQUESTCONTEXT_H -class ACLChecklist; -class ClientHttpRequest; -class DnsLookupDetails; - -/* for RefCountable */ -#include "RefCount.h" -/* for CBDATA_CLASS() */ #include "cbdata.h" +#include "RefCount.h" +#include "ipcache.h" #if USE_ADAPTATION #include "adaptation/forward.h" #endif +class ACLChecklist; +class ClientHttpRequest; +class DnsLookupDetails; +class ErrorState; + class ClientRequestContext : public RefCountable { diff --git a/src/CommCalls.cc b/src/CommCalls.cc index b080f2f63b..99d3bd52a0 100644 --- a/src/CommCalls.cc +++ b/src/CommCalls.cc @@ -1,7 +1,8 @@ -#include "squid-old.h" -#include "fde.h" +#include "squid.h" #include "comm/Connection.h" #include "CommCalls.h" +#include "fde.h" +#include "globals.h" /* CommCommonCbParams */ diff --git a/src/CommRead.h b/src/CommRead.h index ba5ff3bbd7..da0d5c72e2 100644 --- a/src/CommRead.h +++ b/src/CommRead.h @@ -36,7 +36,6 @@ #ifndef COMMREAD_H #define COMMREAD_H -#include "squid-old.h" #include "comm.h" #include "CommCalls.h" #include "comm/forward.h" diff --git a/src/CommonPool.h b/src/CommonPool.h index 45f1c5c334..d8c80c519b 100644 --- a/src/CommonPool.h +++ b/src/CommonPool.h @@ -39,7 +39,6 @@ #define COMMONPOOL_H #if USE_DELAY_POOLS -#include "squid-old.h" #include "SquidString.h" #include "CompositePoolNode.h" diff --git a/src/CompletionDispatcher.h b/src/CompletionDispatcher.h index e5b6d578df..788bd6deb8 100644 --- a/src/CompletionDispatcher.h +++ b/src/CompletionDispatcher.h @@ -34,9 +34,6 @@ #ifndef SQUID_COMPLETIONDISPATCHER_H #define SQUID_COMPLETIONDISPATCHER_H -#include "squid-old.h" - - /* Dispatch code to handle events that have completed. Completed events are queued * with a completion dispatcher by the OS Async engine - i.e. the poll or kqueue or * select loop, or a signal reciever, or the diskd/diskthreads/etc modules. diff --git a/src/CompositePoolNode.h b/src/CompositePoolNode.h index afdae833e9..ee6789559b 100644 --- a/src/CompositePoolNode.h +++ b/src/CompositePoolNode.h @@ -37,12 +37,12 @@ #define COMPOSITEPOOLNODE_H #if USE_DELAY_POOLS -#include "squid-old.h" #include "auth/UserRequest.h" -#include "DelayPools.h" -#include "DelayIdComposite.h" #include "CommRead.h" +#include "DelayIdComposite.h" +#include "DelayPools.h" #include "ip/Address.h" +#include "SquidString.h" class StoreEntry; diff --git a/src/ConfigOption.cc b/src/ConfigOption.cc index 74306f9729..6cd1deece7 100644 --- a/src/ConfigOption.cc +++ b/src/ConfigOption.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "ConfigOption.h" ConfigOptionVector::~ConfigOptionVector() diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc index 3d3dabf9b2..9548eb7b7d 100644 --- a/src/ConfigParser.cc +++ b/src/ConfigParser.cc @@ -35,7 +35,9 @@ #include "squid.h" #include "ConfigParser.h" +#include "Debug.h" #include "globals.h" +#include "protos.h" void ConfigParser::destruct() diff --git a/src/ConfigParser.h b/src/ConfigParser.h index f7fa61e4d6..3a22c5a76a 100644 --- a/src/ConfigParser.h +++ b/src/ConfigParser.h @@ -36,8 +36,9 @@ #ifndef SQUID_CONFIGPARSER_H #define SQUID_CONFIGPARSER_H -#include "squid-old.h" +#include "SquidString.h" +class wordlist; /** * Limit to how long any given config line may be. * This affects squid.conf and all included files. diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc index da5274a06d..e84e29a5c0 100644 --- a/src/CpuAffinity.cc +++ b/src/CpuAffinity.cc @@ -10,6 +10,8 @@ #include "CpuAffinity.h" #include "CpuAffinityMap.h" #include "CpuAffinitySet.h" +#include "Debug.h" +#include "protos.h" #include "structs.h" #include diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc index 5249c55f16..088ab04ad6 100644 --- a/src/DelayBucket.cc +++ b/src/DelayBucket.cc @@ -39,7 +39,6 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" #include "DelayBucket.h" #include "DelaySpec.h" #include "Store.h" diff --git a/src/DelayConfig.cc b/src/DelayConfig.cc index 442afb113a..73306568e7 100644 --- a/src/DelayConfig.cc +++ b/src/DelayConfig.cc @@ -40,14 +40,13 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" -#include "DelayConfig.h" +#include "acl/Acl.h" +#include "acl/Gadgets.h" #include "ConfigParser.h" -#include "DelayPools.h" +#include "DelayConfig.h" #include "DelayPool.h" +#include "DelayPools.h" #include "Store.h" -#include "acl/Acl.h" -#include "acl/Gadgets.h" void DelayConfig::parsePoolCount() diff --git a/src/DelayId.cc b/src/DelayId.cc index 01da4f74d9..5ddb46b1af 100644 --- a/src/DelayId.cc +++ b/src/DelayId.cc @@ -43,15 +43,13 @@ * #if to exclude the delay pools code from compile process when not needed. */ #if USE_DELAY_POOLS - -#include "squid-old.h" -#include "DelayId.h" -#include "client_side_request.h" #include "acl/FilledChecklist.h" -#include "DelayPools.h" +#include "client_side_request.h" +#include "CommRead.h" +#include "DelayId.h" #include "DelayPool.h" +#include "DelayPools.h" #include "HttpRequest.h" -#include "CommRead.h" DelayId::DelayId () : pool_ (0), compositeId(NULL), markedAsNoDelay(false) {} diff --git a/src/DelayIdComposite.h b/src/DelayIdComposite.h index 3f12c0b104..39ca140be1 100644 --- a/src/DelayIdComposite.h +++ b/src/DelayIdComposite.h @@ -40,7 +40,7 @@ #define DELAYIDCOMPOSITE_H #if USE_DELAY_POOLS -#include "squid-old.h" +#include "fatal.h" #include "RefCount.h" class DeferredRead; diff --git a/src/DelayPool.h b/src/DelayPool.h index 432418bf2e..1867d6c7d3 100644 --- a/src/DelayPool.h +++ b/src/DelayPool.h @@ -40,7 +40,6 @@ #define DELAYPOOL_H #if USE_DELAY_POOLS -#include "squid-old.h" #include "CompositePoolNode.h" class StoreEntry; diff --git a/src/DelaySpec.cc b/src/DelaySpec.cc index 7beed06239..b11b113b5e 100644 --- a/src/DelaySpec.cc +++ b/src/DelaySpec.cc @@ -40,10 +40,10 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" #include "DelaySpec.h" -#include "Store.h" #include "Parsing.h" +#include "protos.h" +#include "Store.h" DelaySpec::DelaySpec() : restore_bps(-1), max_bytes (-1) {} diff --git a/src/DelayTagged.cc b/src/DelayTagged.cc index 586816bd12..442d342d2d 100644 --- a/src/DelayTagged.cc +++ b/src/DelayTagged.cc @@ -38,7 +38,6 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" #include "comm/Connection.h" #include "DelayTagged.h" #include "NullDelayId.h" diff --git a/src/DelayTagged.h b/src/DelayTagged.h index 0335e34ef9..09095ef535 100644 --- a/src/DelayTagged.h +++ b/src/DelayTagged.h @@ -38,7 +38,6 @@ #if USE_DELAY_POOLS -#include "squid-old.h" #include "auth/Gadgets.h" #include "CompositePoolNode.h" #include "DelayIdComposite.h" diff --git a/src/DelayUser.cc b/src/DelayUser.cc index ea72409d5f..f6d4cc8e4c 100644 --- a/src/DelayUser.cc +++ b/src/DelayUser.cc @@ -38,11 +38,10 @@ #include "squid.h" #if USE_DELAY_POOLS && USE_AUTH -#include "squid-old.h" -#include "DelayUser.h" -#include "auth/UserRequest.h" #include "auth/User.h" +#include "auth/UserRequest.h" #include "comm/Connection.h" +#include "DelayUser.h" #include "NullDelayId.h" #include "Store.h" diff --git a/src/DelayUser.h b/src/DelayUser.h index 92fcadc687..108dd702b6 100644 --- a/src/DelayUser.h +++ b/src/DelayUser.h @@ -38,7 +38,6 @@ #if USE_DELAY_POOLS && USE_AUTH -#include "squid-old.h" #include "auth/Gadgets.h" #include "auth/User.h" #include "CompositePoolNode.h" diff --git a/src/DelayVector.cc b/src/DelayVector.cc index 0d434ea9c5..20f02e4485 100644 --- a/src/DelayVector.cc +++ b/src/DelayVector.cc @@ -40,10 +40,9 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" #include "comm/Connection.h" -#include "DelayVector.h" #include "CommRead.h" +#include "DelayVector.h" void * DelayVector::operator new(size_t size) diff --git a/src/DescriptorSet.cc b/src/DescriptorSet.cc index 12d12b3c6b..049d62de26 100644 --- a/src/DescriptorSet.cc +++ b/src/DescriptorSet.cc @@ -4,6 +4,7 @@ * DEBUG: section 05 Comm */ #include "squid.h" +#include "globals.h" /* for Squid_MaxFD */ #include "DescriptorSet.h" // pre-allocates descriptor store and index for Squid_MaxFD descriptors diff --git a/src/DescriptorSet.h b/src/DescriptorSet.h index 8e99dfb823..302529b3f9 100644 --- a/src/DescriptorSet.h +++ b/src/DescriptorSet.h @@ -1,7 +1,6 @@ #ifndef SQUID_DESCRIPTOR_SET_H #define SQUID_DESCRIPTOR_SET_H -#include "squid-old.h" /** \ingroup Comm diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc index 047447ac50..ccc7415dc6 100644 --- a/src/DiskIO/AIO/AIODiskFile.cc +++ b/src/DiskIO/AIO/AIODiskFile.cc @@ -44,12 +44,13 @@ * per storedir it should work just fine. */ -#include "squid-old.h" +#include "squid.h" #include "AIODiskFile.h" #include "AIODiskIOStrategy.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "protos.h" CBDATA_CLASS_INIT(AIODiskFile); void * diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h index 76d06a614b..c424735df3 100644 --- a/src/DiskIO/AIO/AIODiskFile.h +++ b/src/DiskIO/AIO/AIODiskFile.h @@ -38,6 +38,7 @@ #include "DiskIO/DiskFile.h" #include "async_io.h" #include "cbdata.h" +#include "SquidString.h" class AIODiskIOStrategy; diff --git a/src/DiskIO/AIO/AIODiskIOModule.cc b/src/DiskIO/AIO/AIODiskIOModule.cc index 54cd745d0d..9a7811f002 100644 --- a/src/DiskIO/AIO/AIODiskIOModule.cc +++ b/src/DiskIO/AIO/AIODiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "AIODiskIOModule.h" #include "AIODiskIOStrategy.h" #include "Store.h" diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc index ef1777093d..94c22ba946 100644 --- a/src/DiskIO/AIO/AIODiskIOStrategy.cc +++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc @@ -42,7 +42,7 @@ * per storedir it should work just fine. */ -#include "squid-old.h" +#include "squid.h" #include "AIODiskIOStrategy.h" #include "AIODiskFile.h" #include "DiskIO/IORequestor.h" diff --git a/src/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc index d047691964..180d4b4ab5 100644 --- a/src/DiskIO/AIO/aio_win32.cc +++ b/src/DiskIO/AIO/aio_win32.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm.h" #include "aio_win32.h" diff --git a/src/DiskIO/Blocking/BlockingDiskIOModule.cc b/src/DiskIO/Blocking/BlockingDiskIOModule.cc index b1dce0a4f6..c446359f94 100644 --- a/src/DiskIO/Blocking/BlockingDiskIOModule.cc +++ b/src/DiskIO/Blocking/BlockingDiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "BlockingDiskIOModule.h" #include "BlockingIOStrategy.h" diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc index 590b4986c3..7047b34ec8 100644 --- a/src/DiskIO/Blocking/BlockingFile.cc +++ b/src/DiskIO/Blocking/BlockingFile.cc @@ -34,9 +34,11 @@ */ #include "squid.h" #include "BlockingFile.h" +#include "Debug.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "protos.h" CBDATA_CLASS_INIT(BlockingFile); diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc index 7ce57af323..de5d52fd13 100644 --- a/src/DiskIO/Blocking/BlockingIOStrategy.cc +++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc @@ -37,6 +37,7 @@ #include "squid.h" #include "BlockingIOStrategy.h" #include "BlockingFile.h" +#include "protos.h" bool BlockingIOStrategy::shedLoad() diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc index c906610a0b..7872fde475 100644 --- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc +++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "DiskDaemonDiskIOModule.h" #include "DiskdIOStrategy.h" #include "DiskIO/DiskDaemon/DiskdAction.h" diff --git a/src/DiskIO/DiskDaemon/DiskdAction.cc b/src/DiskIO/DiskDaemon/DiskdAction.cc index 1c141eae5f..009a6c7efd 100644 --- a/src/DiskIO/DiskDaemon/DiskdAction.cc +++ b/src/DiskIO/DiskDaemon/DiskdAction.cc @@ -7,12 +7,13 @@ #include "squid.h" #include "base/TextException.h" -#include "Store.h" +#include "DiskIO/DiskDaemon/DiskdAction.h" +#include "DiskIO/DiskDaemon/DiskdIOStrategy.h" #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/ActionWriter.h" -#include "DiskIO/DiskDaemon/DiskdAction.h" -#include "DiskIO/DiskDaemon/DiskdIOStrategy.h" +#include "Store.h" +#include "protos.h" DiskdActionData::DiskdActionData() diff --git a/src/DiskIO/DiskDaemon/DiskdFile.cc b/src/DiskIO/DiskDaemon/DiskdFile.cc index 7523ca1e84..22bccd176f 100644 --- a/src/DiskIO/DiskDaemon/DiskdFile.cc +++ b/src/DiskIO/DiskDaemon/DiskdFile.cc @@ -33,7 +33,7 @@ * CopyRight (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include #include diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc index 47bd63f146..aaa02b3ac9 100644 --- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc +++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc @@ -33,22 +33,22 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "comm/Loops.h" - -#include -#include -#include -#include "DiskdIOStrategy.h" #include "ConfigOption.h" +#include "DiskdIOStrategy.h" #include "DiskIO/DiskFile.h" #include "DiskdFile.h" #include "diomsg.h" -/* for statfs */ +#include "protos.h" #include "Store.h" #include "StatCounters.h" #include "SquidTime.h" +#include +#include +#include + diskd_stats_t diskd_stats; size_t DiskdIOStrategy::nextInstanceID (0); diff --git a/src/DiskIO/DiskFile.h b/src/DiskIO/DiskFile.h index 4a0a668e3f..70c6bba8f7 100644 --- a/src/DiskIO/DiskFile.h +++ b/src/DiskIO/DiskFile.h @@ -33,7 +33,7 @@ #ifndef SQUID_DISKFILE_H #define SQUID_DISKFILE_H -#include "squid-old.h" +#include "typedefs.h" #include "RefCount.h" diff --git a/src/DiskIO/DiskIOModule.cc b/src/DiskIO/DiskIOModule.cc index 91c84e3f42..48a58c9ced 100644 --- a/src/DiskIO/DiskIOModule.cc +++ b/src/DiskIO/DiskIOModule.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "DiskIOModule.h" Vector *DiskIOModule::_Modules = NULL; diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h index 4dfddeccd3..058c10244d 100644 --- a/src/DiskIO/DiskIOModule.h +++ b/src/DiskIO/DiskIOModule.h @@ -34,7 +34,6 @@ #ifndef SQUID_DISKIOMODULE_H #define SQUID_DISKIOMODULE_H -#include "squid-old.h" #include "Array.h" /* forward decls */ diff --git a/src/DiskIO/DiskIOStrategy.h b/src/DiskIO/DiskIOStrategy.h index 1f1c8d5bd8..c175357ce1 100644 --- a/src/DiskIO/DiskIOStrategy.h +++ b/src/DiskIO/DiskIOStrategy.h @@ -33,8 +33,8 @@ #ifndef SQUID_DISKIOSTRATEGY_H #define SQUID_DISKIOSTRATEGY_H -#include "squid-old.h" - +#include "squid.h" +#include "Store.h" #include "RefCount.h" class DiskFile; diff --git a/src/DiskIO/DiskThreads/CommIO.cc b/src/DiskIO/DiskThreads/CommIO.cc index 9e7d56168f..9de30912b0 100644 --- a/src/DiskIO/DiskThreads/CommIO.cc +++ b/src/DiskIO/DiskThreads/CommIO.cc @@ -33,9 +33,10 @@ */ #include "squid.h" -#include "squid-old.h" #include "comm/Loops.h" #include "DiskIO/DiskThreads/CommIO.h" +#include "globals.h" +#include "protos.h" void CommIO::Initialise() diff --git a/src/DiskIO/DiskThreads/CommIO.h b/src/DiskIO/DiskThreads/CommIO.h index cd351b510e..92dba278cb 100644 --- a/src/DiskIO/DiskThreads/CommIO.h +++ b/src/DiskIO/DiskThreads/CommIO.h @@ -2,6 +2,7 @@ #define SQUID_SRC_DISKIO_DISKTHREADS_COMMIO_H #include "fde.h" +#include "globals.h" class CommIO { diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc index fd3a5f4a3b..a405d6f8bb 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc @@ -34,14 +34,16 @@ */ -#include "squid-old.h" +#include "squid.h" #include "DiskThreadsDiskFile.h" -#include "Store.h" -#include "Generic.h" #include "DiskIO/IORequestor.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "Generic.h" +#include "globals.h" #include "StatCounters.h" +#include "Store.h" +#include "protos.h" /* === PUBLIC =========================================================== */ diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc index fb2509a5c9..a5bc030b35 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc @@ -31,7 +31,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "DiskThreadsDiskIOModule.h" #include "DiskThreadsIOStrategy.h" diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc index 296e3f4ca2..d98ff8a1c3 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "DiskThreadsDiskFile.h" #include "DiskThreadsIOStrategy.h" diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc index 2874fdb468..686e411353 100644 --- a/src/DiskIO/DiskThreads/aiops.cc +++ b/src/DiskIO/DiskThreads/aiops.cc @@ -36,7 +36,7 @@ #error "_REENTRANT MUST be defined to build squid async io support." #endif -#include "squid-old.h" +#include "squid.h" #include "DiskThreads.h" #include diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc index 6b9eb6a966..fecccc66ec 100644 --- a/src/DiskIO/DiskThreads/aiops_win32.cc +++ b/src/DiskIO/DiskThreads/aiops_win32.cc @@ -34,7 +34,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "squid_windows.h" #include "DiskIO/DiskThreads/CommIO.h" #include "DiskThreads.h" diff --git a/src/DiskIO/DiskThreads/async_io.cc b/src/DiskIO/DiskThreads/async_io.cc index 53200fbaef..b3a4ac1e5e 100644 --- a/src/DiskIO/DiskThreads/async_io.cc +++ b/src/DiskIO/DiskThreads/async_io.cc @@ -34,7 +34,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "DiskThreads.h" #include "Store.h" #include "fde.h" diff --git a/src/DiskIO/IORequestor.h b/src/DiskIO/IORequestor.h index 739fd0dd7e..4f041ea454 100644 --- a/src/DiskIO/IORequestor.h +++ b/src/DiskIO/IORequestor.h @@ -34,8 +34,6 @@ #ifndef SQUID_IOREQUESTOR_H #define SQUID_IOREQUESTOR_H -#include "squid-old.h" - #include "RefCount.h" class ReadRequest; diff --git a/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc b/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc index 5519da1e11..d0878e43e7 100644 --- a/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc +++ b/src/DiskIO/IpcIo/IpcIoDiskIOModule.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "IpcIoDiskIOModule.h" #include "IpcIoIOStrategy.h" diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index 58293cce08..0b5069aa6c 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -11,6 +11,7 @@ #include "DiskIO/IpcIo/IpcIoFile.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "globals.h" #include "ipc/Messages.h" #include "ipc/Port.h" #include "ipc/Queue.h" @@ -19,6 +20,7 @@ #include "ipc/mem/Pages.h" #include "StatCounters.h" #include "SquidTime.h" +#include "protos.h" CBDATA_CLASS_INIT(IpcIoFile); diff --git a/src/DiskIO/IpcIo/IpcIoFile.h b/src/DiskIO/IpcIo/IpcIoFile.h index 091743601e..ea89620973 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.h +++ b/src/DiskIO/IpcIo/IpcIoFile.h @@ -5,6 +5,7 @@ #include "cbdata.h" #include "DiskIO/DiskFile.h" #include "DiskIO/IORequestor.h" +#include "SquidString.h" #include "ipc/forward.h" #include "ipc/mem/Page.h" #include diff --git a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc index cc38d791df..9fded819dc 100644 --- a/src/DiskIO/IpcIo/IpcIoIOStrategy.cc +++ b/src/DiskIO/IpcIo/IpcIoIOStrategy.cc @@ -8,6 +8,7 @@ #include "squid.h" #include "IpcIoFile.h" #include "IpcIoIOStrategy.h" +#include "protos.h" bool IpcIoIOStrategy::shedLoad() diff --git a/src/DiskIO/Mmapped/MmappedDiskIOModule.cc b/src/DiskIO/Mmapped/MmappedDiskIOModule.cc index 4d1b195494..841800446e 100644 --- a/src/DiskIO/Mmapped/MmappedDiskIOModule.cc +++ b/src/DiskIO/Mmapped/MmappedDiskIOModule.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "MmappedDiskIOModule.h" #include "MmappedIOStrategy.h" diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc index b10174e03a..30c2cb3ac6 100644 --- a/src/DiskIO/Mmapped/MmappedFile.cc +++ b/src/DiskIO/Mmapped/MmappedFile.cc @@ -5,11 +5,20 @@ */ #include "squid.h" +#include "Debug.h" #include "DiskIO/IORequestor.h" #include "DiskIO/Mmapped/MmappedFile.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" +#include "globals.h" +#include "protos.h" + +#if HAVE_SYS_MMAN_H #include +#endif +#if HAVE_SYS_STAT_H +#include +#endif CBDATA_CLASS_INIT(MmappedFile); diff --git a/src/DiskIO/Mmapped/MmappedIOStrategy.cc b/src/DiskIO/Mmapped/MmappedIOStrategy.cc index 6c6a013f34..41d4f679c3 100644 --- a/src/DiskIO/Mmapped/MmappedIOStrategy.cc +++ b/src/DiskIO/Mmapped/MmappedIOStrategy.cc @@ -8,6 +8,7 @@ #include "squid.h" #include "MmappedFile.h" #include "MmappedIOStrategy.h" +#include "protos.h" bool MmappedIOStrategy::shedLoad() diff --git a/src/DiskIO/ReadRequest.h b/src/DiskIO/ReadRequest.h index 87d4be3417..6ab3f606b4 100644 --- a/src/DiskIO/ReadRequest.h +++ b/src/DiskIO/ReadRequest.h @@ -34,8 +34,6 @@ #ifndef SQUID_READREQUEST_H #define SQUID_READREQUEST_H -#include "squid-old.h" - #include "cbdata.h" #include "RefCount.h" diff --git a/src/DiskIO/WriteRequest.h b/src/DiskIO/WriteRequest.h index b36b75dc03..846cc98537 100644 --- a/src/DiskIO/WriteRequest.h +++ b/src/DiskIO/WriteRequest.h @@ -34,8 +34,6 @@ #ifndef SQUID_WRITEREQUEST_H #define SQUID_WRITEREQUEST_H -#include "squid-old.h" - #include "cbdata.h" #include "RefCount.h" diff --git a/src/EventLoop.cc b/src/EventLoop.cc index 58dcff15d3..fc3ea3d356 100644 --- a/src/EventLoop.cc +++ b/src/EventLoop.cc @@ -33,6 +33,7 @@ */ #include "squid.h" +#include "Debug.h" #include "EventLoop.h" #include "base/AsyncCallQueue.h" diff --git a/src/EventLoop.h b/src/EventLoop.h index 75df854269..0ba0f0dd82 100644 --- a/src/EventLoop.h +++ b/src/EventLoop.h @@ -33,7 +33,6 @@ #ifndef SQUID_EVENTLOOP_H #define SQUID_EVENTLOOP_H -#include "squid-old.h" #include "Array.h" #include "AsyncEngine.h" #include "SquidTime.h" diff --git a/src/ExternalACLEntry.cc b/src/ExternalACLEntry.cc index 9c7d2dde3b..ade17e63b4 100644 --- a/src/ExternalACLEntry.cc +++ b/src/ExternalACLEntry.cc @@ -41,7 +41,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "ExternalACLEntry.h" #include "SquidTime.h" diff --git a/src/FadingCounter.cc b/src/FadingCounter.cc index aad8cdae4d..8cf193593e 100644 --- a/src/FadingCounter.cc +++ b/src/FadingCounter.cc @@ -2,11 +2,15 @@ * $Id$ */ -#include "squid-old.h" +#include "squid.h" #include "base/TextException.h" #include "SquidTime.h" #include "FadingCounter.h" +#if HAVE_MATH_H +#include +#endif /* HAVE_MATH_H */ + FadingCounter::FadingCounter(): horizon(-1), precision(10), delta(-1), lastTime(0), total(0) { diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc index b7c2df3bab..b75e3252a2 100644 --- a/src/HelperChildConfig.cc +++ b/src/HelperChildConfig.cc @@ -1,6 +1,8 @@ #include "squid.h" +#include "Debug.h" #include "HelperChildConfig.h" #include "globals.h" +#include "protos.h" #include diff --git a/src/HttpBody.cc b/src/HttpBody.cc index caecd9e59f..110d282d56 100644 --- a/src/HttpBody.cc +++ b/src/HttpBody.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "HttpBody.h" #include "MemBuf.h" diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc index 4b77ebec27..9d5411633f 100644 --- a/src/HttpHdrCc.cc +++ b/src/HttpHdrCc.cc @@ -30,13 +30,14 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "base/StringArea.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" #include "HttpHdrCc.h" #include "StatHist.h" #include "Store.h" +#include "protos.h" #if HAVE_MAP #include diff --git a/src/HttpHdrCc.cci b/src/HttpHdrCc.cci index c02e7025dd..4256a8bfbb 100644 --- a/src/HttpHdrCc.cci +++ b/src/HttpHdrCc.cci @@ -29,6 +29,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ + +#include "defines.h" +#include "Debug.h" + bool HttpHdrCc::isSet(http_hdr_cc_type id) const { diff --git a/src/HttpHdrCc.h b/src/HttpHdrCc.h index 9b56771a3f..32d4115bb8 100644 --- a/src/HttpHdrCc.h +++ b/src/HttpHdrCc.h @@ -32,7 +32,9 @@ #ifndef SQUID_HTTPHDRCC_H #define SQUID_HTTPHDRCC_H +#include "enums.h" #include "MemPool.h" +#include "Packer.h" #include "SquidString.h" /** Http Cache-Control header representation diff --git a/src/HttpHdrContRange.cc b/src/HttpHdrContRange.cc index 7f48810f9a..f7d6b94a0a 100644 --- a/src/HttpHdrContRange.cc +++ b/src/HttpHdrContRange.cc @@ -33,8 +33,12 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" +#include "enums.h" #include "HttpHdrContRange.h" +#include "HttpHeaderTools.h" +#include "protos.h" /* * Currently only byte ranges are supported diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc index c1f2cd79eb..db8ae7a592 100644 --- a/src/HttpHdrRange.cc +++ b/src/HttpHdrRange.cc @@ -33,11 +33,12 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "HttpHeaderRange.h" #include "client_side_request.h" #include "HttpReply.h" +#include "protos.h" /* * Currently only byte ranges are supported diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc index 34e94f3bb3..eac4a02549 100644 --- a/src/HttpHdrSc.cc +++ b/src/HttpHdrSc.cc @@ -36,11 +36,12 @@ * */ -#include "squid-old.h" -#include "Store.h" +#include "squid.h" +#include "HttpHdrSc.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" -#include "HttpHdrSc.h" +#include "Store.h" +#include "protos.h" #if HAVE_MAP #include diff --git a/src/HttpHdrSc.h b/src/HttpHdrSc.h index d26bd9c175..ff14f543a4 100644 --- a/src/HttpHdrSc.h +++ b/src/HttpHdrSc.h @@ -37,6 +37,8 @@ #include "dlink.h" #include "HttpHdrScTarget.h" +class StatHist; + /* http surogate control header field */ class HttpHdrSc diff --git a/src/HttpHdrScTarget.cc b/src/HttpHdrScTarget.cc index cc9571ad6c..aac03689ac 100644 --- a/src/HttpHdrScTarget.cc +++ b/src/HttpHdrScTarget.cc @@ -35,7 +35,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "HttpHdrSc.h" #include "StatHist.h" diff --git a/src/HttpHdrScTarget.h b/src/HttpHdrScTarget.h index 18b1843c2a..af881a6e52 100644 --- a/src/HttpHdrScTarget.h +++ b/src/HttpHdrScTarget.h @@ -32,14 +32,16 @@ #ifndef SQUID_HTTPHDRSURROGATECONTROLTARGET_H #define SQUID_HTTPHDRSURROGATECONTROLTARGET_H -class Packer; -class StoreEntry; - #include "MemPool.h" +#include "defines.h" #include "dlink.h" #include "SquidString.h" #include "typedefs.h" +class StatHist; +class Packer; +class StoreEntry; + /** Representation of HTTP Surogate-Control header field targeted directive * * \see HttpHdrSc diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index 9ea97ffb2c..9a29cb7be0 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -33,15 +33,17 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "base64.h" -#include "HttpHdrContRange.h" #include "HttpHdrCc.h" +#include "HttpHdrContRange.h" #include "HttpHdrSc.h" #include "HttpHeader.h" #include "HttpHeaderStat.h" #include "MemBuf.h" #include "mgr/Registration.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "rfc1123.h" #include "StatHist.h" #include "Store.h" diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index 223c375a38..74d6dc53ee 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -32,11 +32,11 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" -#include "client_side.h" #include "client_side_request.h" +#include "client_side.h" #include "comm/Connection.h" #include "compat/strtoll.h" #include "fde.h" @@ -45,14 +45,15 @@ #include "HttpHeaderTools.h" #include "HttpRequest.h" #include "MemBuf.h" +#include "protos.h" +#include "Store.h" + #if USE_SSL #include "ssl/support.h" #endif -#include "Store.h" + #include -#if HAVE_STRING #include -#endif static void httpHeaderPutStrvf(HttpHeader * hdr, http_hdr_type id, const char *fmt, va_list vargs); diff --git a/src/HttpHeaderTools.h b/src/HttpHeaderTools.h index 4824874efa..a954607ce0 100644 --- a/src/HttpHeaderTools.h +++ b/src/HttpHeaderTools.h @@ -2,6 +2,7 @@ #define SQUID_HTTPHEADERTOOLS_H #include "format/Format.h" +#include "HttpHeader.h" #if HAVE_LIST #include @@ -89,4 +90,7 @@ public: /// whether fieldValue may contain macros bool quoted; }; + +SQUIDCEXTERN int httpHeaderParseOffset(const char *start, int64_t * off); + #endif diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc index bbe4536660..772d35f2f3 100644 --- a/src/HttpMsg.cc +++ b/src/HttpMsg.cc @@ -33,9 +33,12 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "HttpMsg.h" #include "MemBuf.h" +#include "profiler/Profiler.h" +#include "protos.h" HttpMsg::HttpMsg(http_hdr_owner_type owner): header(owner), cache_control(NULL), hdr_sz(0), content_length(0), protocol(AnyP::PROTO_NONE), diff --git a/src/HttpMsg.h b/src/HttpMsg.h index 6020014a14..81b33af0e5 100644 --- a/src/HttpMsg.h +++ b/src/HttpMsg.h @@ -35,6 +35,7 @@ #include "typedefs.h" #include "HttpHeader.h" +#include "HttpRequestMethod.h" #include "HttpStatusCode.h" #include "HttpVersion.h" #include "BodyPipe.h" diff --git a/src/HttpParser.cc b/src/HttpParser.cc index 69c926bccf..eba3d4cc86 100644 --- a/src/HttpParser.cc +++ b/src/HttpParser.cc @@ -2,6 +2,7 @@ #include "Debug.h" #include "HttpParser.h" #include "structs.h" +#include "profiler/Profiler.h" void HttpParser::clear() diff --git a/src/HttpReply.cc b/src/HttpReply.cc index 26dd9f3e06..aac0bdb7e9 100644 --- a/src/HttpReply.cc +++ b/src/HttpReply.cc @@ -33,17 +33,19 @@ * */ -#include "squid-old.h" -#include "SquidTime.h" -#include "Store.h" +#include "squid.h" +#include "acl/FilledChecklist.h" +#include "globals.h" #include "HttpBody.h" -#include "HttpReply.h" -#include "HttpHdrContRange.h" #include "HttpHdrCc.h" +#include "HttpHdrContRange.h" #include "HttpHdrSc.h" -#include "acl/FilledChecklist.h" +#include "HttpReply.h" #include "HttpRequest.h" #include "MemBuf.h" +#include "protos.h" +#include "SquidTime.h" +#include "Store.h" /* local constants */ diff --git a/src/HttpReply.h b/src/HttpReply.h index 2ad8427df1..6d056e740c 100644 --- a/src/HttpReply.h +++ b/src/HttpReply.h @@ -34,6 +34,7 @@ #include "HttpBody.h" #include "HttpMsg.h" +#include "HttpRequest.h" #include "HttpStatusLine.h" extern void httpReplyInitModule(void); diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index ec8c424419..a32ef2371c 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -34,23 +34,26 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "AccessLogEntry.h" +#include "acl/FilledChecklist.h" +#include "client_side.h" #include "DnsLookupDetails.h" -#include "HttpRequest.h" +#include "err_detail_type.h" #include "HttpHdrCc.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif #include "HttpHeaderRange.h" +#include "HttpRequest.h" #include "log/Config.h" #include "MemBuf.h" +#include "protos.h" #include "Store.h" + +#if USE_AUTH +#include "auth/UserRequest.h" +#endif #if ICAP_CLIENT #include "adaptation/icap/icap_log.h" #endif -#include "acl/FilledChecklist.h" -#include "err_detail_type.h" HttpRequest::HttpRequest() : HttpMsg(hoRequest) { @@ -703,3 +706,10 @@ HttpRequest::canHandle1xx() const // others must support 1xx control messages return true; } + +ConnStateData * +HttpRequest::pinnedConnection() { + if (clientConnectionManager.valid() && clientConnectionManager->pinning.pinned) + return clientConnectionManager.get(); + return NULL; +} diff --git a/src/HttpRequest.h b/src/HttpRequest.h index 35a3a443a9..864f3e5c04 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -33,21 +33,27 @@ #ifndef SQUID_HTTPREQUEST_H #define SQUID_HTTPREQUEST_H +#include "base/CbcPointer.h" +#include "Debug.h" +#include "HierarchyLogEntry.h" +#include "HttpMsg.h" +#include "HttpRequestMethod.h" + +#if USE_AUTH +#include "auth/UserRequest.h" +#endif #if USE_ADAPTATION #include "adaptation/History.h" #endif #if ICAP_CLIENT #include "adaptation/icap/History.h" #endif -#include "base/CbcPointer.h" -#include "client_side.h" #if USE_SQUID_EUI #include "eui/Eui48.h" #include "eui/Eui64.h" #endif -#include "HierarchyLogEntry.h" -#include "HttpMsg.h" -#include "HttpRequestMethod.h" + +class ConnStateData; /* Http Request */ //DEAD?: extern int httpRequestHdrAllowedByName(http_hdr_type id); @@ -229,11 +235,7 @@ public: static HttpRequest * CreateFromUrl(char * url); - ConnStateData *pinnedConnection() { - if (clientConnectionManager.valid() && clientConnectionManager->pinning.pinned) - return clientConnectionManager.get(); - return NULL; - } + ConnStateData *pinnedConnection(); /** * The client connection manager, if known; diff --git a/src/HttpRequestMethod.cc b/src/HttpRequestMethod.cc index 0e96e853af..5a0c791ecd 100644 --- a/src/HttpRequestMethod.cc +++ b/src/HttpRequestMethod.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "HttpRequestMethod.h" #include "wordlist.h" diff --git a/src/HttpRequestMethod.h b/src/HttpRequestMethod.h index 7a7d16de19..86fa4e42f1 100644 --- a/src/HttpRequestMethod.h +++ b/src/HttpRequestMethod.h @@ -33,9 +33,10 @@ #ifndef SQUID_HTTPREQUESTMETHOD_H #define SQUID_HTTPREQUESTMETHOD_H -#include "squid-old.h" -#include #include "SquidString.h" +#include "structs.h" + +#include enum _method_t { METHOD_NONE, /* 000 */ diff --git a/src/HttpStatusLine.cc b/src/HttpStatusLine.cc index 7278346a93..3f2ae5d2cf 100644 --- a/src/HttpStatusLine.cc +++ b/src/HttpStatusLine.cc @@ -33,8 +33,11 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "HttpStatusLine.h" +#include "protos.h" +#include "Packer.h" /* local constants */ /* AYJ: see bug 2469 - RFC2616 confirms stating 'SP characters' plural! */ diff --git a/src/HttpStatusLine.h b/src/HttpStatusLine.h index d9022eab12..a77382915a 100644 --- a/src/HttpStatusLine.h +++ b/src/HttpStatusLine.h @@ -77,4 +77,7 @@ SQUIDCEXTERN int httpStatusLineParse(HttpStatusLine * sline, const String &proto /* pack fields using Packer */ SQUIDCEXTERN void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p); +SQUIDCEXTERN const char *httpStatusString(http_status status); + + #endif /* SQUID_HTTPSTATUSLINE_H */ diff --git a/src/ICP.h b/src/ICP.h index f56d54ead4..d718a8f206 100644 --- a/src/ICP.h +++ b/src/ICP.h @@ -39,9 +39,12 @@ */ #include "comm/forward.h" +#include "icp_opcode.h" #include "ip/Address.h" #include "StoreClient.h" +class HttpRequest; + /** \ingroup ServerProtocolICPAPI * diff --git a/src/LeakFinder.cc b/src/LeakFinder.cc index 9cebf7e2c3..b889e88d1e 100644 --- a/src/LeakFinder.cc +++ b/src/LeakFinder.cc @@ -36,7 +36,7 @@ * Use these to find memory leaks */ -#include "squid-old.h" +#include "squid.h" #include "LeakFinder.h" #include "Store.h" #include "SquidTime.h" diff --git a/src/LoadableModule.cc b/src/LoadableModule.cc index 3c62b41082..996797efc3 100644 --- a/src/LoadableModule.cc +++ b/src/LoadableModule.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" /* The original code has this constant ./configure-able. * The "#else" branches use raw dlopen interface and have not been tested. diff --git a/src/LoadableModules.cc b/src/LoadableModules.cc index fa59830064..dede3eff27 100644 --- a/src/LoadableModules.cc +++ b/src/LoadableModules.cc @@ -1,7 +1,8 @@ -#include "squid-old.h" -#include "wordlist.h" +#include "squid.h" +#include "Debug.h" #include "LoadableModule.h" #include "LoadableModules.h" +#include "wordlist.h" static void LoadModule(const char *fname) diff --git a/src/Makefile.am b/src/Makefile.am index b4aa343c23..56a2de0f6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -426,7 +426,6 @@ squid_SOURCES = \ send-announce.cc \ $(SBUF_SOURCE) \ $(SNMP_SOURCE) \ - squid-old.h \ SquidMath.h \ SquidMath.cc \ SquidNew.cc \ @@ -693,7 +692,6 @@ ufsdump_SOURCES = \ tests/stub_HelperChildConfig.cc \ HttpRequestMethod.cc \ RemovalPolicy.cc \ - squid-old.h \ $(WIN32_SOURCE) \ tests/stub_fd.cc ufsdump_LDADD = \ diff --git a/src/MemBuf.cc b/src/MemBuf.cc index 9afeba9ec1..ed14d1a4a4 100644 --- a/src/MemBuf.cc +++ b/src/MemBuf.cc @@ -99,10 +99,10 @@ \endverbatim */ -/* if you have configure you can use this */ -#if defined(HAVE_CONFIG_H) #include "squid.h" -#endif +#include "MemBuf.h" +#include "profiler/Profiler.h" +#include "protos.h" #ifdef VA_COPY #undef VA_COPY @@ -113,9 +113,6 @@ #define VA_COPY __va_copy #endif -#include "squid-old.h" -#include "MemBuf.h" - /* local constants */ /* default values for buffer sizes, used by memBufDefInit */ diff --git a/src/MemObject.cc b/src/MemObject.cc index ad2c6208e3..d38d8d563e 100644 --- a/src/MemObject.cc +++ b/src/MemObject.cc @@ -33,18 +33,21 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm/Connection.h" -#include "MemObject.h" -#include "HttpRequest.h" +#include "Generic.h" #include "HttpReply.h" +#include "HttpRequest.h" +#include "MemBuf.h" +#include "MemObject.h" +#include "profiler/Profiler.h" #include "Store.h" #include "StoreClient.h" -#include "Generic.h" +#include "protos.h" + #if USE_DELAY_POOLS #include "DelayPools.h" #endif -#include "MemBuf.h" /* TODO: make this global or private */ #if URL_CHECKSUM_DEBUG diff --git a/src/MemObject.h b/src/MemObject.h index ee6fcc018c..a24eb40034 100644 --- a/src/MemObject.h +++ b/src/MemObject.h @@ -43,6 +43,7 @@ typedef void STMCB (void *data, StoreIOBuffer wroteBuffer); class store_client; +class HttpRequest; #if USE_DELAY_POOLS #include "DelayId.h" #endif diff --git a/src/MemStore.cc b/src/MemStore.cc index eb5d155bec..a1162d053f 100644 --- a/src/MemStore.cc +++ b/src/MemStore.cc @@ -7,12 +7,13 @@ #include "squid.h" #include "base/RunnersRegistry.h" +#include "HttpReply.h" #include "ipc/mem/Page.h" #include "ipc/mem/Pages.h" #include "MemObject.h" #include "MemStore.h" +#include "protos.h" #include "StoreStats.h" -#include "HttpReply.h" /// shared memory segment path to use for MemStore maps static const char *ShmLabel = "cache_mem"; diff --git a/src/NullDelayId.cc b/src/NullDelayId.cc index 97580eaa8e..686ff163cd 100644 --- a/src/NullDelayId.cc +++ b/src/NullDelayId.cc @@ -40,9 +40,8 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" -#include "NullDelayId.h" #include "DelayPools.h" +#include "NullDelayId.h" void * NullDelayId::operator new(size_t size) diff --git a/src/NullDelayId.h b/src/NullDelayId.h index c66f3ce7e1..c05de548ea 100644 --- a/src/NullDelayId.h +++ b/src/NullDelayId.h @@ -38,8 +38,8 @@ */ #ifndef NULLDELAYID_H #define NULLDELAYID_H + #if USE_DELAY_POOLS -#include "squid-old.h" #include "RefCount.h" #include "DelayIdComposite.h" diff --git a/src/Packer.cc b/src/Packer.cc index a46e0c70d7..4e50d1a5ad 100644 --- a/src/Packer.cc +++ b/src/Packer.cc @@ -71,7 +71,7 @@ */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "MemBuf.h" diff --git a/src/Parsing.cc b/src/Parsing.cc index 47aa616821..d4eb78b025 100644 --- a/src/Parsing.cc +++ b/src/Parsing.cc @@ -35,6 +35,7 @@ #include "squid.h" #include "compat/strtoll.h" #include "Parsing.h" +#include "protos.h" /* * These functions is the same as atoi/l/f, except that they check for errors diff --git a/src/Parsing.h b/src/Parsing.h index 259914d634..a5fc66bd74 100644 --- a/src/Parsing.h +++ b/src/Parsing.h @@ -36,7 +36,7 @@ #ifndef SQUID_PARSING_H #define SQUID_PARSING_H -#include "squid-old.h" +#include "ip/Address.h" extern double xatof(const char *token); extern int xatoi(const char *token); diff --git a/src/PeerDigest.h b/src/PeerDigest.h index 696dc8f377..81f72bda2b 100644 --- a/src/PeerDigest.h +++ b/src/PeerDigest.h @@ -34,12 +34,9 @@ #ifndef SQUID_PEERDIGEST_H #define SQUID_PEERDIGEST_H -#include "squid-old.h" - #if USE_CACHE_DIGESTS #include "cbdata.h" - /* for CacheDigestGuessStats */ #include "StatCounters.h" diff --git a/src/ProfStats.cc b/src/ProfStats.cc index 1613d133fb..9a3d149dc3 100644 --- a/src/ProfStats.cc +++ b/src/ProfStats.cc @@ -33,12 +33,13 @@ * */ -#include "squid-old.h" +#include "squid.h" #if USE_XPROF_STATS #include "event.h" #include "mgr/Registration.h" +#include "profiler/Profiler.h" #include "SquidMath.h" #include "Store.h" diff --git a/src/RemovalPolicy.h b/src/RemovalPolicy.h index 0b78ef0067..bc45f2171e 100644 --- a/src/RemovalPolicy.h +++ b/src/RemovalPolicy.h @@ -35,7 +35,6 @@ #ifndef SQUID_REMOVALPOLICY_H #define SQUID_REMOVALPOLICY_H -#include "squid-old.h" #include "cbdata.h" class RemovalPolicyWalker; diff --git a/src/Server.cc b/src/Server.cc index be6c3d61de..2c00478262 100644 --- a/src/Server.cc +++ b/src/Server.cc @@ -32,20 +32,21 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "acl/Gadgets.h" #include "base/TextException.h" #include "comm/Connection.h" #include "comm/forward.h" #include "comm/Write.h" -#include "Server.h" -#include "Store.h" -#include "HttpRequest.h" -#include "HttpReply.h" -#include "errorpage.h" #include "err_detail_type.h" -#include "StatCounters.h" +#include "errorpage.h" +#include "HttpReply.h" +#include "HttpRequest.h" +#include "protos.h" +#include "Server.h" #include "SquidTime.h" +#include "StatCounters.h" +#include "Store.h" #if USE_ADAPTATION #include "adaptation/AccessCheck.h" diff --git a/src/SquidNew.cc b/src/SquidNew.cc index b742f89cda..22aebfc71e 100644 --- a/src/SquidNew.cc +++ b/src/SquidNew.cc @@ -35,7 +35,7 @@ #define _SQUID_EXTERNNEW_ -#include "squid-old.h" +#include "squid.h" #ifdef __SUNPRO_CC diff --git a/src/StatHist.cc b/src/StatHist.cc index a56c547d79..dfdd132572 100644 --- a/src/StatHist.cc +++ b/src/StatHist.cc @@ -34,6 +34,9 @@ #include "squid.h" #include "StatHist.h" +#if HAVE_MATH_H +#include +#endif /* Local functions */ static StatHistBinDumper statHistBinDumper; diff --git a/src/Store.h b/src/Store.h index 968d1337d1..ee0079dfd5 100644 --- a/src/Store.h +++ b/src/Store.h @@ -37,14 +37,14 @@ \ingroup FileSystems */ -#include "squid-old.h" -#include "StoreIOBuffer.h" -#include "Range.h" -#include "RefCount.h" -#include "CommRead.h" #include "comm/forward.h" +#include "CommRead.h" +#include "HttpRequestMethod.h" #include "Packer.h" +#include "Range.h" +#include "RefCount.h" #include "RemovalPolicy.h" +#include "StoreIOBuffer.h" #include "StoreStats.h" #if USE_SQUID_ESI @@ -57,8 +57,9 @@ class AsyncCall; -class StoreClient; +class HttpRequest; class MemObject; +class StoreClient; class StoreSearch; class SwapDir; diff --git a/src/StoreClient.h b/src/StoreClient.h index 8749ed1b0a..78a2c01ce6 100644 --- a/src/StoreClient.h +++ b/src/StoreClient.h @@ -34,6 +34,7 @@ #ifndef SQUID_STORECLIENT_H #define SQUID_STORECLIENT_H +#include "dlink.h" #include "StoreIOBuffer.h" #include "StoreIOState.h" diff --git a/src/StoreFileSystem.cc b/src/StoreFileSystem.cc index 13e06309cd..b76ba15b8f 100644 --- a/src/StoreFileSystem.cc +++ b/src/StoreFileSystem.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "StoreFileSystem.h" Vector *StoreFileSystem::_FileSystems = NULL; diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h index 9ab38a5c19..9db8237b63 100644 --- a/src/StoreFileSystem.h +++ b/src/StoreFileSystem.h @@ -33,7 +33,6 @@ #ifndef SQUID_STOREFILESYSTEM_H #define SQUID_STOREFILESYSTEM_H -#include "squid-old.h" #include "Array.h" /* ****** DOCUMENTATION ***** */ diff --git a/src/StoreIOState.cc b/src/StoreIOState.cc index 0b18537e09..02325c19c1 100644 --- a/src/StoreIOState.cc +++ b/src/StoreIOState.cc @@ -33,7 +33,9 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" +#include "defines.h" #include "StoreIOState.h" void * diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc index 86a155abf1..379c4f48d6 100644 --- a/src/StoreMeta.cc +++ b/src/StoreMeta.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "StoreMeta.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaMD5.cc b/src/StoreMetaMD5.cc index 81a869e3cb..b08f26f736 100644 --- a/src/StoreMetaMD5.cc +++ b/src/StoreMetaMD5.cc @@ -33,10 +33,12 @@ * */ -#include "squid-old.h" -#include "StoreMetaMD5.h" -#include "Store.h" +#include "squid.h" +#include "md5.h" #include "MemObject.h" +#include "protos.h" +#include "Store.h" +#include "StoreMetaMD5.h" bool StoreMetaMD5::validLength(int len) const diff --git a/src/StoreMetaSTD.cc b/src/StoreMetaSTD.cc index 78033e835b..236755b2c9 100644 --- a/src/StoreMetaSTD.cc +++ b/src/StoreMetaSTD.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "StoreMetaSTD.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaSTDLFS.cc b/src/StoreMetaSTDLFS.cc index 58ff433557..da982ad7fc 100644 --- a/src/StoreMetaSTDLFS.cc +++ b/src/StoreMetaSTDLFS.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "StoreMetaSTDLFS.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaURL.cc b/src/StoreMetaURL.cc index 9dba63a917..2df103d4f2 100644 --- a/src/StoreMetaURL.cc +++ b/src/StoreMetaURL.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "StoreMetaURL.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreMetaUnpacker.cc b/src/StoreMetaUnpacker.cc index ed9f66c618..5d971b14dc 100644 --- a/src/StoreMetaUnpacker.cc +++ b/src/StoreMetaUnpacker.cc @@ -33,7 +33,9 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "defines.h" +#include "Debug.h" #include "StoreMetaUnpacker.h" #include "StoreMeta.h" diff --git a/src/StoreMetaVary.cc b/src/StoreMetaVary.cc index 0c40c8a9d4..1563028e03 100644 --- a/src/StoreMetaVary.cc +++ b/src/StoreMetaVary.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "StoreMetaVary.h" #include "Store.h" #include "MemObject.h" diff --git a/src/StoreSearch.h b/src/StoreSearch.h index ed0af92db7..09ccae4cc3 100644 --- a/src/StoreSearch.h +++ b/src/StoreSearch.h @@ -33,7 +33,6 @@ #ifndef SQUID_STORESEARCH_H #define SQUID_STORESEARCH_H -#include "squid-old.h" #include "RefCount.h" #include "Store.h" diff --git a/src/StoreSwapLogData.h b/src/StoreSwapLogData.h index de112be705..ab0276e2e9 100644 --- a/src/StoreSwapLogData.h +++ b/src/StoreSwapLogData.h @@ -59,7 +59,9 @@ * the value for MemObject->swap_hdr_sz. */ -#include "squid-old.h" +#include "md5.h" +#include "MemPool.h" +#include "typedefs.h" /// maintains a 24-bit checksum over integer fields class SwapChecksum24 diff --git a/src/String.cc b/src/String.cc index ca16de82aa..e737506dbe 100644 --- a/src/String.cc +++ b/src/String.cc @@ -33,11 +33,17 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "base/TextException.h" #include "mgr/Registration.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "Store.h" +#if HAVE_LIMITS_H +#include +#endif + int String::psize() const { diff --git a/src/String.cci b/src/String.cci index 2bc3f8f418..ba8cda01df 100644 --- a/src/String.cci +++ b/src/String.cci @@ -35,7 +35,7 @@ #include #if HAVE_STDINT_H -#include //for INT_MAX +#include #else /* HAVE_STDINT_H */ #ifndef INT_MAX #define INT_MAX 1<<31 //hack but a safe bet diff --git a/src/SwapDir.cc b/src/SwapDir.cc index 36272e9c0e..0fa81ef1db 100644 --- a/src/SwapDir.cc +++ b/src/SwapDir.cc @@ -32,11 +32,12 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "compat/strtoll.h" -#include "SwapDir.h" -#include "StoreFileSystem.h" #include "ConfigOption.h" +#include "protos.h" +#include "StoreFileSystem.h" +#include "SwapDir.h" SwapDir::SwapDir(char const *aType): theType(aType), max_size(0), diff --git a/src/WinSvc.cc b/src/WinSvc.cc index aebf145e9f..6d8303853a 100644 --- a/src/WinSvc.cc +++ b/src/WinSvc.cc @@ -34,7 +34,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "squid_windows.h" #if _SQUID_MSWIN_ diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc index 3dbe2d4ed8..070ae7b6d9 100644 --- a/src/acl/Acl.cc +++ b/src/acl/Acl.cc @@ -34,10 +34,11 @@ #include "squid.h" #include "acl/Acl.h" #include "acl/Checklist.h" +#include "anyp/PortCfg.h" #include "ConfigParser.h" #include "Debug.h" #include "dlink.h" -#include "anyp/PortCfg.h" +#include "globals.h" const char *AclMatchedName = NULL; diff --git a/src/acl/Acl.h b/src/acl/Acl.h index 06965314be..2979a62d29 100644 --- a/src/acl/Acl.h +++ b/src/acl/Acl.h @@ -37,7 +37,10 @@ #include "Array.h" #include "cbdata.h" +#include "defines.h" #include "dlink.h" +#include "MemPool.h" +#include "structs.h" #if HAVE_OSTREAM #include diff --git a/src/acl/Arp.cc b/src/acl/Arp.cc index 5644855bd1..20bc0ac64d 100644 --- a/src/acl/Arp.cc +++ b/src/acl/Arp.cc @@ -32,14 +32,16 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #if USE_SQUID_EUI #include "acl/Arp.h" #include "acl/FilledChecklist.h" +#include "Debug.h" #include "eui/Eui48.h" #include "ip/Address.h" +#include "protos.h" #include "wordlist.h" static void aclParseArpList(SplayNode **curlist); diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc index fb46a5a897..60a074a2b9 100644 --- a/src/acl/Asn.cc +++ b/src/acl/Asn.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "mgr/Registration.h" #include "radix.h" #include "HttpRequest.h" @@ -48,6 +48,7 @@ #include "HttpReply.h" #include "ipcache.h" #include "forward.h" +#include "protos.h" #include "wordlist.h" #define WHOIS_PORT 43 diff --git a/src/acl/Browser.cc b/src/acl/Browser.cc index 31ebdded92..02fa8dcbab 100644 --- a/src/acl/Browser.cc +++ b/src/acl/Browser.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Checklist.h" #include "acl/Browser.h" #include "acl/RegexData.h" diff --git a/src/acl/Certificate.cc b/src/acl/Certificate.cc index 76f362c498..42d2b31218 100644 --- a/src/acl/Certificate.cc +++ b/src/acl/Certificate.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the SSL code from compile process when not needed. @@ -44,8 +44,10 @@ #include "acl/Certificate.h" #include "acl/Checklist.h" #include "acl/CertificateData.h" -#include "fde.h" +#include "HttpRequest.h" #include "client_side.h" +#include "fde.h" +#include "globals.h" int diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc index cb6a5f25d4..809e54dac3 100644 --- a/src/acl/CertificateData.cc +++ b/src/acl/CertificateData.cc @@ -34,9 +34,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/CertificateData.h" #include "acl/Checklist.h" +#include "protos.h" #include "wordlist.h" ACLCertificateData::ACLCertificateData(SSLGETATTRIBUTE *sslStrategy) : attribute (NULL), values (), sslAttributeCall (sslStrategy) diff --git a/src/acl/Checklist.cc b/src/acl/Checklist.cc index fe6997d3fb..abacaa6e3c 100644 --- a/src/acl/Checklist.cc +++ b/src/acl/Checklist.cc @@ -33,8 +33,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Checklist.h" +#include "Debug.h" +#include "profiler/Profiler.h" void ACLChecklist::matchNonBlocking() diff --git a/src/acl/DestinationDomain.cc b/src/acl/DestinationDomain.cc index 55c267b41a..db961d09b6 100644 --- a/src/acl/DestinationDomain.cc +++ b/src/acl/DestinationDomain.cc @@ -34,13 +34,14 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/DestinationDomain.h" #include "acl/Checklist.h" #include "acl/RegexData.h" #include "acl/DomainData.h" #include "HttpRequest.h" #include "ipcache.h" +#include "protos.h" DestinationDomainLookup DestinationDomainLookup::instance_; diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc index 287d397f29..9e4c60429a 100644 --- a/src/acl/DestinationIp.cc +++ b/src/acl/DestinationIp.cc @@ -33,12 +33,12 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/DestinationIp.h" #include "acl/FilledChecklist.h" +#include "client_side.h" #include "comm/Connection.h" #include "HttpRequest.h" -// for Config.* #include "structs.h" char const * diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc index b435e5a944..385d2142c8 100644 --- a/src/acl/DomainData.cc +++ b/src/acl/DomainData.cc @@ -34,9 +34,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/DomainData.h" #include "acl/Checklist.h" +#include "Debug.h" +#include "protos.h" #include "wordlist.h" template diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc index 105388fe52..5ccd8842a8 100644 --- a/src/acl/Eui64.cc +++ b/src/acl/Eui64.cc @@ -32,14 +32,16 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #if USE_SQUID_EUI #include "acl/Eui64.h" #include "acl/FilledChecklist.h" +#include "Debug.h" #include "eui/Eui64.h" #include "ip/Address.h" +#include "protos.h" #include "wordlist.h" static void aclParseEuiList(SplayNode **curlist); diff --git a/src/acl/ExtUser.cc b/src/acl/ExtUser.cc index 72e4111db3..0af2670c05 100644 --- a/src/acl/ExtUser.cc +++ b/src/acl/ExtUser.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #if USE_AUTH @@ -43,7 +43,6 @@ #include "acl/RegexData.h" #include "acl/UserData.h" #include "client_side.h" -#include "HttpRequest.h" ACLExtUser::~ACLExtUser() { diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc index 7d19ed6629..47a9355099 100644 --- a/src/acl/FilledChecklist.cc +++ b/src/acl/FilledChecklist.cc @@ -1,14 +1,15 @@ -#include "squid-old.h" -#include "HttpRequest.h" -#include "HttpReply.h" +#include "squid.h" +#include "acl/FilledChecklist.h" #include "client_side.h" +#include "comm/Connection.h" +#include "comm/forward.h" +#include "HttpReply.h" +#include "HttpRequest.h" #if USE_AUTH #include "auth/UserRequest.h" #include "auth/AclProxyAuth.h" #endif -#include "acl/FilledChecklist.h" -#include "comm/Connection.h" -#include "comm/forward.h" + CBDATA_CLASS_INIT(ACLFilledChecklist); diff --git a/src/acl/FilledChecklist.h b/src/acl/FilledChecklist.h index dbc297de37..6c926d85ed 100644 --- a/src/acl/FilledChecklist.h +++ b/src/acl/FilledChecklist.h @@ -11,6 +11,7 @@ class ExternalACLEntry; class ConnStateData; +class HttpRequest; /** \ingroup ACLAPI ACLChecklist filled with specific data, representing Squid and transaction diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc index f42f806f5f..58c14654e6 100644 --- a/src/acl/Gadgets.cc +++ b/src/acl/Gadgets.cc @@ -38,14 +38,16 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "acl/Acl.h" #include "acl/Checklist.h" #include "acl/Strategised.h" #include "acl/Gadgets.h" #include "ConfigParser.h" #include "errorpage.h" +#include "globals.h" #include "HttpRequest.h" +#include "protos.h" /* does name lookup, returns page_id */ diff --git a/src/acl/HierCode.cc b/src/acl/HierCode.cc index c44f60391e..70bf4f41ab 100644 --- a/src/acl/HierCode.cc +++ b/src/acl/HierCode.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "acl/HierCode.h" #include "acl/HierCodeData.h" #include "acl/Checklist.h" diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc index 7345bc417d..3ec0534d69 100644 --- a/src/acl/HierCodeData.cc +++ b/src/acl/HierCodeData.cc @@ -1,7 +1,8 @@ -#include "squid-old.h" +#include "squid.h" #include "acl/HierCodeData.h" #include "acl/Checklist.h" #include "hier_code.h" +#include "protos.h" #include "wordlist.h" ACLHierCodeData::ACLHierCodeData() diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc index 9db21b5762..fcfc048c0d 100644 --- a/src/acl/HttpHeaderData.cc +++ b/src/acl/HttpHeaderData.cc @@ -34,11 +34,13 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/HttpHeaderData.h" #include "acl/Checklist.h" #include "acl/Acl.h" #include "acl/RegexData.h" +#include "Debug.h" +#include "protos.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/acl/HttpRepHeader.cc b/src/acl/HttpRepHeader.cc index 6fba27437b..89ca1ecb05 100644 --- a/src/acl/HttpRepHeader.cc +++ b/src/acl/HttpRepHeader.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/HttpRepHeader.h" #include "acl/HttpHeaderData.h" #include "acl/Checklist.h" diff --git a/src/acl/HttpReqHeader.cc b/src/acl/HttpReqHeader.cc index d9d2259030..169d338356 100644 --- a/src/acl/HttpReqHeader.cc +++ b/src/acl/HttpReqHeader.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/HttpReqHeader.h" #include "acl/HttpHeaderData.h" #include "acl/Checklist.h" diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc index dfb7a7a778..05fc730fc7 100644 --- a/src/acl/HttpStatus.cc +++ b/src/acl/HttpStatus.cc @@ -35,16 +35,18 @@ */ #include "squid.h" -#if _SQUID_CYGWIN_ -#include -#endif -#include "squid-old.h" #include "acl/HttpStatus.h" #include "acl/FilledChecklist.h" +#include "Debug.h" #include "HttpReply.h" +#include "protos.h" #include "wordlist.h" +#if HAVE_LIMITS_H +#include +#endif + static void aclParseHTTPStatusList(SplayNode **curlist); static int aclHTTPStatusCompare(acl_httpstatus_data * const &a, acl_httpstatus_data * const &b); static int aclMatchHTTPStatus(SplayNode **dataptr, http_status status); diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc index 7a83665047..863711ce15 100644 --- a/src/acl/IntRange.cc +++ b/src/acl/IntRange.cc @@ -34,10 +34,12 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/IntRange.h" +#include "Debug.h" #include "wordlist.h" #include "Parsing.h" +#include "protos.h" /* explicit instantiation required for some systems */ /** \cond AUTODOCS-IGNORE */ diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc index eb6ef92fb3..7aa3d05155 100644 --- a/src/acl/Ip.cc +++ b/src/acl/Ip.cc @@ -33,12 +33,13 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" -//#include "compat/getaddrinfo.h" +#include "squid.h" #include "acl/Ip.h" #include "acl/Checklist.h" +#include "Debug.h" #include "ip/tools.h" #include "MemBuf.h" +#include "protos.h" #include "wordlist.h" void * diff --git a/src/acl/LocalIp.cc b/src/acl/LocalIp.cc index b5ffb359e2..ab04b796ee 100644 --- a/src/acl/LocalIp.cc +++ b/src/acl/LocalIp.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/LocalIp.h" #include "acl/FilledChecklist.h" diff --git a/src/acl/LocalPort.cc b/src/acl/LocalPort.cc index 33139670fc..bf640cd9e0 100644 --- a/src/acl/LocalPort.cc +++ b/src/acl/LocalPort.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/LocalPort.h" #include "acl/IntRange.h" #include "acl/Checklist.h" diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc index c44737d9c8..05fc0be9cb 100644 --- a/src/acl/MaxConnection.cc +++ b/src/acl/MaxConnection.cc @@ -34,13 +34,13 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "acl/MaxConnection.h" +#include "Debug.h" +#include "protos.h" #include "wordlist.h" - - ACL * ACLMaxConnection::clone() const { diff --git a/src/acl/Method.cc b/src/acl/Method.cc index 25574a2726..5039967ee4 100644 --- a/src/acl/Method.cc +++ b/src/acl/Method.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Method.h" #include "acl/MethodData.h" #include "acl/Checklist.h" diff --git a/src/acl/Method.h b/src/acl/Method.h index c5d71ec34a..20ffbf2e34 100644 --- a/src/acl/Method.h +++ b/src/acl/Method.h @@ -37,13 +37,14 @@ #include "acl/Strategy.h" #include "acl/Strategised.h" +#include "HttpRequestMethod.h" /// \ingroup ACLAPI class ACLMethodStrategy : public ACLStrategy { public: - virtual int match (ACLData * &, ACLFilledChecklist *); + virtual int match (ACLData * &, ACLFilledChecklist *); virtual bool requiresRequest() const {return true;} static ACLMethodStrategy *Instance(); diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc index 8d43522795..eaa9bdf525 100644 --- a/src/acl/MethodData.cc +++ b/src/acl/MethodData.cc @@ -34,10 +34,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/MethodData.h" #include "acl/Checklist.h" #include "HttpRequestMethod.h" +#include "protos.h" #include "wordlist.h" int ACLMethodData::ThePurgeCount = 0; diff --git a/src/acl/MethodData.h b/src/acl/MethodData.h index f94f936e4c..5fecf6f22d 100644 --- a/src/acl/MethodData.h +++ b/src/acl/MethodData.h @@ -38,6 +38,7 @@ #include "acl/Acl.h" #include "acl/Data.h" #include "CbDataList.h" +#include "HttpRequestMethod.h" /// \ingroup ACLAPI class ACLMethodData : public ACLData diff --git a/src/acl/MyPortName.cc b/src/acl/MyPortName.cc index 97b7f08d0d..c86a2b4911 100644 --- a/src/acl/MyPortName.cc +++ b/src/acl/MyPortName.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/MyPortName.h" #include "acl/StringData.h" #include "acl/Checklist.h" diff --git a/src/acl/PeerName.cc b/src/acl/PeerName.cc index 314636b61c..e8c7e27919 100644 --- a/src/acl/PeerName.cc +++ b/src/acl/PeerName.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "acl/PeerName.h" #include "acl/RegexData.h" #include "acl/StringData.h" diff --git a/src/acl/Protocol.cc b/src/acl/Protocol.cc index 76646cfb90..6d0a4e0a6e 100644 --- a/src/acl/Protocol.cc +++ b/src/acl/Protocol.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Protocol.h" #include "acl/ProtocolData.h" #include "acl/Checklist.h" diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc index 8f6838a7a5..6acc18a3d6 100644 --- a/src/acl/ProtocolData.cc +++ b/src/acl/ProtocolData.cc @@ -34,9 +34,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/ProtocolData.h" #include "acl/Checklist.h" +#include "Debug.h" +#include "protos.h" #include "URLScheme.h" #include "wordlist.h" diff --git a/src/acl/Random.cc b/src/acl/Random.cc index 3b70b7458e..7d6630910e 100644 --- a/src/acl/Random.cc +++ b/src/acl/Random.cc @@ -32,10 +32,12 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "acl/Random.h" +#include "Debug.h" +#include "protos.h" #include "wordlist.h" ACL * diff --git a/src/acl/Referer.cc b/src/acl/Referer.cc index adf1876513..415903aa6a 100644 --- a/src/acl/Referer.cc +++ b/src/acl/Referer.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Referer.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc index 2a4a6d269e..4fcb56f48b 100644 --- a/src/acl/RegexData.cc +++ b/src/acl/RegexData.cc @@ -36,12 +36,14 @@ * Copyright (c) 2011, Marcus Kool */ -#include "squid-old.h" +#include "squid.h" #include "acl/RegexData.h" #include "acl/Checklist.h" #include "acl/Acl.h" -#include "wordlist.h" #include "ConfigParser.h" +#include "Debug.h" +#include "protos.h" +#include "wordlist.h" static void aclDestroyRegexList(relist * data) diff --git a/src/acl/ReplyMimeType.cc b/src/acl/ReplyMimeType.cc index 13a5c7957d..265be3efeb 100644 --- a/src/acl/ReplyMimeType.cc +++ b/src/acl/ReplyMimeType.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/ReplyMimeType.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/RequestMimeType.cc b/src/acl/RequestMimeType.cc index 153796250c..d7f96dd3f3 100644 --- a/src/acl/RequestMimeType.cc +++ b/src/acl/RequestMimeType.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/RequestMimeType.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/SourceDomain.cc b/src/acl/SourceDomain.cc index ace22a3a42..61ff7fb174 100644 --- a/src/acl/SourceDomain.cc +++ b/src/acl/SourceDomain.cc @@ -34,12 +34,13 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/SourceDomain.h" #include "acl/Checklist.h" #include "acl/RegexData.h" #include "acl/DomainData.h" #include "HttpRequest.h" +#include "protos.h" SourceDomainLookup SourceDomainLookup::instance_; diff --git a/src/acl/SourceIp.cc b/src/acl/SourceIp.cc index 834ab28285..654dbade07 100644 --- a/src/acl/SourceIp.cc +++ b/src/acl/SourceIp.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/SourceIp.h" #include "acl/FilledChecklist.h" diff --git a/src/acl/SslError.cc b/src/acl/SslError.cc index a062c12722..c5d45b147c 100644 --- a/src/acl/SslError.cc +++ b/src/acl/SslError.cc @@ -3,7 +3,7 @@ * $Id$ */ -#include "squid-old.h" +#include "squid.h" #include "acl/SslError.h" #include "acl/SslErrorData.h" #include "acl/Checklist.h" diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc index 12f3b88d23..2b55f8f455 100644 --- a/src/acl/SslErrorData.cc +++ b/src/acl/SslErrorData.cc @@ -2,9 +2,10 @@ * $Id$ */ -#include "squid-old.h" +#include "squid.h" #include "acl/SslErrorData.h" #include "acl/Checklist.h" +#include "protos.h" #include "wordlist.h" ACLSslErrorData::ACLSslErrorData() : values (NULL) diff --git a/src/acl/Strategised.cc b/src/acl/Strategised.cc index bca4792b76..278d8f2ec5 100644 --- a/src/acl/Strategised.cc +++ b/src/acl/Strategised.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Strategised.h" /* diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc index ea71c016ac..b257edad2c 100644 --- a/src/acl/StringData.cc +++ b/src/acl/StringData.cc @@ -34,12 +34,12 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/StringData.h" #include "acl/Checklist.h" +#include "protos.h" #include "wordlist.h" - ACLStringData::ACLStringData() : values (NULL) {} diff --git a/src/acl/Tag.cc b/src/acl/Tag.cc index 79e919e5b8..ef4ac00695 100644 --- a/src/acl/Tag.cc +++ b/src/acl/Tag.cc @@ -34,7 +34,7 @@ * Copyright (c) 2009, Henrik Nordstrom */ -#include "squid-old.h" +#include "squid.h" #include "acl/Tag.h" #include "acl/StringData.h" #include "acl/Checklist.h" diff --git a/src/acl/Time.cc b/src/acl/Time.cc index 7a871dbe03..d4007ec071 100644 --- a/src/acl/Time.cc +++ b/src/acl/Time.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Time.h" #include "acl/TimeData.h" #include "SquidTime.h" diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc index 01ff2c7bb2..68184f18d8 100644 --- a/src/acl/TimeData.cc +++ b/src/acl/TimeData.cc @@ -34,9 +34,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/TimeData.h" #include "acl/Checklist.h" +#include "Debug.h" +#include "protos.h" #include "wordlist.h" ACLTimeData::ACLTimeData () : weekbits (0), start (0), stop (0), next (NULL) {} diff --git a/src/acl/Url.cc b/src/acl/Url.cc index 53bba00c93..9457c43c85 100644 --- a/src/acl/Url.cc +++ b/src/acl/Url.cc @@ -34,10 +34,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/Url.h" #include "acl/Checklist.h" #include "acl/RegexData.h" +#include "protos.h" #include "rfc1738.h" int diff --git a/src/acl/UrlPath.cc b/src/acl/UrlPath.cc index 792a7015a0..cd1a8bae52 100644 --- a/src/acl/UrlPath.cc +++ b/src/acl/UrlPath.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/UrlPath.h" #include "acl/Checklist.h" #include "acl/RegexData.h" diff --git a/src/acl/UrlPort.cc b/src/acl/UrlPort.cc index 9078da23f6..e575c563f8 100644 --- a/src/acl/UrlPort.cc +++ b/src/acl/UrlPort.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/UrlPort.h" #include "acl/IntRange.h" #include "acl/Checklist.h" diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc index 4e1e732f0f..bcebedd4f9 100644 --- a/src/acl/UserData.cc +++ b/src/acl/UserData.cc @@ -34,9 +34,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/UserData.h" #include "acl/Checklist.h" +#include "Debug.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index 9a8ead819d..0470b005d6 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -1,17 +1,18 @@ -#include "squid-old.h" -#include "structs.h" - -#include "ConfigParser.h" -#include "HttpRequest.h" -#include "HttpReply.h" +#include "squid.h" #include "acl/FilledChecklist.h" +#include "adaptation/AccessCheck.h" +#include "adaptation/AccessRule.h" +#include "adaptation/Config.h" #include "adaptation/Initiator.h" #include "adaptation/Service.h" #include "adaptation/ServiceGroups.h" -#include "adaptation/AccessRule.h" -#include "adaptation/Config.h" -#include "adaptation/AccessCheck.h" +#include "base/AsyncJobCalls.h" #include "base/TextException.h" +#include "ConfigParser.h" +#include "globals.h" +#include "HttpReply.h" +#include "HttpRequest.h" +#include "structs.h" /** \cond AUTODOCS-IGNORE */ cbdata_type Adaptation::AccessCheck::CBDATA_AccessCheck = CBDATA_UNKNOWN; diff --git a/src/adaptation/AccessRule.cc b/src/adaptation/AccessRule.cc index e76e665966..5dc1861144 100644 --- a/src/adaptation/AccessRule.cc +++ b/src/adaptation/AccessRule.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "structs.h" #include "ConfigParser.h" @@ -6,7 +6,7 @@ #include "adaptation/AccessRule.h" #include "adaptation/Service.h" #include "adaptation/ServiceGroups.h" - +#include "Debug.h" int Adaptation::AccessRule::LastId = 0; diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index d22300b3db..9fc5fe9783 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -30,21 +30,21 @@ * */ -#include "squid-old.h" -#include "structs.h" - -#include "ConfigParser.h" -#include "acl/Gadgets.h" -#include "Store.h" -#include "Array.h" // really Vector +#include "squid.h" #include "acl/FilledChecklist.h" +#include "acl/Gadgets.h" +#include "adaptation/AccessRule.h" #include "adaptation/Config.h" +#include "adaptation/History.h" #include "adaptation/Service.h" -#include "adaptation/AccessRule.h" #include "adaptation/ServiceGroups.h" -#include "adaptation/History.h" +#include "Array.h" +#include "ConfigParser.h" +#include "globals.h" +#include "HttpReply.h" #include "HttpRequest.h" - +#include "Store.h" +#include "structs.h" bool Adaptation::Config::Enabled = false; char *Adaptation::Config::masterx_shared_name = NULL; diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h index 20caf34e7d..da3234b7a5 100644 --- a/src/adaptation/Config.h +++ b/src/adaptation/Config.h @@ -6,9 +6,12 @@ #include "base/AsyncCall.h" #include "adaptation/forward.h" #include "adaptation/Elements.h" +#include "SquidString.h" class acl_access; class ConfigParser; +class HttpRequest; +class HttpReply; namespace Adaptation { diff --git a/src/adaptation/Elements.cc b/src/adaptation/Elements.cc index 8d55a4f36e..613ea0ed08 100644 --- a/src/adaptation/Elements.cc +++ b/src/adaptation/Elements.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "adaptation/Elements.h" const char *Adaptation::crlf = "\r\n"; diff --git a/src/adaptation/History.cc b/src/adaptation/History.cc index ab58961b3e..3c4c4ded0b 100644 --- a/src/adaptation/History.cc +++ b/src/adaptation/History.cc @@ -3,6 +3,7 @@ #include "adaptation/History.h" #include "base/TextException.h" #include "globals.h" +#include "protos.h" #include "SquidTime.h" /// impossible services value to identify unset theNextServices diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc index 38d29f0bab..c40dd5bfb9 100644 --- a/src/adaptation/Initiate.cc +++ b/src/adaptation/Initiate.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" #include "HttpMsg.h" #include "adaptation/Answer.h" #include "adaptation/Initiator.h" diff --git a/src/adaptation/Initiator.cc b/src/adaptation/Initiator.cc index af6c481b0e..511e3437df 100644 --- a/src/adaptation/Initiator.cc +++ b/src/adaptation/Initiator.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" #include "adaptation/Initiate.h" #include "adaptation/Initiator.h" #include "base/AsyncJobCalls.h" diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc index 1fb72680a2..83302c78e3 100644 --- a/src/adaptation/Iterator.cc +++ b/src/adaptation/Iterator.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid-old.h" +#include "squid.h" #include "adaptation/Answer.h" #include "adaptation/Config.h" #include "adaptation/Iterator.h" diff --git a/src/adaptation/Message.cc b/src/adaptation/Message.cc index 334a0f318b..dd5ce3867f 100644 --- a/src/adaptation/Message.cc +++ b/src/adaptation/Message.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid-old.h" +#include "squid.h" #include "adaptation/Message.h" #include "base/TextException.h" #include "HttpMsg.h" diff --git a/src/adaptation/Service.cc b/src/adaptation/Service.cc index 49a742598f..dd297d8a91 100644 --- a/src/adaptation/Service.cc +++ b/src/adaptation/Service.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 Adaptation */ -#include "squid-old.h" +#include "squid.h" #include "HttpRequest.h" #include "adaptation/ServiceFilter.h" #include "adaptation/Service.h" diff --git a/src/adaptation/ServiceConfig.cc b/src/adaptation/ServiceConfig.cc index b6f942de6d..779a288ed6 100644 --- a/src/adaptation/ServiceConfig.cc +++ b/src/adaptation/ServiceConfig.cc @@ -2,9 +2,11 @@ * DEBUG: section 93 Adaptation */ -#include "squid-old.h" -#include "ConfigParser.h" +#include "squid.h" #include "adaptation/ServiceConfig.h" +#include "ConfigParser.h" +#include "Debug.h" +#include "globals.h" #include "ip/tools.h" #include diff --git a/src/adaptation/ServiceFilter.cc b/src/adaptation/ServiceFilter.cc index 095cd2a383..eb3965b89c 100644 --- a/src/adaptation/ServiceFilter.cc +++ b/src/adaptation/ServiceFilter.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "HttpRequest.h" #include "HttpReply.h" #include "adaptation/ServiceFilter.h" diff --git a/src/adaptation/ServiceGroups.cc b/src/adaptation/ServiceGroups.cc index b77e56e238..0838aad6e7 100644 --- a/src/adaptation/ServiceGroups.cc +++ b/src/adaptation/ServiceGroups.cc @@ -1,12 +1,14 @@ -#include "squid-old.h" - -#include "ConfigParser.h" -#include "adaptation/Config.h" +#include "squid.h" #include "adaptation/AccessRule.h" +#include "adaptation/Config.h" #include "adaptation/DynamicGroupCfg.h" #include "adaptation/Service.h" #include "adaptation/ServiceFilter.h" #include "adaptation/ServiceGroups.h" +#include "ConfigParser.h" +#include "Debug.h" +#include "protos.h" +#include "wordlist.h" Adaptation::ServiceGroup::ServiceGroup(const String &aKind, bool allSame): diff --git a/src/adaptation/ecap/Config.cc b/src/adaptation/ecap/Config.cc index 98ed01acb4..e6cd269cae 100644 --- a/src/adaptation/ecap/Config.cc +++ b/src/adaptation/ecap/Config.cc @@ -2,7 +2,7 @@ * $Id$ * DEBUG: section 93 eCAP Interface */ -#include "squid-old.h" +#include "squid.h" #include "adaptation/ecap/Host.h" #include "adaptation/ecap/ServiceRep.h" diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc index 3328910511..629ae1d230 100644 --- a/src/adaptation/ecap/Host.cc +++ b/src/adaptation/ecap/Host.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid-old.h" +#include "squid.h" #include #include #include diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc index 25309e99ec..302da800ea 100644 --- a/src/adaptation/ecap/MessageRep.cc +++ b/src/adaptation/ecap/MessageRep.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid-old.h" +#include "squid.h" #include "HttpRequest.h" #include "HttpReply.h" #include "BodyPipe.h" diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index 65db515a3d..3378b7908a 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid-old.h" +#include "squid.h" #include #include #include diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc index 85fecf563a..4a55190ad4 100644 --- a/src/adaptation/ecap/XactionRep.cc +++ b/src/adaptation/ecap/XactionRep.cc @@ -1,7 +1,7 @@ /* * DEBUG: section 93 eCAP Interface */ -#include "squid-old.h" +#include "squid.h" #include #include #include diff --git a/src/adaptation/icap/Client.cc b/src/adaptation/icap/Client.cc index c8b8fd1fd1..a335b83ea7 100644 --- a/src/adaptation/icap/Client.cc +++ b/src/adaptation/icap/Client.cc @@ -1,4 +1,5 @@ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "adaptation/icap/Client.h" void Adaptation::Icap::InitModule() diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc index 47da4f1e6b..8555301653 100644 --- a/src/adaptation/icap/Config.cc +++ b/src/adaptation/icap/Config.cc @@ -32,11 +32,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "ConfigParser.h" #include "Store.h" -#include "Array.h" // really Vector +#include "Array.h" #include "adaptation/icap/Config.h" #include "adaptation/icap/ServiceRep.h" #include "HttpRequest.h" diff --git a/src/adaptation/icap/Elements.cc b/src/adaptation/icap/Elements.cc index 26de7d8db8..ac82c70ad4 100644 --- a/src/adaptation/icap/Elements.cc +++ b/src/adaptation/icap/Elements.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "adaptation/icap/Elements.h" // TODO: remove this file? diff --git a/src/adaptation/icap/History.cc b/src/adaptation/icap/History.cc index 8cfc856ca7..3ac7eb873d 100644 --- a/src/adaptation/icap/History.cc +++ b/src/adaptation/icap/History.cc @@ -1,5 +1,6 @@ -#include "squid-old.h" +#include "squid.h" #include "adaptation/icap/History.h" +#include "Debug.h" #include "globals.h" #include "SquidTime.h" diff --git a/src/adaptation/icap/History.h b/src/adaptation/icap/History.h index 2fb08343b5..d72c28705d 100644 --- a/src/adaptation/icap/History.h +++ b/src/adaptation/icap/History.h @@ -1,8 +1,9 @@ #ifndef SQUID_ICAPHISTORY_H #define SQUID_ICAPHISTORY_H -#include "RefCount.h" #include "enums.h" +#include "RefCount.h" +#include "SquidString.h" namespace Adaptation { diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc index b59ba4d71c..49f56a821e 100644 --- a/src/adaptation/icap/Launcher.cc +++ b/src/adaptation/icap/Launcher.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "adaptation/Answer.h" #include "adaptation/icap/Launcher.h" @@ -10,6 +10,7 @@ #include "adaptation/icap/ServiceRep.h" #include "adaptation/icap/Config.h" #include "base/TextException.h" +#include "globals.h" #include "HttpMsg.h" #include "HttpRequest.h" #include "HttpReply.h" diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc index daee78654e..49caee611b 100644 --- a/src/adaptation/icap/ModXact.cc +++ b/src/adaptation/icap/ModXact.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" #include "AccessLogEntry.h" #include "adaptation/Answer.h" #include "adaptation/History.h" @@ -19,11 +19,12 @@ #include "ChunkedCodingParser.h" #include "comm.h" #include "comm/Connection.h" +#include "err_detail_type.h" #include "HttpMsg.h" -#include "HttpRequest.h" #include "HttpReply.h" +#include "HttpRequest.h" +#include "protos.h" #include "SquidTime.h" -#include "err_detail_type.h" // flow and terminology: // HTTP| --> receive --> encode --> write --> |network diff --git a/src/adaptation/icap/OptXact.cc b/src/adaptation/icap/OptXact.cc index 9ae9d3e70c..4607d1543f 100644 --- a/src/adaptation/icap/OptXact.cc +++ b/src/adaptation/icap/OptXact.cc @@ -2,17 +2,17 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" -#include "comm.h" -#include "HttpReply.h" - +#include "squid.h" #include "adaptation/Answer.h" -#include "adaptation/icap/OptXact.h" -#include "adaptation/icap/Options.h" #include "adaptation/icap/Config.h" +#include "adaptation/icap/Options.h" +#include "adaptation/icap/OptXact.h" #include "base/TextException.h" -#include "SquidTime.h" +#include "comm.h" +#include "HttpReply.h" #include "HttpRequest.h" +#include "protos.h" +#include "SquidTime.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, OptXact); CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, OptXactLauncher); diff --git a/src/adaptation/icap/Options.cc b/src/adaptation/icap/Options.cc index f216658027..f1db7cf216 100644 --- a/src/adaptation/icap/Options.cc +++ b/src/adaptation/icap/Options.cc @@ -1,8 +1,9 @@ -#include "squid-old.h" +#include "squid.h" #include "adaptation/icap/Config.h" #include "adaptation/icap/Options.h" #include "base/TextException.h" #include "HttpReply.h" +#include "protos.h" #include "SquidTime.h" #include "wordlist.h" diff --git a/src/adaptation/icap/Options.h b/src/adaptation/icap/Options.h index 22d93d183a..641b3a6715 100644 --- a/src/adaptation/icap/Options.h +++ b/src/adaptation/icap/Options.h @@ -34,9 +34,9 @@ #ifndef SQUID_ICAPOPTIONS_H #define SQUID_ICAPOPTIONS_H -#include "squid-old.h" #include "adaptation/icap/ServiceRep.h" +class HttpHeader; class wordlist; namespace Adaptation diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 37d3fe7c73..f789e2655a 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" #include "adaptation/Answer.h" #include "adaptation/icap/Config.h" #include "adaptation/icap/ModXact.h" @@ -12,10 +12,12 @@ #include "base/TextException.h" #include "comm/Connection.h" #include "ConfigParser.h" -#include "ip/tools.h" +#include "Debug.h" +#include "fde.h" #include "HttpReply.h" +#include "ip/tools.h" +#include "protos.h" #include "SquidTime.h" -#include "fde.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep); diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index 21e9cee53c..9f0edbe6a3 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -2,26 +2,28 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" +#include "acl/FilledChecklist.h" +#include "adaptation/icap/Config.h" +#include "adaptation/icap/Launcher.h" +#include "adaptation/icap/Xaction.h" +#include "base/TextException.h" #include "comm.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" #include "comm/Write.h" #include "CommCalls.h" +#include "err_detail_type.h" +#include "fde.h" +#include "globals.h" #include "HttpMsg.h" -#include "adaptation/icap/Xaction.h" -#include "adaptation/icap/Launcher.h" -#include "adaptation/icap/Config.h" -#include "base/TextException.h" -#include "pconn.h" -#include "HttpRequest.h" #include "HttpReply.h" -#include "ipcache.h" -#include "acl/FilledChecklist.h" +#include "HttpRequest.h" #include "icap_log.h" -#include "fde.h" +#include "ipcache.h" +#include "pconn.h" +#include "protos.h" #include "SquidTime.h" -#include "err_detail_type.h" //CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, Xaction); diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc index 88119bd3b8..f9b743cf76 100644 --- a/src/adaptation/icap/icap_log.cc +++ b/src/adaptation/icap/icap_log.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "icap_log.h" #include "AccessLogEntry.h" #include "log/File.h" diff --git a/src/adaptation/icap/icap_log.h b/src/adaptation/icap/icap_log.h index 1e981c6bd6..5cb88c1826 100644 --- a/src/adaptation/icap/icap_log.h +++ b/src/adaptation/icap/icap_log.h @@ -1,6 +1,7 @@ #ifndef ICAP_LOG_H_ #define ICAP_LOG_H_ +#include "AccessLogEntry.h" #include "RefCount.h" typedef RefCount AccessLogEntryPointer; diff --git a/src/auth/Acl.cc b/src/auth/Acl.cc index 69606b917f..fd70ba3f66 100644 --- a/src/auth/Acl.cc +++ b/src/auth/Acl.cc @@ -1,9 +1,10 @@ -#include "squid-old.h" +#include "squid.h" #include "acl/Acl.h" #include "acl/FilledChecklist.h" #include "auth/UserRequest.h" #include "auth/Acl.h" #include "auth/AclProxyAuth.h" +#include "client_side.h" #include "HttpRequest.h" /** diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc index 11c157a1ab..ef42304763 100644 --- a/src/auth/AclMaxUserIp.cc +++ b/src/auth/AclMaxUserIp.cc @@ -1,44 +1,15 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels - * - * 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. - * - * - * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "auth/Acl.h" #include "auth/AclMaxUserIp.h" #include "auth/UserRequest.h" +#include "Debug.h" +#include "protos.h" #include "wordlist.h" #include "ConfigParser.h" diff --git a/src/auth/AclMaxUserIp.h b/src/auth/AclMaxUserIp.h index fda6df65bc..82913e2510 100644 --- a/src/auth/AclMaxUserIp.h +++ b/src/auth/AclMaxUserIp.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc index d254a07182..100d38e6a6 100644 --- a/src/auth/AclProxyAuth.cc +++ b/src/auth/AclProxyAuth.cc @@ -1,6 +1,4 @@ /* - * $Id$ - * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels * @@ -34,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "auth/AclProxyAuth.h" #include "auth/Gadgets.h" #include "acl/FilledChecklist.h" diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h index 4be089198e..fb0854d02c 100644 --- a/src/auth/AclProxyAuth.h +++ b/src/auth/AclProxyAuth.h @@ -1,7 +1,4 @@ /* - * $Id$ - * - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * diff --git a/src/auth/Config.cc b/src/auth/Config.cc index 7fdeba7172..a2c64c1b05 100644 --- a/src/auth/Config.cc +++ b/src/auth/Config.cc @@ -32,9 +32,11 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "auth/Config.h" #include "auth/UserRequest.h" +#include "Debug.h" +#include "globals.h" Auth::ConfigVector Auth::TheConfig; diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc index e5b0acc8a4..57ec89e4fa 100644 --- a/src/auth/Gadgets.cc +++ b/src/auth/Gadgets.cc @@ -36,7 +36,7 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ -#include "squid-old.h" +#include "squid.h" #include "acl/Acl.h" #include "acl/FilledChecklist.h" #include "client_side.h" @@ -46,6 +46,7 @@ #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/AclProxyAuth.h" +#include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc index e63f6d3060..b3fb1a5c41 100644 --- a/src/auth/Scheme.cc +++ b/src/auth/Scheme.cc @@ -33,10 +33,11 @@ * Copyright (c) 2004, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "auth/Scheme.h" #include "auth/Gadgets.h" #include "auth/Config.h" +#include "globals.h" Vector *Auth::Scheme::_Schemes = NULL; diff --git a/src/auth/User.cc b/src/auth/User.cc index 696d914054..8e76310e8e 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "auth/User.h" #include "auth/UserRequest.h" #include "auth/Config.h" @@ -41,6 +41,7 @@ #include "acl/Acl.h" #include "acl/Gadgets.h" #include "event.h" +#include "globals.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc index 198790efcc..15bdc5a9a8 100644 --- a/src/auth/UserRequest.cc +++ b/src/auth/UserRequest.cc @@ -39,11 +39,12 @@ * They DO NOT perform access control or auditing. * See acl.c for access control and client_side.c for auditing */ -#include "squid-old.h" +#include "squid.h" #include "auth/Config.h" #include "auth/Scheme.h" #include "auth/UserRequest.h" #include "auth/User.h" +#include "client_side.h" #include "comm/Connection.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/auth/basic/Scheme.cc b/src/auth/basic/Scheme.cc index 2628b02492..7b52a85531 100644 --- a/src/auth/basic/Scheme.cc +++ b/src/auth/basic/Scheme.cc @@ -32,6 +32,7 @@ #include "squid.h" #include "auth/basic/Scheme.h" +#include "Debug.h" #include "helper.h" /* for Auth::Config */ diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc index bcd1841839..59c9afb948 100644 --- a/src/auth/basic/User.cc +++ b/src/auth/basic/User.cc @@ -3,6 +3,7 @@ #include "auth/basic/User.h" #include "Debug.h" #include "SquidTime.h" +#include "structs.h" Auth::Basic::User::User(Auth::Config *aConfig) : Auth::User(aConfig), diff --git a/src/auth/basic/UserRequest.cc b/src/auth/basic/UserRequest.cc index 490b2626bc..a990818461 100644 --- a/src/auth/basic/UserRequest.cc +++ b/src/auth/basic/UserRequest.cc @@ -4,6 +4,7 @@ #include "auth/basic/UserRequest.h" #include "auth/State.h" #include "charset.h" +#include "Debug.h" #include "rfc1738.h" #include "SquidTime.h" diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc index cf506c55b8..dde49bfe2c 100644 --- a/src/auth/basic/auth_basic.cc +++ b/src/auth/basic/auth_basic.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid-old.h" +#include "squid.h" #include "auth/basic/auth_basic.h" #include "auth/basic/Scheme.h" #include "auth/basic/User.h" @@ -48,6 +48,7 @@ #include "mgr/Registration.h" #include "Store.h" #include "HttpReply.h" +#include "protos.h" #include "rfc1738.h" #include "uudecode.h" #include "wordlist.h" diff --git a/src/auth/digest/Scheme.cc b/src/auth/digest/Scheme.cc index 3060589a86..c70f251611 100644 --- a/src/auth/digest/Scheme.cc +++ b/src/auth/digest/Scheme.cc @@ -32,6 +32,8 @@ #include "squid.h" #include "auth/digest/Scheme.h" +#include "Debug.h" +#include "globals.h" #include "helper.h" Auth::Scheme::Pointer Auth::Digest::Scheme::_instance = NULL; diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc index c89d797b08..9166e5e32e 100644 --- a/src/auth/digest/User.cc +++ b/src/auth/digest/User.cc @@ -4,6 +4,7 @@ #include "Debug.h" #include "dlink.h" #include "SquidTime.h" +#include "structs.h" Auth::Digest::User::User(Auth::Config *aConfig) : Auth::User(aConfig), diff --git a/src/auth/digest/UserRequest.cc b/src/auth/digest/UserRequest.cc index 3305db575f..920c7290f0 100644 --- a/src/auth/digest/UserRequest.cc +++ b/src/auth/digest/UserRequest.cc @@ -6,6 +6,7 @@ #include "charset.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "protos.h" #include "SquidTime.h" Auth::Digest::UserRequest::UserRequest() : diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index 5aefe77ae8..48715c112c 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid-old.h" +#include "squid.h" #include "rfc2617.h" #include "auth/digest/auth_digest.h" #include "auth/digest/Scheme.h" @@ -52,6 +52,7 @@ #include "Store.h" #include "HttpRequest.h" #include "HttpReply.h" +#include "protos.h" #include "wordlist.h" #include "SquidTime.h" diff --git a/src/auth/negotiate/Scheme.cc b/src/auth/negotiate/Scheme.cc index ea98811007..a1ec60b5f4 100644 --- a/src/auth/negotiate/Scheme.cc +++ b/src/auth/negotiate/Scheme.cc @@ -32,6 +32,7 @@ #include "squid.h" #include "auth/negotiate/Scheme.h" +#include "Debug.h" #include "helper.h" Auth::Scheme::Pointer Auth::Negotiate::Scheme::_instance = NULL; diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index 1750c68ee5..59c43d7c0a 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -3,9 +3,12 @@ #include "auth/negotiate/UserRequest.h" #include "auth/State.h" #include "auth/User.h" +#include "client_side.h" +#include "globals.h" #include "helper.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "protos.h" #include "SquidTime.h" Auth::Negotiate::UserRequest::UserRequest() diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc index 453ee98656..5bd3f75f2c 100644 --- a/src/auth/negotiate/auth_negotiate.cc +++ b/src/auth/negotiate/auth_negotiate.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid-old.h" +#include "squid.h" #include "auth/negotiate/auth_negotiate.h" #include "auth/Gadgets.h" #include "auth/State.h" @@ -46,6 +46,7 @@ #include "client_side.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "protos.h" #include "SquidTime.h" #include "auth/negotiate/Scheme.h" #include "auth/negotiate/User.h" diff --git a/src/auth/ntlm/Scheme.cc b/src/auth/ntlm/Scheme.cc index e1236ea761..41e5e5d1b3 100644 --- a/src/auth/ntlm/Scheme.cc +++ b/src/auth/ntlm/Scheme.cc @@ -33,6 +33,7 @@ #include "squid.h" #include "auth/ntlm/auth_ntlm.h" #include "auth/ntlm/Scheme.h" +#include "Debug.h" #include "helper.h" Auth::Scheme::Pointer Auth::Ntlm::Scheme::_instance = NULL; diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc index 5e4de53b93..bd2b4ffe13 100644 --- a/src/auth/ntlm/UserRequest.cc +++ b/src/auth/ntlm/UserRequest.cc @@ -3,6 +3,8 @@ #include "auth/ntlm/UserRequest.h" #include "auth/State.h" #include "cbdata.h" +#include "client_side.h" +#include "globals.h" #include "HttpRequest.h" #include "SquidTime.h" diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc index 4d2d3ad60a..b4c2ea00e8 100644 --- a/src/auth/ntlm/auth_ntlm.cc +++ b/src/auth/ntlm/auth_ntlm.cc @@ -37,7 +37,7 @@ * See acl.c for access control and client_side.c for auditing */ -#include "squid-old.h" +#include "squid.h" #include "auth/Gadgets.h" #include "auth/ntlm/auth_ntlm.h" #include "auth/ntlm/Scheme.h" @@ -49,6 +49,7 @@ #include "client_side.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "protos.h" #include "wordlist.h" #include "SquidTime.h" diff --git a/src/base/AsyncCall.cc b/src/base/AsyncCall.cc index 39ac588e9c..621353b503 100644 --- a/src/base/AsyncCall.cc +++ b/src/base/AsyncCall.cc @@ -2,11 +2,11 @@ * $Id$ */ -#include "squid-old.h" +#include "squid.h" #include "base/AsyncCall.h" #include "base/AsyncCallQueue.h" #include "cbdata.h" - +#include "Debug.h" #include InstanceIdDefinitions(AsyncCall, "call"); diff --git a/src/base/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc index 3c63810300..ee899be624 100644 --- a/src/base/AsyncCallQueue.cc +++ b/src/base/AsyncCallQueue.cc @@ -9,6 +9,7 @@ #include "squid.h" #include "base/AsyncCallQueue.h" #include "base/AsyncCall.h" +#include "Debug.h" AsyncCallQueue *AsyncCallQueue::TheInstance = 0; diff --git a/src/base/AsyncCallQueue.h b/src/base/AsyncCallQueue.h index 451c40c9ce..e7447c6f56 100644 --- a/src/base/AsyncCallQueue.h +++ b/src/base/AsyncCallQueue.h @@ -1,13 +1,6 @@ - -/* - * $Id$ - * - */ - #ifndef SQUID_ASYNCCALLQUEUE_H #define SQUID_ASYNCCALLQUEUE_H -#include "squid-old.h" #include "base/AsyncCall.h" //class AsyncCall; diff --git a/src/base/AsyncJob.cc b/src/base/AsyncJob.cc index cbb3629cf7..34c5bc57ed 100644 --- a/src/base/AsyncJob.cc +++ b/src/base/AsyncJob.cc @@ -2,7 +2,7 @@ * DEBUG: section 93 ICAP (RFC 3507) Client */ -#include "squid-old.h" +#include "squid.h" #include "base/AsyncCall.h" #include "base/AsyncJob.h" #include "base/AsyncJobCalls.h" diff --git a/src/base/AsyncJobCalls.h b/src/base/AsyncJobCalls.h index 380eec5817..c2c861f7c1 100644 --- a/src/base/AsyncJobCalls.h +++ b/src/base/AsyncJobCalls.h @@ -8,6 +8,7 @@ #include "base/AsyncJob.h" #include "base/CbcPointer.h" +#include "Debug.h" /** \ingroup AsyncJobAPI diff --git a/src/base/TextException.cc b/src/base/TextException.cc index ef66a37931..555433b3ab 100644 --- a/src/base/TextException.cc +++ b/src/base/TextException.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "base/TextException.h" #include "Debug.h" #include "util.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index dc903b5f35..58a693b974 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -32,11 +32,35 @@ * */ -#include "squid-old.h" - +#include "squid.h" #include "acl/Acl.h" #include "acl/Gadgets.h" #include "acl/MethodData.h" +#include "anyp/PortCfg.h" +#include "base/RunnersRegistry.h" +#include "ConfigParser.h" +#include "CpuAffinityMap.h" +#include "DiskIO/DiskIOModule.h" +#include "eui/Config.h" +#include "format/Format.h" +#include "globals.h" +#include "HttpRequestMethod.h" +#include "ident/Config.h" +#include "ip/Intercept.h" +#include "ip/QosConfig.h" +#include "ip/tools.h" +#include "ipc/Kids.h" +#include "log/Config.h" +#include "MemBuf.h" +#include "mgr/Registration.h" +#include "Parsing.h" +#include "protos.h" +#include "rfc1738.h" +#include "Store.h" +#include "StoreFileSystem.h" +#include "structs.h" +#include "SwapDir.h" +#include "wordlist.h" #if USE_ADAPTATION #include "adaptation/Config.h" #endif @@ -46,7 +70,6 @@ #if USE_ECAP #include "adaptation/ecap/Config.h" #endif -#include "anyp/PortCfg.h" #if USE_SSL #include "ssl/support.h" #include "ssl/Config.h" @@ -55,33 +78,15 @@ #include "auth/Config.h" #include "auth/Scheme.h" #endif -#include "base/RunnersRegistry.h" -#include "ConfigParser.h" -#include "CpuAffinityMap.h" -#include "DiskIO/DiskIOModule.h" -#include "eui/Config.h" #if USE_SQUID_ESI #include "esi/Parser.h" #endif -#include "format/Format.h" -#include "HttpRequestMethod.h" -#include "ident/Config.h" -#include "ip/Intercept.h" -#include "ip/QosConfig.h" -#include "ip/tools.h" -#include "log/Config.h" -#include "MemBuf.h" -#include "mgr/Registration.h" -#include "Parsing.h" -#include "rfc1738.h" #if SQUID_SNMP #include "snmp.h" #endif -#include "Store.h" -#include "StoreFileSystem.h" -#include "SwapDir.h" -#include "wordlist.h" -#include "ipc/Kids.h" + + + #if HAVE_GLOB_H #include @@ -94,6 +99,18 @@ #if HAVE_LIST #include #endif +#if HAVE_SYS_TYPES_H +#include +#endif +#if HAVE_PWD_H +#include +#endif +#if HAVE_GRP_H +#include +#endif +#if HAVE_SYS_STAT_H +#include +#endif #if USE_SSL #include "ssl/gadgets.h" diff --git a/src/cache_diff.cc b/src/cache_diff.cc index 181095ed6e..5ac819c55a 100644 --- a/src/cache_diff.cc +++ b/src/cache_diff.cc @@ -38,7 +38,7 @@ * Reports the percentage of common files and other stats */ -#include "squid-old.h" +#include "squid.h" typedef struct { const char *name; diff --git a/src/carp.cc b/src/carp.cc index ae5a423d93..982bd5770b 100644 --- a/src/carp.cc +++ b/src/carp.cc @@ -34,12 +34,17 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "HttpRequest.h" #include "mgr/Registration.h" +#include "protos.h" #include "Store.h" #include "URLScheme.h" +#if HAVE_MATH_H +#include +#endif + #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) static int n_carp_peers = 0; diff --git a/src/cbdata.cc b/src/cbdata.cc index 5754723631..59a639ad29 100644 --- a/src/cbdata.cc +++ b/src/cbdata.cc @@ -57,6 +57,10 @@ #endif #include "Generic.h" +#if HAVE_LIMITS_H +#include +#endif + #if WITH_VALGRIND #define HASHED_CBDATA 1 #endif diff --git a/src/cbdata.h b/src/cbdata.h index d23c51e7c8..bee15725ff 100644 --- a/src/cbdata.h +++ b/src/cbdata.h @@ -34,7 +34,7 @@ #ifndef SQUID_CBDATA_H #define SQUID_CBDATA_H -#include "squid-old.h" +#include "typedefs.h" /** \defgroup CBDATAAPI Callback Data Allocator API diff --git a/src/clientStream.cc b/src/clientStream.cc index 1ecbc523b7..1744dabc17 100644 --- a/src/clientStream.cc +++ b/src/clientStream.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "clientStream.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/clientStream.h b/src/clientStream.h index 61741f79cb..a22bd296b1 100644 --- a/src/clientStream.h +++ b/src/clientStream.h @@ -34,8 +34,9 @@ #ifndef SQUID_CLIENTSTREAM_H #define SQUID_CLIENTSTREAM_H -#include "StoreIOBuffer.h" +#include "dlink.h" #include "RefCount.h" +#include "StoreIOBuffer.h" /** \defgroup ClientStreamAPI Client Streams API @@ -100,8 +101,8 @@ typedef RefCount ClientStreamData; class clientStreamNode; - class ClientHttpRequest; +class HttpReply; /* client stream read callback */ /// \ingroup ClientStreamAPI diff --git a/src/client_db.cc b/src/client_db.cc index 63c6fce787..362c310aa4 100644 --- a/src/client_db.cc +++ b/src/client_db.cc @@ -32,12 +32,13 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "event.h" #include "format/Token.h" #include "ClientInfo.h" #include "ip/Address.h" #include "mgr/Registration.h" +#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/client_side.cc b/src/client_side.cc index 4276eeb2d8..0e6c8c75b0 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -81,30 +81,24 @@ * data flow. */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif #include "anyp/PortCfg.h" #include "base/Subscription.h" #include "base/TextException.h" #include "ChunkedCodingParser.h" -#include "client_side.h" #include "client_side_reply.h" #include "client_side_request.h" -#if USE_DELAY_POOLS -#include "ClientInfo.h" -#endif +#include "client_side.h" #include "ClientRequestContext.h" #include "clientStream.h" #include "comm.h" #include "comm/Connection.h" -#include "CommCalls.h" #include "comm/Loops.h" -#include "comm/Write.h" #include "comm/TcpAcceptor.h" +#include "comm/Write.h" +#include "CommCalls.h" #include "errorpage.h" #include "eui/Config.h" #include "fde.h" @@ -118,10 +112,21 @@ #include "ipc/StartListening.h" #include "MemBuf.h" #include "MemObject.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "rfc1738.h" +#include "SquidTime.h" #include "StatCounters.h" #include "StatHist.h" -#include "SquidTime.h" +#include "Store.h" +#include "TimeOrTag.h" + +#if USE_AUTH +#include "auth/UserRequest.h" +#endif +#if USE_DELAY_POOLS +#include "ClientInfo.h" +#endif #if USE_SSL #include "ssl/context_storage.h" #include "ssl/helper.h" @@ -133,9 +138,13 @@ #include "ssl/crtd_message.h" #include "ssl/certificate_db.h" #endif -#include "Store.h" -#include "TimeOrTag.h" +#if HAVE_LIMITS_H +#include +#endif +#if HAVE_MATH_H +#include +#endif #if HAVE_LIMITS #include #endif diff --git a/src/client_side.h b/src/client_side.h index 6713da50f9..3ce723e1f0 100644 --- a/src/client_side.h +++ b/src/client_side.h @@ -33,17 +33,18 @@ #ifndef SQUID_CLIENTSIDE_H #define SQUID_CLIENTSIDE_H -#if USE_AUTH -#include "auth/UserRequest.h" -#endif #include "base/AsyncJob.h" #include "BodyPipe.h" #include "comm.h" #include "CommCalls.h" +#include "HttpRequest.h" #include "HttpControlMsg.h" #include "HttpParser.h" #include "RefCount.h" #include "StoreIOBuffer.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif #if USE_SSL #include "ssl/support.h" #endif diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index b55ad9fea8..64b9cd46d8 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -32,39 +32,37 @@ * */ #include "squid.h" - -/* for ClientActiveRequests global */ -#include "dlink.h" - -/* old includes without reasons given. */ -#include "squid-old.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" #include "anyp/PortCfg.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif -#include "client_side.h" #include "client_side_reply.h" +#include "client_side.h" #include "clientStream.h" -#if USE_DELAY_POOLS -#include "DelayPools.h" -#endif +#include "dlink.h" #include "errorpage.h" -#if USE_SQUID_ESI -#include "esi/Esi.h" -#endif #include "fde.h" -#include "forward.h" #include "format/Token.h" +#include "forward.h" +#include "globals.h" +#include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" #include "ip/QosConfig.h" #include "ipcache.h" #include "MemObject.h" +#include "protos.h" #include "SquidTime.h" -#include "StoreClient.h" #include "Store.h" +#include "StoreClient.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif +#if USE_DELAY_POOLS +#include "DelayPools.h" +#endif +#if USE_SQUID_ESI +#include "esi/Esi.h" +#endif CBDATA_CLASS_INIT(clientReplyContext); diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 1c983f6844..ffbc2e48f4 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -42,42 +42,45 @@ * From that point on it's up to reply management. */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" -#if USE_ADAPTATION -#include "adaptation/AccessCheck.h" -#include "adaptation/Answer.h" -#include "adaptation/Iterator.h" -#include "adaptation/Service.h" -#if ICAP_CLIENT -#include "adaptation/icap/History.h" -#endif -#endif #include "anyp/PortCfg.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif -#include "clientStream.h" +#include "ClientRequestContext.h" #include "client_side.h" #include "client_side_reply.h" #include "client_side_request.h" -#include "ClientRequestContext.h" +#include "clientStream.h" #include "comm/Connection.h" #include "comm/Write.h" #include "compat/inet_pton.h" +#include "err_detail_type.h" #include "errorpage.h" #include "fde.h" #include "format/Token.h" #include "HttpHdrCc.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "ipcache.h" #include "ip/QosConfig.h" #include "MemObject.h" -#include "Store.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "SquidTime.h" +#include "Store.h" #include "wordlist.h" -#include "err_detail_type.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif +#if USE_ADAPTATION +#include "adaptation/AccessCheck.h" +#include "adaptation/Answer.h" +#include "adaptation/Iterator.h" +#include "adaptation/Service.h" +#if ICAP_CLIENT +#include "adaptation/icap/History.h" +#endif +#endif #if USE_SSL #include "ssl/support.h" #include "ssl/ServerBump.h" diff --git a/src/client_side_request.h b/src/client_side_request.h index 517ee698b3..c1bfd29a7a 100644 --- a/src/client_side_request.h +++ b/src/client_side_request.h @@ -1,8 +1,4 @@ - /* - * $Id$ - * - * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- * @@ -35,7 +31,6 @@ #ifndef SQUID_CLIENTSIDEREQUEST_H #define SQUID_CLIENTSIDEREQUEST_H -#include "squid-old.h" #include "HttpHeader.h" #include "clientStream.h" #include "client_side.h" diff --git a/src/comm.cc b/src/comm.cc index 32adceb352..de0bada35a 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -32,12 +32,11 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "base/AsyncCall.h" -#include "StoreIOBuffer.h" #include "comm.h" -#include "event.h" -#include "fde.h" +#include "ClientInfo.h" +#include "CommCalls.h" #include "comm/AcceptLimiter.h" #include "comm/comm_internal.h" #include "comm/Connection.h" @@ -46,18 +45,23 @@ #include "comm/Write.h" #include "comm/TcpAcceptor.h" #include "CommRead.h" -#include "MemBuf.h" -#include "pconn.h" -#include "SquidTime.h" -#include "CommCalls.h" +#include "compat/cmsg.h" #include "DescriptorSet.h" +#include "event.h" +#include "fde.h" +#include "globals.h" #include "icmp/net_db.h" #include "ip/Address.h" #include "ip/Intercept.h" #include "ip/QosConfig.h" #include "ip/tools.h" -#include "ClientInfo.h" +#include "MemBuf.h" +#include "pconn.h" +#include "protos.h" +#include "profiler/Profiler.h" +#include "SquidTime.h" #include "StatCounters.h" +#include "StoreIOBuffer.h" #if USE_SSL #include "ssl/support.h" #endif @@ -69,6 +73,12 @@ #ifdef HAVE_NETINET_TCP_H #include #endif +#if HAVE_SYS_UN_H +#include +#endif +#if HAVE_MATH_H +#include +#endif /* * New C-like simple comm code. This stuff is a mess and doesn't really buy us anything. diff --git a/src/comm.h b/src/comm.h index 2cd9b6d229..191e123222 100644 --- a/src/comm.h +++ b/src/comm.h @@ -1,12 +1,12 @@ #ifndef __COMM_H__ #define __COMM_H__ -#include "squid-old.h" #include "AsyncEngine.h" #include "base/AsyncCall.h" #include "CommCalls.h" #include "comm_err_t.h" #include "comm/IoCallback.h" +#include "ip/Address.h" #include "StoreIOBuffer.h" /* comm.c */ diff --git a/src/comm/AcceptLimiter.cc b/src/comm/AcceptLimiter.cc index bb5b115ecb..a61b19e2c8 100644 --- a/src/comm/AcceptLimiter.cc +++ b/src/comm/AcceptLimiter.cc @@ -3,6 +3,7 @@ #include "comm/Connection.h" #include "comm/TcpAcceptor.h" #include "fde.h" +#include "globals.h" Comm::AcceptLimiter Comm::AcceptLimiter::Instance_; diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc index 0f20b3c1cd..25f33efc61 100644 --- a/src/comm/ConnOpener.cc +++ b/src/comm/ConnOpener.cc @@ -8,9 +8,11 @@ #include "comm/Loops.h" #include "comm.h" #include "fde.h" +#include "globals.h" #include "icmp/net_db.h" #include "ipcache.h" #include "SquidTime.h" +#include "protos.h" CBDATA_NAMESPACED_CLASS_INIT(Comm, ConnOpener); diff --git a/src/comm/Connection.h b/src/comm/Connection.h index b0b41368bc..ec5b9fc67a 100644 --- a/src/comm/Connection.h +++ b/src/comm/Connection.h @@ -38,6 +38,7 @@ #define _SQUIDCONNECTIONDETAIL_H_ #include "comm/forward.h" +#include "defines.h" #include "hier_code.h" #include "ip/Address.h" #include "MemPool.h" diff --git a/src/comm/IoCallback.cc b/src/comm/IoCallback.cc index 66e985f396..67b8d039e6 100644 --- a/src/comm/IoCallback.cc +++ b/src/comm/IoCallback.cc @@ -6,6 +6,7 @@ #include "comm/Write.h" #include "CommCalls.h" #include "fde.h" +#include "globals.h" Comm::CbEntry *Comm::iocb_table; diff --git a/src/comm/ModDevPoll.cc b/src/comm/ModDevPoll.cc index cdaed4fc42..5c114183b3 100644 --- a/src/comm/ModDevPoll.cc +++ b/src/comm/ModDevPoll.cc @@ -54,10 +54,10 @@ #if USE_DEVPOLL -#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" #include "mgr/Registration.h" +#include "profiler/Profiler.h" #include "SquidTime.h" #include "StatCounters.h" #include "StatHist.h" diff --git a/src/comm/ModEpoll.cc b/src/comm/ModEpoll.cc index 1216f87dd9..1a09a7013f 100644 --- a/src/comm/ModEpoll.cc +++ b/src/comm/ModEpoll.cc @@ -55,10 +55,11 @@ #if USE_EPOLL -#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" +#include "globals.h" #include "mgr/Registration.h" +#include "profiler/Profiler.h" #include "SquidTime.h" #include "StatCounters.h" #include "StatHist.h" diff --git a/src/comm/ModKqueue.cc b/src/comm/ModKqueue.cc index 072091afef..aed809f94f 100644 --- a/src/comm/ModKqueue.cc +++ b/src/comm/ModKqueue.cc @@ -55,13 +55,11 @@ #include "squid.h" #if USE_KQUEUE - -#include "squid-old.h" #include "comm/Loops.h" #include "fde.h" -#include "Store.h" #include "SquidTime.h" #include "StatCounters.h" +#include "Store.h" #if HAVE_SYS_EVENT_H #include diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc index fbce2143db..2569d5b029 100644 --- a/src/comm/ModPoll.cc +++ b/src/comm/ModPoll.cc @@ -33,14 +33,15 @@ #include "squid.h" #if USE_POLL - -#include "squid-old.h" #include "anyp/PortCfg.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "fde.h" +#include "globals.h" #include "ICP.h" #include "mgr/Registration.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc index bdfcd1b50e..540c560dbd 100644 --- a/src/comm/ModSelect.cc +++ b/src/comm/ModSelect.cc @@ -34,11 +34,11 @@ #if USE_SELECT -#include "squid-old.h" #include "anyp/PortCfg.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "fde.h" +#include "globals.h" #include "ICP.h" #include "mgr/Registration.h" #include "SquidTime.h" @@ -46,6 +46,10 @@ #include "StatHist.h" #include "Store.h" +#if HAVE_SYS_STAT_H +#include +#endif + static int MAX_POLL_TIME = 1000; /* see also Comm::QuickPollRequired() */ #ifndef howmany diff --git a/src/comm/ModSelectWin32.cc b/src/comm/ModSelectWin32.cc index b7af3cc9d1..9f73253fd8 100644 --- a/src/comm/ModSelectWin32.cc +++ b/src/comm/ModSelectWin32.cc @@ -33,8 +33,6 @@ #include "squid.h" #if USE_SELECT_WIN32 - -#include "squid-old.h" #include "anyp/PortCfg.h" #include "comm/Connection.h" #include "comm/Loops.h" diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc index 31fb6651cf..07c81873cf 100644 --- a/src/comm/TcpAcceptor.cc +++ b/src/comm/TcpAcceptor.cc @@ -32,16 +32,17 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "base/TextException.h" -#include "CommCalls.h" #include "comm/AcceptLimiter.h" +#include "CommCalls.h" #include "comm/comm_internal.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "comm/TcpAcceptor.h" #include "fde.h" #include "ip/Intercept.h" +#include "profiler/Profiler.h" #include "protos.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/comm/Write.cc b/src/comm/Write.cc index 455b1f0183..a3f5f444d5 100644 --- a/src/comm/Write.cc +++ b/src/comm/Write.cc @@ -6,9 +6,12 @@ #include "comm/IoCallback.h" #include "comm/Write.h" #include "fde.h" +#include "globals.h" #include "StatCounters.h" #include "SquidTime.h" #include "MemBuf.h" +#include "profiler/Profiler.h" +#include "protos.h" void Comm::Write(const Comm::ConnectionPointer &conn, MemBuf *mb, AsyncCall::Pointer &callback) diff --git a/src/comm/Write.h b/src/comm/Write.h index 87aba9de23..fea2202031 100644 --- a/src/comm/Write.h +++ b/src/comm/Write.h @@ -3,7 +3,9 @@ #include "base/AsyncCall.h" #include "comm/forward.h" +#include "typedefs.h" +class MemBuf; namespace Comm { diff --git a/src/delay_pools.cc b/src/delay_pools.cc index 758816e57a..08169d24ac 100644 --- a/src/delay_pools.cc +++ b/src/delay_pools.cc @@ -42,30 +42,29 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" -#include "mgr/Registration.h" -#include "DelaySpec.h" -#include "DelayPools.h" -#include "event.h" -#include "StoreClient.h" -#include "Store.h" -#include "MemObject.h" -#include "client_side_request.h" -#include "ConfigParser.h" -#include "DelayId.h" #include "Array.h" -#include "SquidString.h" -#include "SquidTime.h" +#include "client_side_request.h" +#include "comm/Connection.h" #include "CommonPool.h" #include "CompositePoolNode.h" -#include "DelayPool.h" -#include "DelayVector.h" -#include "NullDelayId.h" +#include "ConfigParser.h" #include "DelayBucket.h" -#include "DelayUser.h" +#include "DelayId.h" +#include "DelayPool.h" +#include "DelayPools.h" +#include "DelaySpec.h" #include "DelayTagged.h" +#include "DelayUser.h" +#include "DelayVector.h" +#include "event.h" #include "ip/Address.h" -#include "comm/Connection.h" +#include "MemObject.h" +#include "mgr/Registration.h" +#include "NullDelayId.h" +#include "SquidString.h" +#include "SquidTime.h" +#include "StoreClient.h" +#include "Store.h" /// \ingroup DelayPoolsInternal long DelayPools::MemoryUsed = 0; diff --git a/src/disk.cc b/src/disk.cc index 89cbf81157..fe5440e6e1 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -32,10 +32,12 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm/Loops.h" #include "fde.h" #include "MemBuf.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "StatCounters.h" static PF diskHandleRead; diff --git a/src/dns.cc b/src/dns.cc index 38a816a2d7..3f69c21b9f 100644 --- a/src/dns.cc +++ b/src/dns.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "wordlist.h" #include "SquidTime.h" diff --git a/src/dns_internal.cc b/src/dns_internal.cc index 69c3df79eb..f1af98de16 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -32,22 +32,24 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "base/InstanceId.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" #include "comm.h" #include "comm/Loops.h" #include "comm/Write.h" #include "event.h" -#include "SquidTime.h" -#include "Store.h" #include "fde.h" #include "ip/tools.h" #include "MemBuf.h" #include "mgr/Registration.h" +#include "protos.h" +#include "rfc3596.h" +#include "SquidTime.h" +#include "Store.h" #include "util.h" #include "wordlist.h" -#include "base/InstanceId.h" #if HAVE_ARPA_NAMESER_H #include diff --git a/src/errorpage.cc b/src/errorpage.cc index 5aef7ed777..e37e51063f 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -34,6 +34,7 @@ #include "squid.h" #include "comm/Connection.h" #include "comm/Write.h" +#include "err_detail_type.h" #include "errorpage.h" #if USE_AUTH #include "auth/UserRequest.h" @@ -49,10 +50,10 @@ #include "MemObject.h" #include "fde.h" #include "MemBuf.h" +#include "protos.h" #include "rfc1738.h" #include "URLScheme.h" #include "wordlist.h" -#include "err_detail_type.h" /** \defgroup ErrorPageInternal Error Page Internals diff --git a/src/errorpage.h b/src/errorpage.h index 22e6228eee..8e739eb194 100644 --- a/src/errorpage.h +++ b/src/errorpage.h @@ -34,15 +34,16 @@ #ifndef SQUID_ERRORPAGE_H #define SQUID_ERRORPAGE_H -#include "squid-old.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif #include "cbdata.h" #include "comm/forward.h" #include "err_detail_type.h" +#include "err_type.h" #include "ip/Address.h" #include "MemBuf.h" +#include "SquidString.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif #if USE_SSL #include "ssl/ErrorDetail.h" #endif @@ -90,6 +91,7 @@ */ class HttpReply; +class HttpRequest; class MemBuf; /// \ingroup ErrorPageAPI diff --git a/src/esi/Assign.cc b/src/esi/Assign.cc index 04de070bcb..6b5aed741e 100644 --- a/src/esi/Assign.cc +++ b/src/esi/Assign.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Assign.h b/src/esi/Assign.h index 563b06a4f2..6a1f34714b 100644 --- a/src/esi/Assign.h +++ b/src/esi/Assign.h @@ -36,10 +36,9 @@ #ifndef SQUID_ESIASSIGN_H #define SQUID_ESIASSIGN_H -#include "squid-old.h" #include "esi/Element.h" -#include "SquidString.h" #include "esi/VarState.h" +#include "SquidString.h" /* ESIVariableExpression */ /* This is a variable that is itself and expression */ diff --git a/src/esi/Attempt.h b/src/esi/Attempt.h index ee4f85f6ff..7d5da58099 100644 --- a/src/esi/Attempt.h +++ b/src/esi/Attempt.h @@ -36,7 +36,6 @@ #ifndef SQUID_ESIATTEMPT_H #define SQUID_ESIATTEMPT_H -#include "squid-old.h" #include "esi/Element.h" #include "esi/Sequence.h" diff --git a/src/esi/Context.cc b/src/esi/Context.cc index db7a77e8df..2db6adbcf5 100644 --- a/src/esi/Context.cc +++ b/src/esi/Context.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Context.h b/src/esi/Context.h index 3294435eb8..811d2ef20b 100644 --- a/src/esi/Context.h +++ b/src/esi/Context.h @@ -34,15 +34,14 @@ #ifndef SQUID_ESICONTEXT_H #define SQUID_ESICONTEXT_H +#include "esi/Parser.h" #include "esi/Element.h" #include "clientStream.h" +#include "err_type.h" class ESIVarState; - class ClientHttpRequest; -#include "esi/Parser.h" - /* ESIContext */ class ESIContext : public esiTreeParent, public ESIParserClient diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc index 04f869facd..26058f004c 100644 --- a/src/esi/CustomParser.cc +++ b/src/esi/CustomParser.cc @@ -33,11 +33,12 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Array.h" #include "esi/CustomParser.h" +#include "Debug.h" #include "Trie.h" #include "TrieCharTransform.h" -#include "Array.h" Trie *ESICustomParser::SearchTrie=NULL; diff --git a/src/esi/Element.h b/src/esi/Element.h index b2f6d0c393..2654b1e9db 100644 --- a/src/esi/Element.h +++ b/src/esi/Element.h @@ -33,8 +33,9 @@ #ifndef SQUID_ESIELEMENT_H #define SQUID_ESIELEMENT_H -#include "RefCount.h" +#include "Debug.h" #include "esi/Segment.h" +#include "RefCount.h" typedef enum { ESI_PROCESS_COMPLETE = 0, diff --git a/src/esi/ElementList.h b/src/esi/ElementList.h index 96977f54e3..d73a1fb79f 100644 --- a/src/esi/ElementList.h +++ b/src/esi/ElementList.h @@ -36,7 +36,6 @@ #ifndef SQUID_ELEMENTLIST_H #define SQUID_ELEMENTLIST_H -#include "squid-old.h" #include "esi/Element.h" class ElementList diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc index e5967098b1..d00c8e165e 100644 --- a/src/esi/Esi.cc +++ b/src/esi/Esi.cc @@ -31,33 +31,35 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. */ #if (USE_SQUID_ESI == 1) -#include "esi/Esi.h" -#include "clientStream.h" #include "client_side_request.h" +#include "client_side.h" +#include "clientStream.h" #include "comm/Connection.h" #include "errorpage.h" -#include "esi/Segment.h" -#include "esi/Element.h" +#include "esi/Assign.h" +#include "esi/Attempt.h" #include "esi/Context.h" +#include "esi/Element.h" +#include "esi/Esi.h" +#include "esi/Except.h" +#include "esi/Expression.h" +#include "esi/Segment.h" +#include "esi/VarState.h" #include "HttpHdrSc.h" #include "HttpHdrScTarget.h" #include "HttpReply.h" -#include "esi/Attempt.h" -#include "esi/Except.h" -#include "client_side.h" -#include "esi/VarState.h" -#include "esi/Assign.h" -#include "esi/Expression.h" #include "HttpRequest.h" -#include "MemBuf.h" #include "ip/Address.h" +#include "MemBuf.h" +#include "profiler/Profiler.h" +#include "protos.h" /* quick reference on behaviour here. * The ESI specification 1.0 requires the ESI processor to be able to diff --git a/src/esi/Except.h b/src/esi/Except.h index 71b331b2c2..a3f66e95f9 100644 --- a/src/esi/Except.h +++ b/src/esi/Except.h @@ -36,7 +36,6 @@ #ifndef SQUID_ESIEXCEPT_H #define SQUID_ESIEXCEPT_H -#include "squid-old.h" #include "esi/Element.h" #include "esi/Sequence.h" diff --git a/src/esi/ExpatParser.cc b/src/esi/ExpatParser.cc index 786c832153..3019af08ec 100644 --- a/src/esi/ExpatParser.cc +++ b/src/esi/ExpatParser.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #if USE_SQUID_ESI && HAVE_LIBEXPAT diff --git a/src/esi/Expression.cc b/src/esi/Expression.cc index 98dfacb950..378a4772cf 100644 --- a/src/esi/Expression.cc +++ b/src/esi/Expression.cc @@ -33,8 +33,14 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "esi/Expression.h" +#include "profiler/Profiler.h" + +#if HAVE_MATH_H +#include +#endif /* stack precedence rules: * before pushing an operator onto the stack, the diff --git a/src/esi/Expression.h b/src/esi/Expression.h index 60b83e22a2..e6c9e6d3fd 100644 --- a/src/esi/Expression.h +++ b/src/esi/Expression.h @@ -36,8 +36,6 @@ #ifndef SQUID_ESIEXPRESSION_H #define SQUID_ESIEXPRESSION_H -#include "squid-old.h" - class ESIExpression { diff --git a/src/esi/Include.cc b/src/esi/Include.cc index 5ed666326b..523b5420bd 100644 --- a/src/esi/Include.cc +++ b/src/esi/Include.cc @@ -34,17 +34,18 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. */ #if (USE_SQUID_ESI == 1) +#include "client_side_request.h" #include "esi/Include.h" #include "esi/VarState.h" -#include "client_side_request.h" #include "HttpReply.h" +#include "protos.h" CBDATA_CLASS_INIT (ESIStreamContext); diff --git a/src/esi/Include.h b/src/esi/Include.h index 79bb5d4138..b600c2fc89 100644 --- a/src/esi/Include.h +++ b/src/esi/Include.h @@ -36,10 +36,9 @@ #ifndef SQUID_ESIINCLUDE_H #define SQUID_ESIINCLUDE_H -#include "squid-old.h" -#include "esi/Segment.h" -#include "esi/Element.h" #include "esi/Context.h" +#include "esi/Element.h" +#include "esi/Segment.h" class ESIInclude; typedef RefCount ESIIncludePtr; diff --git a/src/esi/Libxml2Parser.cc b/src/esi/Libxml2Parser.cc index b5427c297d..4a36874627 100644 --- a/src/esi/Libxml2Parser.cc +++ b/src/esi/Libxml2Parser.cc @@ -37,7 +37,7 @@ * mail@joachim-bauch.de */ -#include "squid-old.h" +#include "squid.h" #if USE_SQUID_ESI && HAVE_LIBXML2 diff --git a/src/esi/Literal.h b/src/esi/Literal.h index b74c608b21..b73cd81814 100644 --- a/src/esi/Literal.h +++ b/src/esi/Literal.h @@ -36,7 +36,6 @@ #ifndef SQUID_ESILITERAL_H #define SQUID_ESILITERAL_H -#include "squid-old.h" #include "esi/Element.h" class ESIContext; diff --git a/src/esi/Module.cc b/src/esi/Module.cc index 16d1bc9aa2..71b9be035e 100644 --- a/src/esi/Module.cc +++ b/src/esi/Module.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "esi/Module.h" #include "esi/CustomParser.h" #include "esi/Libxml2Parser.h" diff --git a/src/esi/Parser.cc b/src/esi/Parser.cc index 75e9c6e40a..dbe18b68a0 100644 --- a/src/esi/Parser.cc +++ b/src/esi/Parser.cc @@ -32,8 +32,9 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "esi/Parser.h" +#include "fatal.h" char *ESIParser::Type = NULL; ESIParser::Register *ESIParser::Parsers = NULL; diff --git a/src/esi/Segment.cc b/src/esi/Segment.cc index 32ca9fcced..c496268471 100644 --- a/src/esi/Segment.cc +++ b/src/esi/Segment.cc @@ -33,7 +33,8 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "esi/Segment.h" #include "SquidString.h" diff --git a/src/esi/Segment.h b/src/esi/Segment.h index ac84151242..ef1648db09 100644 --- a/src/esi/Segment.h +++ b/src/esi/Segment.h @@ -38,6 +38,7 @@ */ #include "cbdata.h" +#include "defines.h" #include "RefCount.h" #include "SquidString.h" diff --git a/src/esi/Sequence.cc b/src/esi/Sequence.cc index 27ce3410d8..707d4f7701 100644 --- a/src/esi/Sequence.cc +++ b/src/esi/Sequence.cc @@ -33,7 +33,9 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" +#include "fatal.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the ESI code from compile process when not needed. diff --git a/src/esi/Sequence.h b/src/esi/Sequence.h index 1f20c6b78e..ec8e1a21da 100644 --- a/src/esi/Sequence.h +++ b/src/esi/Sequence.h @@ -36,9 +36,9 @@ #ifndef SQUID_ESISEQUENCE_H #define SQUID_ESISEQUENCE_H -#include "squid-old.h" #include "esi/Element.h" #include "esi/ElementList.h" +#include "MemPool.h" /* esiSequence */ diff --git a/src/esi/Var.h b/src/esi/Var.h index 9ea8c245a4..0c48eb1920 100644 --- a/src/esi/Var.h +++ b/src/esi/Var.h @@ -36,7 +36,6 @@ #ifndef SQUID_ESIVAR_H #define SQUID_ESIVAR_H -#include "squid-old.h" #include "esi/Element.h" #include "esi/Sequence.h" diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc index 8b899745e9..4b29ef5321 100644 --- a/src/esi/VarState.cc +++ b/src/esi/VarState.cc @@ -34,9 +34,10 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "esi/VarState.h" #include "HttpReply.h" +#include "protos.h" CBDATA_TYPE (ESIVarState); FREE ESIVarStateFree; diff --git a/src/event.cc b/src/event.cc index 33185b5f86..d03050a2ac 100644 --- a/src/event.cc +++ b/src/event.cc @@ -38,6 +38,8 @@ #include "mgr/Registration.h" #include "Store.h" #include "SquidTime.h" +#include "profiler/Profiler.h" +#include "protos.h" /* The list of event processes */ diff --git a/src/event.h b/src/event.h index a8d8c459be..6aa949b899 100644 --- a/src/event.h +++ b/src/event.h @@ -34,9 +34,10 @@ #ifndef SQUID_EVENT_H #define SQUID_EVENT_H -#include "squid-old.h" #include "Array.h" #include "AsyncEngine.h" +#include "MemPool.h" +#include "RefCount.h" /* forward decls */ diff --git a/src/external_acl.cc b/src/external_acl.cc index 4f3ecee0c3..6eef5a2216 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -40,36 +40,37 @@ * */ -#include "squid-old.h" -#include "mgr/Registration.h" -#include "ExternalACL.h" -#include "ExternalACLEntry.h" -#if USE_AUTH -#include "auth/Acl.h" -#include "auth/Gadgets.h" -#include "auth/UserRequest.h" -#endif -#include "SquidTime.h" -#include "Store.h" -#include "fde.h" -#include "acl/FilledChecklist.h" +#include "squid.h" #include "acl/Acl.h" -#if USE_IDENT -#include "ident/AclIdent.h" -#endif -#include "ip/tools.h" +#include "acl/FilledChecklist.h" #include "client_side.h" #include "comm/Connection.h" -#include "HttpRequest.h" -#include "HttpReply.h" +#include "ExternalACLEntry.h" +#include "ExternalACL.h" +#include "fde.h" #include "helper.h" +#include "HttpReply.h" +#include "HttpRequest.h" +#include "ip/tools.h" #include "MemBuf.h" +#include "mgr/Registration.h" +#include "protos.h" #include "rfc1738.h" +#include "SquidTime.h" +#include "Store.h" #include "URLScheme.h" #include "wordlist.h" #if USE_SSL #include "ssl/support.h" #endif +#if USE_AUTH +#include "auth/Acl.h" +#include "auth/Gadgets.h" +#include "auth/UserRequest.h" +#endif +#if USE_IDENT +#include "ident/AclIdent.h" +#endif #ifndef DEFAULT_EXTERNAL_ACL_TTL #define DEFAULT_EXTERNAL_ACL_TTL 1 * 60 * 60 diff --git a/src/fd.cc b/src/fd.cc index e828e1b09c..29a9164ab4 100644 --- a/src/fd.cc +++ b/src/fd.cc @@ -33,11 +33,13 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm/Loops.h" +#include "Debug.h" #include "fde.h" +#include "globals.h" +#include "profiler/Profiler.h" #include "SquidTime.h" -#include "Debug.h" // Solaris and possibly others lack MSG_NOSIGNAL optimization diff --git a/src/fde.cc b/src/fde.cc index 05cc7d524e..f877d50307 100644 --- a/src/fde.cc +++ b/src/fde.cc @@ -33,11 +33,13 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "comm.h" #include "fde.h" +#include "globals.h" +#include "protos.h" #include "SquidTime.h" #include "Store.h" -#include "comm.h" bool fde::readPending(int fdNumber) diff --git a/src/fde.h b/src/fde.h index f7ffa1c0c4..a78cff4cd3 100644 --- a/src/fde.h +++ b/src/fde.h @@ -32,6 +32,7 @@ #include "comm.h" #include "ip/Address.h" +#include "structs.h" #if USE_DELAY_POOLS class ClientInfo; diff --git a/src/format/Format.cc b/src/format/Format.cc index bfd4f0455b..efb187397b 100644 --- a/src/format/Format.cc +++ b/src/format/Format.cc @@ -1,5 +1,6 @@ #include "squid.h" #include "AccessLogEntry.h" +#include "client_side.h" #include "comm/Connection.h" #include "err_detail_type.h" #include "errorpage.h" @@ -9,6 +10,7 @@ #include "format/Token.h" #include "HttpRequest.h" #include "MemBuf.h" +#include "protos.h" #include "rfc1738.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/forward.cc b/src/forward.cc index c4b69950b8..905e9d9272 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -31,33 +31,36 @@ */ -#include "squid-old.h" -#include "forward.h" +#include "squid.h" #include "AccessLogEntry.h" #include "acl/FilledChecklist.h" #include "acl/Gadgets.h" #include "anyp/PortCfg.h" #include "CacheManager.h" +#include "client_side.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" -#include "CommCalls.h" #include "comm/Loops.h" -#include "event.h" +#include "CommCalls.h" #include "errorpage.h" +#include "event.h" #include "fde.h" +#include "forward.h" +#include "globals.h" #include "hier_code.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "icmp/net_db.h" +#include "ip/Intercept.h" #include "ip/QosConfig.h" +#include "ip/tools.h" #include "MemObject.h" +#include "mgr/Registration.h" #include "pconn.h" #include "PeerSelectState.h" +#include "protos.h" #include "SquidTime.h" #include "Store.h" -#include "icmp/net_db.h" -#include "ip/Intercept.h" -#include "ip/tools.h" -#include "mgr/Registration.h" #if USE_SSL #include "ssl/support.h" #include "ssl/ErrorDetail.h" diff --git a/src/forward.h b/src/forward.h index f2d0fbf2fc..32bd039d7f 100644 --- a/src/forward.h +++ b/src/forward.h @@ -1,6 +1,13 @@ #ifndef SQUID_FORWARD_H #define SQUID_FORWARD_H +#include "Array.h" +#include "comm.h" +#include "comm/Connection.h" +#include "fde.h" +#include "ip/Address.h" +#include "RefCount.h" + /* forward decls */ class AccessLogEntry; @@ -8,11 +15,6 @@ typedef RefCount AccessLogEntryPointer; class ErrorState; class HttpRequest; -#include "comm.h" -#include "comm/Connection.h" -#include "fde.h" -#include "ip/Address.h" -#include "Array.h" /** * Returns the TOS value that we should be setting on the connection diff --git a/src/fqdncache.cc b/src/fqdncache.cc index 774d1fcba7..42e80aca19 100644 --- a/src/fqdncache.cc +++ b/src/fqdncache.cc @@ -32,11 +32,12 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "cbdata.h" #include "DnsLookupDetails.h" #include "event.h" #include "mgr/Registration.h" +#include "protos.h" #include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/fs/Module.cc b/src/fs/Module.cc index 5175e08e6f..4668e6751f 100644 --- a/src/fs/Module.cc +++ b/src/fs/Module.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "Module.h" #if defined(HAVE_FS_UFS) || defined(HAVE_FS_AUFS) || defined(HAVE_FS_DISKD) #include "fs/ufs/StoreFSufs.h" diff --git a/src/fs/aufs/StoreFSaufs.cc b/src/fs/aufs/StoreFSaufs.cc index 2fe6d16e94..3eb75eea03 100644 --- a/src/fs/aufs/StoreFSaufs.cc +++ b/src/fs/aufs/StoreFSaufs.cc @@ -36,15 +36,7 @@ /* TODO: remove this file as unused */ #include "squid.h" - -#if 0 -#include "squid-old.h" -#include "StoreFileSystem.h" -#include "DiskIO/DiskIOModule.h" -#endif - #include "fs/ufs/StoreFSufs.h" - #include "fs/ufs/UFSSwapDir.h" /** diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc index b4bd61e732..a595271000 100644 --- a/src/fs/coss/store_dir_coss.cc +++ b/src/fs/coss/store_dir_coss.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "CossSwapDir.h" #include "Store.h" @@ -899,7 +899,14 @@ CossSwapDir::create() if (::stat(path, &swap_sb) < 0) { debugs (47, 2, "COSS swap space space being allocated."); +#if _SQUID_MSWIN_ + + mkdir(path); +#else + mkdir(path, 0700); +#endif + } /* should check here for directories instead of files, and for file size diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc index 3feb544b6d..1ad50d13f1 100644 --- a/src/fs/coss/store_io_coss.cc +++ b/src/fs/coss/store_io_coss.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "CossSwapDir.h" #include "Store.h" #include "store_coss.h" diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc index d755efe90c..1cabf79526 100644 --- a/src/fs/rock/RockIoState.cc +++ b/src/fs/rock/RockIoState.cc @@ -13,6 +13,7 @@ #include "fs/rock/RockIoState.h" #include "fs/rock/RockIoRequests.h" #include "fs/rock/RockSwapDir.h" +#include "globals.h" Rock::IoState::IoState(SwapDir *dir, StoreEntry *anEntry, diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc index 552abb81f2..7832a9f993 100644 --- a/src/fs/rock/RockRebuild.cc +++ b/src/fs/rock/RockRebuild.cc @@ -8,6 +8,9 @@ #include "fs/rock/RockRebuild.h" #include "fs/rock/RockSwapDir.h" #include "fs/rock/RockDbCell.h" +#include "md5.h" +#include "protos.h" +#include "typedefs.h" #include "SquidTime.h" CBDATA_NAMESPACED_CLASS_INIT(Rock, Rebuild); diff --git a/src/fs/rock/RockStoreFileSystem.h b/src/fs/rock/RockStoreFileSystem.h index 09931909df..bb43a416a7 100644 --- a/src/fs/rock/RockStoreFileSystem.h +++ b/src/fs/rock/RockStoreFileSystem.h @@ -3,6 +3,7 @@ #include "StoreFileSystem.h" +class StoreEntry; namespace Rock { diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 51114f22a1..667ba1724b 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -17,10 +17,15 @@ #include "ipc/mem/Pages.h" #include "MemObject.h" #include "Parsing.h" +#include "protos.h" #include "SquidMath.h" #include #include +#if HAVE_SYS_STAT_H +#include +#endif + const int64_t Rock::SwapDir::HeaderSize = 16*1024; Rock::SwapDir::SwapDir(): ::SwapDir("rock"), filePath(NULL), io(NULL), map(NULL) diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc index 09ce6ef9fc..4bfbef37be 100644 --- a/src/fs/ufs/RebuildState.cc +++ b/src/fs/ufs/RebuildState.cc @@ -32,11 +32,19 @@ */ #include "squid.h" +#include "protos.h" #include "RebuildState.h" #include "SquidTime.h" #include "StoreSwapLogData.h" #include "UFSSwapLogParser.h" +#if HAVE_MATH_H +#include +#endif +#if HAVE_SYS_STAT_H +#include +#endif + CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,RebuildState); Fs::Ufs::RebuildState::RebuildState(RefCount aSwapDir) : diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc index cfe8592e6f..c0e0b77e62 100644 --- a/src/fs/ufs/UFSStoreState.cc +++ b/src/fs/ufs/UFSStoreState.cc @@ -33,14 +33,14 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "Generic.h" #include "DiskIO/DiskFile.h" #include "DiskIO/DiskIOStrategy.h" #include "DiskIO/ReadRequest.h" #include "DiskIO/WriteRequest.h" - +#include "protos.h" #include "SwapDir.h" #include "UFSStrategy.h" #include "UFSStoreState.h" diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index a8ea3fa8df..6e3e46f823 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -29,7 +29,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. */ -#include "squid-old.h" +#include "squid.h" #define CLEAN_BUF_SZ 16384 @@ -48,6 +48,12 @@ #include "StatCounters.h" #include "UFSSwapDir.h" +#if HAVE_MATH_H +#include +#endif +#if HAVE_SYS_STAT_H +#include +#endif int Fs::Ufs::UFSSwapDir::NumberOfUFSDirs = 0; int *Fs::Ufs::UFSSwapDir::UFSDirToGlobalDirMapping = NULL; diff --git a/src/fs/ufs/UFSSwapLogParser.cc b/src/fs/ufs/UFSSwapLogParser.cc index d25ab7913e..c4ef8c5959 100644 --- a/src/fs/ufs/UFSSwapLogParser.cc +++ b/src/fs/ufs/UFSSwapLogParser.cc @@ -28,11 +28,16 @@ */ #include "squid.h" +#include "Debug.h" #include "md5.h" #include "StoreSwapLogData.h" #include "swap_log_op.h" #include "UFSSwapLogParser.h" +#if HAVE_SYS_STAT_H +#include +#endif + /// Parse a swap header entry created on a system with 32-bit size_t and sfileno /// this is typical of 32-bit systems without large file support /// NP: SQUID_MD5_DIGEST_LENGTH is very risky still. diff --git a/src/ftp.cc b/src/ftp.cc index 18c7ee80a2..5e3d09b455 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -32,24 +32,25 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm.h" #include "comm/ConnOpener.h" -#include "CommCalls.h" #include "comm/TcpAcceptor.h" #include "comm/Write.h" +#include "CommCalls.h" #include "compat/strtoll.h" #include "errorpage.h" #include "fde.h" #include "forward.h" #include "html_quote.h" #include "HttpHdrContRange.h" -#include "HttpHeaderRange.h" #include "HttpHeader.h" -#include "HttpRequest.h" +#include "HttpHeaderRange.h" #include "HttpReply.h" +#include "HttpRequest.h" #include "ip/tools.h" #include "MemBuf.h" +#include "protos.h" #include "rfc1738.h" #include "Server.h" #include "SquidString.h" diff --git a/src/globals.h b/src/globals.h index 4463ee9079..edab3da30d 100644 --- a/src/globals.h +++ b/src/globals.h @@ -45,13 +45,6 @@ #include "structs.h" -#ifdef __cplusplus -extern "C" { -#endif - -//MOVED:Debug.h extern FILE *debug_log; /* NULL */ -//MOVED:structs.h extern SquidConfig Config; -//MOVED:structs.h extern SquidConfig2 Config2; extern char *ConfigFile; /* NULL */ extern char *IcpOpcodeStr[]; extern char tmp_error_buf[ERROR_BUF_SZ]; @@ -60,13 +53,11 @@ extern "C" { extern char config_input_line[BUFSIZ]; extern const char *DefaultConfigFile; /* DEFAULT_CONFIG_FILE */ extern const char *cfg_filename; /* NULL */ -//MOVED:version.h:APP_SHORTNAME extern const char *const appname; /* "squid" */ - extern const char *const dash_str; /* "-" */ - extern const char *const null_string; /* "" */ - extern const char *const version_string; /* VERSION */ -//MOVED:versions.h:APP_FULLNAME extern const char *const full_appname_string; /* PACKAGE "/" VERSION */ - extern const char *const appname_string; /* PACKAGE */ - extern char const * visible_appname_string; /* NULL */ + extern const char *dash_str; /* "-" */ + extern const char *null_string; /* "" */ + extern const char *version_string; /* VERSION */ + extern const char *appname_string; /* PACKAGE */ + extern char const *visible_appname_string; /* NULL */ extern const char *fdTypeStr[]; extern const char *hier_strings[]; extern const char *memStatusStr[]; @@ -84,7 +75,6 @@ extern "C" { extern int config_lineno; /* 0 */ extern int do_mallinfo; /* 0 */ extern int opt_reuseaddr; /* 1 */ -//DEAD extern int icmp_sock; /* -1 */ extern int neighbors_do_private_keys; /* 1 */ extern int opt_catch_signals; /* 1 */ extern int opt_foreground_rebuild; /* 0 */ @@ -110,16 +100,14 @@ extern "C" { extern double request_failure_ratio; /* 0.0 */ extern int store_hash_buckets; /* 0 */ extern hash_table *store_table; /* NULL */ -//MOVED:dlink.h extern dlink_list ClientActiveRequests; extern int hot_obj_count; /* 0 */ - extern const int CacheDigestHashFuncCount; /* 4 */ + extern int CacheDigestHashFuncCount; /* 4 */ extern CacheDigest *store_digest; /* NULL */ extern const char *StoreDigestFileName; /* "store_digest" */ extern const char *StoreDigestMimeStr; /* "application/cache-digest" */ extern const char *MultipartMsgBoundaryStr; /* "Unique-Squid-Separator" */ #if USE_HTTP_VIOLATIONS - extern int refresh_nocache_hack; /* 0 */ #endif @@ -132,7 +120,6 @@ extern "C" { extern hash_table *proxy_auth_username_cache; /* NULL */ extern int incoming_sockets_accepted; #if _SQUID_MSWIN_ - extern unsigned int WIN32_Socks_initialized; /* 0 */ #endif #if _SQUID_WINDOWS_ @@ -144,7 +131,6 @@ extern "C" { extern unsigned int WIN32_run_mode; /* _WIN_SQUID_RUN_MODE_INTERACTIVE */ #endif #if HAVE_SBRK - extern void *sbrk_start; /* 0 */ #endif @@ -164,9 +150,4 @@ extern "C" { /// Zero for SMP-unaware code and in no-SMP mode. extern int KidIdentifier; /* 0 */ -#ifdef __cplusplus -} - -#endif - #endif /* SQUID_GLOBALS_H */ diff --git a/src/gopher.cc b/src/gopher.cc index 84ef54dbe4..648268b868 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -33,23 +33,25 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "comm.h" #include "comm/Write.h" #include "errorpage.h" -#include "Store.h" +#include "forward.h" #include "html_quote.h" -#include "HttpRequest.h" #include "HttpReply.h" -#include "comm.h" +#include "HttpRequest.h" +#include "MemBuf.h" +#include "protos.h" +#include "rfc1738.h" +#include "SquidTime.h" +#include "StatCounters.h" +#include "Store.h" + #if USE_DELAY_POOLS #include "DelayPools.h" #include "MemObject.h" #endif -#include "MemBuf.h" -#include "forward.h" -#include "rfc1738.h" -#include "StatCounters.h" -#include "SquidTime.h" /** \defgroup ServerProtocolGopherInternal Server-Side Gopher Internals diff --git a/src/helper.cc b/src/helper.cc index a6f2b92892..0754333106 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -32,14 +32,15 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "base/AsyncCbdataCalls.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Write.h" -#include "helper.h" #include "format/Quoting.h" +#include "helper.h" #include "MemBuf.h" +#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/helper.h b/src/helper.h index 7d70316a07..d1a5fc2716 100644 --- a/src/helper.h +++ b/src/helper.h @@ -33,10 +33,10 @@ #ifndef SQUID_HELPER_H #define SQUID_HELPER_H -#include "squid-old.h" #include "base/AsyncCall.h" #include "cbdata.h" #include "comm/forward.h" +#include "dlink.h" #include "ip/Address.h" #include "HelperChildConfig.h" @@ -132,6 +132,8 @@ public: }; +class MemBuf; + class helper_server : public HelperServerBase { public: diff --git a/src/htcp.cc b/src/htcp.cc index 61538e2e82..74c9639af0 100644 --- a/src/htcp.cc +++ b/src/htcp.cc @@ -33,25 +33,28 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "AccessLogEntry.h" -#include "acl/FilledChecklist.h" #include "acl/Acl.h" +#include "acl/FilledChecklist.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "comm/UdpOpenDialer.h" +#include "compat/xalloc.h" +#include "globals.h" #include "htcp.h" #include "http.h" #include "HttpRequest.h" #include "icmp/net_db.h" #include "ip/tools.h" +#include "md5.h" #include "MemBuf.h" +#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" #include "StoreClient.h" -#include "compat/xalloc.h" typedef struct _Countstr Countstr; diff --git a/src/htcp.h b/src/htcp.h index 500faddee9..368709ff5b 100644 --- a/src/htcp.h +++ b/src/htcp.h @@ -33,9 +33,11 @@ #if USE_HTCP #include "HttpHeader.h" - +#include "HttpRequestMethod.h" #include "ip/forward.h" +class HttpRequest; + /// \ingroup ServerProtocolHTCP class HtcpReplyData { diff --git a/src/http.cc b/src/http.cc index c1e3619d14..412a8a9727 100644 --- a/src/http.cc +++ b/src/http.cc @@ -38,39 +38,40 @@ * have a look into http-anon.c to get more informations. */ -#include "squid-old.h" - +#include "squid.h" #include "acl/FilledChecklist.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif +#include "base64.h" #include "base/AsyncJobCalls.h" #include "base/TextException.h" -#include "base64.h" +#include "client_side.h" #include "comm/Connection.h" #include "comm/Write.h" -#if USE_DELAY_POOLS -#include "DelayPools.h" -#endif #include "err_detail_type.h" #include "errorpage.h" #include "fde.h" -#include "http.h" #include "HttpControlMsg.h" -#include "HttpHdrContRange.h" +#include "http.h" #include "HttpHdrCc.h" +#include "HttpHdrContRange.h" #include "HttpHdrSc.h" #include "HttpHdrScTarget.h" #include "HttpReply.h" #include "HttpRequest.h" #include "MemBuf.h" #include "MemObject.h" +#include "profiler/Profiler.h" #include "protos.h" #include "rfc1738.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif +#if USE_DELAY_POOLS +#include "DelayPools.h" +#endif #define SQUID_ENTER_THROWING_CODE() try { #define SQUID_EXIT_THROWING_CODE(status) \ diff --git a/src/icmp/Icmp.cc b/src/icmp/Icmp.cc index 838319da0a..8be6d58637 100644 --- a/src/icmp/Icmp.cc +++ b/src/icmp/Icmp.cc @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "squid-old.h" +#include "squid.h" #include "Icmp.h" #include "SquidTime.h" #include "Debug.h" diff --git a/src/icmp/Icmp4.cc b/src/icmp/Icmp4.cc index 704b690d12..a39b9d2b94 100644 --- a/src/icmp/Icmp4.cc +++ b/src/icmp/Icmp4.cc @@ -33,10 +33,11 @@ */ //#define SQUID_HELPER 1 -#include "squid-old.h" +#include "squid.h" #if USE_ICMP +#include "leakcheck.h" #include "SquidTime.h" #include "Icmp4.h" #include "IcmpPinger.h" diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc index 3a245a56b1..80324072d8 100644 --- a/src/icmp/Icmp6.cc +++ b/src/icmp/Icmp6.cc @@ -33,10 +33,11 @@ */ //#define SQUID_HELPER 1 -#include "squid-old.h" +#include "squid.h" #if USE_ICMP +#include "leakcheck.h" #include "SquidTime.h" #include "Debug.h" #include "Icmp6.h" diff --git a/src/icmp/IcmpPinger.cc b/src/icmp/IcmpPinger.cc index dc25ed9bc9..79f55e5bed 100644 --- a/src/icmp/IcmpPinger.cc +++ b/src/icmp/IcmpPinger.cc @@ -34,7 +34,7 @@ #define SQUID_HELPER 1 -#include "squid-old.h" +#include "squid.h" #if USE_ICMP diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc index 4ff85a9ff6..b6f37212fa 100644 --- a/src/icmp/IcmpSquid.cc +++ b/src/icmp/IcmpSquid.cc @@ -32,12 +32,13 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm.h" #include "comm/Loops.h" #include "icmp/IcmpSquid.h" #include "icmp/net_db.h" #include "ip/tools.h" +#include "protos.h" #include "SquidTime.h" // Instance global to be available in main() and elsewhere. diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc index 6ca9c9d0e0..80b94799fd 100644 --- a/src/icmp/net_db.cc +++ b/src/icmp/net_db.cc @@ -38,7 +38,7 @@ * (adrian@squid-cache.org) to sort them out. */ -#include "squid-old.h" +#include "squid.h" #include "icmp/net_db.h" #include "log/File.h" #include "cbdata.h" @@ -51,10 +51,15 @@ #include "MemObject.h" #include "fde.h" #include "forward.h" +#include "protos.h" #include "SquidTime.h" #include "wordlist.h" #include "ip/Address.h" +#if HAVE_SYS_STAT_H +#include +#endif + #if USE_ICMP #include "icmp/IcmpSquid.h" #include "ipcache.h" diff --git a/src/icmp/pinger.cc b/src/icmp/pinger.cc index 539115259c..809c78505f 100644 --- a/src/icmp/pinger.cc +++ b/src/icmp/pinger.cc @@ -63,7 +63,8 @@ * ICP_OP_MISS_NOFETCH for sites which it cannot ping. */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "SquidTime.h" #if USE_ICMP diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc index f628abde36..2532f4e72a 100644 --- a/src/icmp/testIcmp.cc +++ b/src/icmp/testIcmp.cc @@ -1,7 +1,7 @@ #define SQUID_UNIT_TEST 1 #define SQUID_HELPER 1 -#include "squid-old.h" +#include "squid.h" #include diff --git a/src/icp_v2.cc b/src/icp_v2.cc index 3b32688bd9..fc11cab16f 100644 --- a/src/icp_v2.cc +++ b/src/icp_v2.cc @@ -35,26 +35,28 @@ \ingroup ServerProtocolICPAPI */ -#include "squid-old.h" -#include "Store.h" +#include "squid.h" +#include "AccessLogEntry.h" +#include "acl/Acl.h" +#include "acl/FilledChecklist.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "comm/UdpOpenDialer.h" -#include "ICP.h" #include "HttpRequest.h" -#include "acl/FilledChecklist.h" -#include "acl/Acl.h" -#include "AccessLogEntry.h" -#include "wordlist.h" -#include "StatCounters.h" -#include "SquidTime.h" -#include "SwapDir.h" #include "icmp/net_db.h" +#include "ICP.h" #include "ip/Address.h" #include "ip/tools.h" #include "ipcache.h" +#include "md5.h" +#include "protos.h" #include "rfc1738.h" +#include "SquidTime.h" +#include "StatCounters.h" +#include "Store.h" +#include "SwapDir.h" +#include "wordlist.h" static void icpIncomingConnectionOpened(const Comm::ConnectionPointer &conn, int errNo); diff --git a/src/icp_v3.cc b/src/icp_v3.cc index a86203dd00..96a83045c5 100644 --- a/src/icp_v3.cc +++ b/src/icp_v3.cc @@ -37,7 +37,7 @@ \ingroup ServerProtocolICPAPI */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "ICP.h" #include "HttpRequest.h" diff --git a/src/ident/AclIdent.cc b/src/ident/AclIdent.cc index 7b4a0d29ff..aac64644ce 100644 --- a/src/ident/AclIdent.cc +++ b/src/ident/AclIdent.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #if USE_IDENT @@ -43,6 +43,7 @@ #include "acl/UserData.h" #include "client_side.h" #include "comm/Connection.h" +#include "globals.h" #include "ident/AclIdent.h" #include "ident/Ident.h" diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc index d9d7b89c51..773e2dacb4 100644 --- a/src/ident/Ident.cc +++ b/src/ident/Ident.cc @@ -34,12 +34,12 @@ #include "squid.h" #if USE_IDENT -#include "squid-old.h" #include "comm.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" #include "CommCalls.h" #include "comm/Write.h" +#include "globals.h" #include "ident/Config.h" #include "ident/Ident.h" #include "MemBuf.h" diff --git a/src/int.cc b/src/int.cc index 6076c01baa..69ba03cd88 100644 --- a/src/int.cc +++ b/src/int.cc @@ -33,7 +33,12 @@ * */ -#include "squid-old.h" +#include "squid.h" + +#if HAVE_MATH_H +#include +#endif + int isPowTen(int count) { diff --git a/src/internal.cc b/src/internal.cc index 090a3e71dd..118df8a8a7 100644 --- a/src/internal.cc +++ b/src/internal.cc @@ -33,17 +33,18 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "CacheManager.h" #include "comm/Connection.h" #include "errorpage.h" +#include "icmp/net_db.h" #include "Store.h" #include "HttpRequest.h" #include "HttpReply.h" #include "MemBuf.h" +#include "protos.h" #include "SquidTime.h" #include "wordlist.h" -#include "icmp/net_db.h" /* called when we "miss" on an internal object; * generate known dynamic objects, diff --git a/src/ip/Qos.cci b/src/ip/Qos.cci index 035f8a864e..7551e66e20 100644 --- a/src/ip/Qos.cci +++ b/src/ip/Qos.cci @@ -1,5 +1,6 @@ /* Inline QOS functions */ #include "comm/Connection.h" +#include "Debug.h" int Ip::Qos::setSockTos(const Comm::ConnectionPointer &conn, tos_t tos) diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc index 1bda01f6a1..49e501981c 100644 --- a/src/ip/QosConfig.cc +++ b/src/ip/QosConfig.cc @@ -1,13 +1,15 @@ -#include "squid-old.h" +#include "squid.h" #include "acl/Gadgets.h" #include "comm/Connection.h" #include "ConfigParser.h" #include "fde.h" +#include "globals.h" #include "hier_code.h" #include "ip/tools.h" #include "ip/QosConfig.h" #include "Parsing.h" +#include "protos.h" /* Qos namespace */ diff --git a/src/ip/stubQosConfig.cc b/src/ip/stubQosConfig.cc index 559c4358be..2bb4dbdf68 100644 --- a/src/ip/stubQosConfig.cc +++ b/src/ip/stubQosConfig.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "ip/QosConfig.h" #include "Store.h" diff --git a/src/ipc.cc b/src/ipc.cc index a44231ebf6..9f0cb0cdab 100644 --- a/src/ipc.cc +++ b/src/ipc.cc @@ -30,10 +30,12 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm/Connection.h" #include "fde.h" +#include "globals.h" #include "ip/Address.h" +#include "protos.h" #include "rfc1738.h" static const char *hello_string = "hi there\n"; diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc index 2eec25b43f..d1a0899145 100644 --- a/src/ipc/Coordinator.cc +++ b/src/ipc/Coordinator.cc @@ -17,6 +17,7 @@ #include "mgr/Inquirer.h" #include "mgr/Request.h" #include "mgr/Response.h" +#include "protos.h" #if SQUID_SNMP #include "snmp/Inquirer.h" #include "snmp/Request.h" diff --git a/src/ipc/ReadWriteLock.cc b/src/ipc/ReadWriteLock.cc index 7fc164fb1a..f319264f88 100644 --- a/src/ipc/ReadWriteLock.cc +++ b/src/ipc/ReadWriteLock.cc @@ -4,7 +4,7 @@ * DEBUG: section 54 Interprocess Communication */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "ipc/ReadWriteLock.h" diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc index 8453f05a31..eaedc02dc0 100644 --- a/src/ipc/SharedListen.cc +++ b/src/ipc/SharedListen.cc @@ -10,12 +10,14 @@ #include "comm.h" #include "base/TextException.h" #include "comm/Connection.h" +#include "globals.h" #include "ipc/Port.h" #include "ipc/Messages.h" #include "ipc/Kids.h" #include "ipc/TypedMsgHdr.h" #include "ipc/StartListening.h" #include "ipc/SharedListen.h" +#include "protos.h" /// holds information necessary to handle JoinListen response class PendingOpenRequest diff --git a/src/ipc/StartListening.cc b/src/ipc/StartListening.cc index c13cc0ac22..aec726397b 100644 --- a/src/ipc/StartListening.cc +++ b/src/ipc/StartListening.cc @@ -11,7 +11,7 @@ #include "comm/Connection.h" #include "ipc/SharedListen.h" #include "ipc/StartListening.h" - +#include "protos.h" Ipc::StartListeningCb::StartListeningCb(): conn(NULL), errNo(0) { diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc index 86bc941565..22185ed0f9 100644 --- a/src/ipc/StoreMap.cc +++ b/src/ipc/StoreMap.cc @@ -4,8 +4,9 @@ * DEBUG: section 54 Interprocess Communication */ -#include "squid-old.h" +#include "squid.h" +#include "protos.h" #include "Store.h" #include "ipc/StoreMap.h" diff --git a/src/ipc/Strand.cc b/src/ipc/Strand.cc index 5576eb14a0..f7eba0150e 100644 --- a/src/ipc/Strand.cc +++ b/src/ipc/Strand.cc @@ -9,6 +9,7 @@ #include "base/Subscription.h" #include "base/TextException.h" #include "comm/Connection.h" +#include "globals.h" #include "ipc/Strand.h" #include "ipc/StrandCoord.h" #include "ipc/Messages.h" diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h index e66a7785fb..cccc6b2bd8 100644 --- a/src/ipc/UdsOp.h +++ b/src/ipc/UdsOp.h @@ -11,6 +11,7 @@ #include "SquidString.h" #include "base/AsyncJob.h" +#include "cbdata.h" #include "comm/forward.h" #include "ipc/TypedMsgHdr.h" #include "ipc/FdNotes.h" diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc index 27051f15e0..ffef2f7224 100644 --- a/src/ipc/mem/Pages.cc +++ b/src/ipc/mem/Pages.cc @@ -10,6 +10,7 @@ #include "base/RunnersRegistry.h" #include "ipc/mem/PagePool.h" #include "ipc/mem/Pages.h" +#include "protos.h" #include "structs.h" #include "SwapDir.h" diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc index 60223f7390..194e3f263f 100644 --- a/src/ipc_win32.cc +++ b/src/ipc_win32.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm.h" #include "fde.h" #include "ip/Address.h" diff --git a/src/ipcache.cc b/src/ipcache.cc index 0fd64c81cc..8a231245f8 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -30,7 +30,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "cbdata.h" #include "CacheManager.h" #include "DnsLookupDetails.h" @@ -39,6 +39,8 @@ #include "ip/tools.h" #include "ipcache.h" #include "mgr/Registration.h" +#include "protos.h" +#include "rfc3596.h" #include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/list.cc b/src/list.cc index 2d9d26eb49..8ec4e96a72 100644 --- a/src/list.cc +++ b/src/list.cc @@ -33,7 +33,9 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "protos.h" +#include "typedefs.h" /* This should go away, in favour of the List template class */ diff --git a/src/log/File.cc b/src/log/File.cc index 0b71f093f6..fe81754776 100644 --- a/src/log/File.cc +++ b/src/log/File.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "fde.h" #include "log/File.h" #include "log/ModDaemon.h" diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc index b3aae86344..ce9b4f7a47 100644 --- a/src/log/FormatHttpdCombined.cc +++ b/src/log/FormatHttpdCombined.cc @@ -36,6 +36,7 @@ #include "AccessLogEntry.h" #include "format/Token.h" #include "format/Quoting.h" +#include "globals.h" #include "HttpRequest.h" #include "log/File.h" #include "log/Formats.h" diff --git a/src/log/FormatHttpdCommon.cc b/src/log/FormatHttpdCommon.cc index 612afc6533..ab9f8b59f5 100644 --- a/src/log/FormatHttpdCommon.cc +++ b/src/log/FormatHttpdCommon.cc @@ -36,6 +36,7 @@ #include "AccessLogEntry.h" #include "format/Quoting.h" #include "format/Token.h" +#include "globals.h" #include "log/File.h" #include "log/Formats.h" #include "SquidTime.h" diff --git a/src/log/FormatSquidIcap.cc b/src/log/FormatSquidIcap.cc index 15b8104e05..1c8c6086f3 100644 --- a/src/log/FormatSquidIcap.cc +++ b/src/log/FormatSquidIcap.cc @@ -41,6 +41,7 @@ #include "HttpRequest.h" #include "log/File.h" #include "log/Formats.h" +#include "protos.h" #include "SquidTime.h" void diff --git a/src/log/FormatSquidNative.cc b/src/log/FormatSquidNative.cc index 4cde4eca2d..dc0b38f483 100644 --- a/src/log/FormatSquidNative.cc +++ b/src/log/FormatSquidNative.cc @@ -36,6 +36,7 @@ #include "AccessLogEntry.h" #include "format/Quoting.h" #include "format/Token.h" +#include "globals.h" #include "log/File.h" #include "log/Formats.h" #include "SquidTime.h" diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc index f7ac5d3ca5..81199861b8 100644 --- a/src/log/ModDaemon.cc +++ b/src/log/ModDaemon.cc @@ -30,13 +30,15 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "cbdata.h" #include "comm/Loops.h" #include "fde.h" +#include "globals.h" #include "log/Config.h" #include "log/File.h" #include "log/ModDaemon.h" +#include "protos.h" #include "SquidTime.h" /* How many buffers to keep before we say we've buffered too much */ diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc index 879ae53f64..80a3c92ea3 100644 --- a/src/log/ModStdio.cc +++ b/src/log/ModStdio.cc @@ -30,10 +30,12 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "fde.h" +#include "globals.h" #include "log/File.h" #include "log/ModStdio.h" +#include "protos.h" typedef struct { int fd; diff --git a/src/log/ModSyslog.cc b/src/log/ModSyslog.cc index 2d5dd3820b..4cf66665ca 100644 --- a/src/log/ModSyslog.cc +++ b/src/log/ModSyslog.cc @@ -30,7 +30,8 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #if HAVE_SYSLOG diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc index 9fd4d49262..cb7a1265d3 100644 --- a/src/log/ModTcp.cc +++ b/src/log/ModTcp.cc @@ -31,12 +31,14 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm.h" #include "comm/Connection.h" #include "log/File.h" #include "log/ModTcp.h" #include "Parsing.h" +#include "protos.h" +#include "structs.h" /* * This logfile TCP module is mostly inspired by a patch by Tim Starling diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index cc6c3ac7c4..7cee39a622 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -30,12 +30,14 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm.h" #include "comm/Connection.h" #include "log/File.h" #include "log/ModUdp.h" #include "Parsing.h" +#include "protos.h" +#include "structs.h" /* * This logfile UDP module is mostly inspired by a patch by Tim Starling diff --git a/src/log/access_log.cc b/src/log/access_log.cc index 355946cb2d..b30d9eefd4 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -33,7 +33,7 @@ */ -#include "squid-old.h" +#include "squid.h" #include "AccessLogEntry.h" // Store.h Required by configuration directives parsing/dumping only @@ -48,6 +48,7 @@ #include "eui/Eui64.h" #endif #include "format/Token.h" +#include "globals.h" #include "hier_code.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/main.cc b/src/main.cc index 7d307591e8..5e69193cb4 100644 --- a/src/main.cc +++ b/src/main.cc @@ -32,77 +32,77 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "AccessLogEntry.h" -#if USE_ADAPTATION -#include "adaptation/Config.h" -#endif -#if USE_ECAP -#include "adaptation/ecap/Config.h" -#endif -#if ICAP_CLIENT -#include "adaptation/icap/Config.h" -#include "adaptation/icap/icap_log.h" -#endif -#if USE_AUTH -#include "auth/Gadgets.h" -#endif +#include "acl/Acl.h" +#include "acl/Asn.h" #include "base/RunnersRegistry.h" #include "base/Subscription.h" #include "base/TextException.h" -#if USE_DELAY_POOLS -#include "ClientDelayConfig.h" -#endif #include "comm.h" #include "ConfigParser.h" #include "CpuAffinity.h" -#if USE_DELAY_POOLS -#include "DelayPools.h" -#endif +#include "DiskIO/DiskIOModule.h" #include "errorpage.h" #include "event.h" #include "EventLoop.h" #include "ExternalACL.h" #include "format/Token.h" +#include "forward.h" #include "fs/Module.h" -#include "PeerSelectState.h" -#include "SquidDns.h" -#include "Store.h" +#include "fs/Module.h" +#include "htcp.h" +#include "HttpReply.h" +#include "icmp/IcmpSquid.h" +#include "icmp/net_db.h" #include "ICP.h" #include "ident/Ident.h" -#include "HttpReply.h" -#include "pconn.h" -#include "Mem.h" -#include "acl/Asn.h" -#include "acl/Acl.h" -#include "htcp.h" -#include "StoreFileSystem.h" -#include "DiskIO/DiskIOModule.h" -#include "ipc/Kids.h" #include "ipc/Coordinator.h" +#include "ipc/Kids.h" #include "ipc/Strand.h" #include "ip/tools.h" +#include "Mem.h" +#include "MemPool.h" +#include "pconn.h" +#include "PeerSelectState.h" +#include "profiler/Profiler.h" +#include "protos.h" +#include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" +#include "StoreFileSystem.h" +#include "Store.h" #include "SwapDir.h" -#include "forward.h" -#include "MemPool.h" -#include "icmp/IcmpSquid.h" -#include "icmp/net_db.h" +#if USE_ADAPTATION +#include "adaptation/Config.h" +#endif +#if USE_ECAP +#include "adaptation/ecap/Config.h" +#endif +#if ICAP_CLIENT +#include "adaptation/icap/Config.h" +#include "adaptation/icap/icap_log.h" +#endif +#if USE_AUTH +#include "auth/Gadgets.h" +#endif +#if USE_DELAY_POOLS +#include "ClientDelayConfig.h" +#endif +#if USE_DELAY_POOLS +#include "DelayPools.h" +#endif #if USE_LOADABLE_MODULES #include "LoadableModules.h" #endif - #if USE_SSL_CRTD #include "ssl/helper.h" #include "ssl/certificate_db.h" #endif - #if USE_SSL #include "ssl/context_storage.h" #endif - #if ICAP_CLIENT #include "adaptation/icap/Config.h" #endif @@ -115,11 +115,13 @@ #if USE_SQUID_ESI #include "esi/Module.h" #endif -#include "fs/Module.h" #if HAVE_PATHS_H #include #endif +#if HAVE_SYS_WAIT_H +#include +#endif #if USE_WIN32_SERVICE #include "squid_windows.h" @@ -655,7 +657,6 @@ serverConnectionsOpen(void) { if (IamPrimaryProcess()) { #if USE_WCCP - wccpConnectionOpen(); #endif diff --git a/src/mem.cc b/src/mem.cc index 9f84a127e4..038f38c7ca 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -32,16 +32,18 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "event.h" -#include "mgr/Registration.h" #include "ClientInfo.h" #include "Mem.h" +#include "md5.h" +#include "MemBuf.h" #include "memMeter.h" +#include "mgr/Registration.h" +#include "protos.h" +#include "SquidTime.h" #include "Store.h" #include "StoreEntryStream.h" -#include "MemBuf.h" -#include "SquidTime.h" #if HAVE_IOMANIP #include diff --git a/src/mem_node.cc b/src/mem_node.cc index afac91e752..ca8287fec1 100644 --- a/src/mem_node.cc +++ b/src/mem_node.cc @@ -33,8 +33,9 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "mem_node.h" +#include "protos.h" static ptrdiff_t makeMemNodeDataOffset(); diff --git a/src/mem_node.h b/src/mem_node.h index c122ef2396..2638e03109 100644 --- a/src/mem_node.h +++ b/src/mem_node.h @@ -34,6 +34,8 @@ #ifndef SQUID_MEM_NODE_H #define SQUID_MEM_NODE_H +#include "defines.h" +#include "MemPool.h" #include "StoreIOBuffer.h" #include "Range.h" diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc index 7ed43318f6..1b93c07413 100644 --- a/src/mgr/BasicActions.cc +++ b/src/mgr/BasicActions.cc @@ -12,9 +12,9 @@ #include "mgr/ActionProfile.h" #include "mgr/BasicActions.h" #include "mgr/Registration.h" +#include "protos.h" #include "Store.h" - Mgr::IndexAction::Pointer Mgr::IndexAction::Create(const Command::Pointer &cmd) { diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc index f9fa61e0ba..a033e6fdb5 100644 --- a/src/mgr/CountersAction.cc +++ b/src/mgr/CountersAction.cc @@ -10,6 +10,7 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/CountersAction.h" +#include "protos.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/mgr/Forwarder.cc b/src/mgr/Forwarder.cc index 9d6f2170a2..19493a37b9 100644 --- a/src/mgr/Forwarder.cc +++ b/src/mgr/Forwarder.cc @@ -11,6 +11,7 @@ #include "CommCalls.h" #include "comm/Connection.h" #include "errorpage.h" +#include "globals.h" #include "HttpReply.h" #include "HttpRequest.h" #include "ipc/Port.h" diff --git a/src/mgr/FunAction.cc b/src/mgr/FunAction.cc index c2823acb10..8757d2e6e4 100644 --- a/src/mgr/FunAction.cc +++ b/src/mgr/FunAction.cc @@ -8,11 +8,13 @@ #include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" +#include "globals.h" #include "ipc/UdsOp.h" #include "mgr/Command.h" #include "mgr/Filler.h" #include "mgr/FunAction.h" #include "mgr/Request.h" +#include "protos.h" #include "Store.h" diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc index bd1028e18f..24eb410af9 100644 --- a/src/mgr/InfoAction.cc +++ b/src/mgr/InfoAction.cc @@ -8,6 +8,7 @@ #include "squid.h" #include "base/TextException.h" #include "comm/Connection.h" +#include "globals.h" #include "HttpReply.h" #include "ipc/Messages.h" #include "ipc/UdsOp.h" @@ -16,6 +17,7 @@ #include "mgr/InfoAction.h" #include "mgr/Request.h" #include "mgr/Response.h" +#include "protos.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc index 294c0045c5..2ad65fa943 100644 --- a/src/mgr/Inquirer.cc +++ b/src/mgr/Inquirer.cc @@ -7,6 +7,7 @@ #include "squid.h" #include "base/TextException.h" +#include "comm.h" #include "comm/Connection.h" #include "comm/Write.h" #include "CommCalls.h" diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc index e6d67b843b..2a780bc29a 100644 --- a/src/mgr/IntervalAction.cc +++ b/src/mgr/IntervalAction.cc @@ -10,6 +10,7 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/IntervalAction.h" +#include "protos.h" #include "SquidMath.h" #include "Store.h" diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc index a6fc39ddb7..676b7f544d 100644 --- a/src/mgr/IoAction.cc +++ b/src/mgr/IoAction.cc @@ -10,6 +10,7 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/IoAction.h" +#include "protos.h" #include "SquidMath.h" #include "Store.h" diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc index fe4f54cbf4..f2f982fb4c 100644 --- a/src/mgr/ServiceTimesAction.cc +++ b/src/mgr/ServiceTimesAction.cc @@ -10,9 +10,9 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/ServiceTimesAction.h" +#include "protos.h" #include "Store.h" - extern void GetServiceTimesStats(Mgr::ServiceTimesActionData& stats); extern void DumpServiceTimesStats(Mgr::ServiceTimesActionData& stats, StoreEntry* sentry); diff --git a/src/mgr/StoreIoAction.cc b/src/mgr/StoreIoAction.cc index 2365974aa1..be1bc6a021 100644 --- a/src/mgr/StoreIoAction.cc +++ b/src/mgr/StoreIoAction.cc @@ -10,6 +10,7 @@ #include "ipc/Messages.h" #include "ipc/TypedMsgHdr.h" #include "mgr/StoreIoAction.h" +#include "protos.h" #include "Store.h" diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc index 5764ec7e53..a5e390c1fd 100644 --- a/src/mgr/StoreToCommWriter.cc +++ b/src/mgr/StoreToCommWriter.cc @@ -12,6 +12,7 @@ #include "comm/Write.h" #include "ipc/FdNotes.h" #include "mgr/StoreToCommWriter.h" +#include "protos.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/mime.cc b/src/mime.cc index 1dfe35c1fd..8e06998d35 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -33,15 +33,21 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "fde.h" +#include "globals.h" #include "HttpHdrCc.h" -#include "Store.h" -#include "StoreClient.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "MemObject.h" -#include "fde.h" #include "MemBuf.h" +#include "MemObject.h" +#include "protos.h" +#include "Store.h" +#include "StoreClient.h" + +#if HAVE_SYS_STAT_H +#include +#endif #define GET_HDR_SZ 1024 diff --git a/src/mime_header.cc b/src/mime_header.cc index d7437f20a2..d24e20469e 100644 --- a/src/mime_header.cc +++ b/src/mime_header.cc @@ -33,16 +33,11 @@ * */ -#include "squid-old.h" +#include "squid.h" #define GET_HDR_SZ 1024 - -/* returns a pointer to a field-value of the first matching field-name */ -char * -mime_get_header(const char *mime, const char *name) -{ - return mime_get_header_field(mime, name, NULL); -} +#include "Debug.h" +#include "profiler/Profiler.h" /* * returns a pointer to a field-value of the first matching field-name where @@ -117,6 +112,14 @@ mime_get_header_field(const char *mime, const char *name, const char *prefix) return NULL; } +/* returns a pointer to a field-value of the first matching field-name */ +char * +mime_get_header(const char *mime, const char *name) +{ + return mime_get_header_field(mime, name, NULL); +} + + size_t headersEnd(const char *mime, size_t l) { diff --git a/src/multicast.cc b/src/multicast.cc index d3ac44d65b..842823d013 100644 --- a/src/multicast.cc +++ b/src/multicast.cc @@ -33,8 +33,9 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm/Connection.h" +#include "Debug.h" // XXX: for icpIncomingConn - need to pass it as a generic parameter. #include "ICP.h" #include "ipcache.h" diff --git a/src/neighbors.cc b/src/neighbors.cc index 8c5b9589ca..10a07e60be 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -30,27 +30,28 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "anyp/PortCfg.h" #include "comm/Connection.h" #include "comm/ConnOpener.h" #include "event.h" +#include "globals.h" #include "htcp.h" #include "HttpRequest.h" +#include "icmp/net_db.h" #include "ICP.h" +#include "ip/Address.h" #include "ip/tools.h" #include "ipcache.h" #include "MemObject.h" +#include "mgr/Registration.h" #include "PeerDigest.h" #include "PeerSelectState.h" +#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" #include "Store.h" -#include "icmp/net_db.h" -#include "ip/Address.h" -#include "ip/tools.h" -#include "mgr/Registration.h" /* count mcast group peers every 15 minutes */ #define MCAST_COUNT_RATE 900 diff --git a/src/pconn.cc b/src/pconn.cc index 9593201a43..a987c4b31d 100644 --- a/src/pconn.cc +++ b/src/pconn.cc @@ -32,13 +32,15 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "comm.h" #include "comm/Connection.h" +#include "fde.h" +#include "globals.h" #include "mgr/Registration.h" -#include "Store.h" #include "pconn.h" -#include "comm.h" -#include "fde.h" +#include "protos.h" +#include "Store.h" #define PCONN_FDS_SZ 8 /* pconn set size, increase for better memcache hit rate */ diff --git a/src/peer_digest.cc b/src/peer_digest.cc index daf62db9a9..3452281b11 100644 --- a/src/peer_digest.cc +++ b/src/peer_digest.cc @@ -33,17 +33,17 @@ * */ -#include "squid-old.h" +#include "squid.h" #if USE_CACHE_DIGESTS - #include "event.h" #include "forward.h" -#include "Store.h" -#include "HttpRequest.h" #include "HttpReply.h" +#include "HttpRequest.h" #include "MemObject.h" #include "PeerDigest.h" +#include "protos.h" #include "SquidTime.h" +#include "Store.h" #include "StoreClient.h" /* local types */ diff --git a/src/peer_select.cc b/src/peer_select.cc index 9747af8f2c..de8e41cc2b 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -32,21 +32,23 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "acl/FilledChecklist.h" +#include "client_side.h" #include "DnsLookupDetails.h" #include "errorpage.h" #include "event.h" -#include "PeerSelectState.h" -#include "Store.h" +#include "forward.h" #include "hier_code.h" -#include "ICP.h" -#include "HttpRequest.h" -#include "acl/FilledChecklist.h" #include "htcp.h" -#include "forward.h" -#include "SquidTime.h" +#include "HttpRequest.h" #include "icmp/net_db.h" +#include "ICP.h" #include "ipcache.h" +#include "PeerSelectState.h" +#include "protos.h" +#include "SquidTime.h" +#include "Store.h" static struct { int timeouts; diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc index 0f9da6ae8d..57ad36ab07 100644 --- a/src/peer_sourcehash.cc +++ b/src/peer_sourcehash.cc @@ -34,10 +34,15 @@ * */ -#include "squid-old.h" -#include "Store.h" +#include "squid.h" #include "HttpRequest.h" #include "mgr/Registration.h" +#include "protos.h" +#include "Store.h" + +#if HAVE_MATH_H +#include +#endif #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc index 62c9ffa98a..342119209c 100644 --- a/src/peer_userhash.cc +++ b/src/peer_userhash.cc @@ -34,14 +34,20 @@ * */ -#include "squid-old.h" +#include "squid.h" #if USE_AUTH +#include "auth/UserRequest.h" +#include "globals.h" +#include "HttpRequest.h" #include "mgr/Registration.h" +#include "protos.h" #include "Store.h" -#include "HttpRequest.h" -#include "auth/UserRequest.h" + +#if HAVE_MATH_H +#include +#endif #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) diff --git a/src/protos.h b/src/protos.h index 520863954b..ad0d82460f 100644 --- a/src/protos.h +++ b/src/protos.h @@ -51,21 +51,21 @@ class ClientInfo; #if USE_FORW_VIA_DB -SQUIDCEXTERN void fvdbCountVia(const char *key); -SQUIDCEXTERN void fvdbCountForw(const char *key); +extern void fvdbCountVia(const char *key); +extern void fvdbCountForw(const char *key); #endif #if HEADERS_LOG SQUIDCEXTERN void headersLog(int cs, int pq, const HttpRequestMethod& m, void *data); #endif -SQUIDCEXTERN int logTypeIsATcpHit(log_type); +extern int logTypeIsATcpHit(log_type); /* * cache_cf.c */ SQUIDCEXTERN void configFreeMemory(void); class MemBuf; -SQUIDCEXTERN void wordlistCat(const wordlist *, MemBuf * mb); -SQUIDCEXTERN void self_destruct(void); +extern void wordlistCat(const wordlist *, MemBuf * mb); +extern void self_destruct(void); SQUIDCEXTERN void add_http_port(char *portspec); extern int xatoi(const char *token); extern long xatol(const char *token); @@ -125,13 +125,13 @@ SQUIDCEXTERN void file_write_mbuf(int fd, off_t, MemBuf mb, DWCB * handler, void SQUIDCEXTERN void file_read(int, char *, int, off_t, DRCB *, void *); SQUIDCEXTERN void disk_init(void); -SQUIDCEXTERN void fd_close(int fd); -SQUIDCEXTERN void fd_open(int fd, unsigned int type, const char *); -SQUIDCEXTERN void fd_note(int fd, const char *); -SQUIDCEXTERN void fd_bytes(int fd, int len, unsigned int type); -SQUIDCEXTERN void fdDumpOpen(void); -SQUIDCEXTERN int fdUsageHigh(void); -SQUIDCEXTERN void fdAdjustReserved(void); +extern void fd_close(int fd); +extern void fd_open(int fd, unsigned int type, const char *); +extern void fd_note(int fd, const char *); +extern void fd_bytes(int fd, int len, unsigned int type); +extern void fdDumpOpen(void); +extern int fdUsageHigh(void); +extern void fdAdjustReserved(void); SQUIDCEXTERN void fqdncache_nbgethostbyaddr(const Ip::Address &, FQDNH *, void *); @@ -144,7 +144,7 @@ SQUIDCEXTERN const char *fqdnFromAddr(const Ip::Address &); SQUIDCEXTERN int fqdncacheQueueDrain(void); SQUIDCEXTERN void fqdncacheFreeMemory(void); SQUIDCEXTERN void fqdncache_restart(void); -void fqdncache_purgelru(void *); +extern void fqdncache_purgelru(void *); SQUIDCEXTERN void fqdncacheAddEntryFromHosts(char *addr, wordlist * hostnames); class FwdState; @@ -195,10 +195,9 @@ SQUIDCEXTERN mb_size_t httpBuildRequestPrefix(HttpRequest * request, StoreEntry * entry, MemBuf * mb, http_state_flags); -SQUIDCEXTERN const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply); +extern const char *httpMakeVaryMark(HttpRequest * request, HttpReply const * reply); #include "HttpStatusCode.h" -SQUIDCEXTERN const char *httpStatusString(http_status status); class StatHist; @@ -206,7 +205,7 @@ class StatHist; SQUIDCEXTERN void httpHdrCcInitModule(void); SQUIDCEXTERN void httpHdrCcCleanModule(void); SQUIDCEXTERN void httpHdrCcUpdateStats(const HttpHdrCc * cc, StatHist * hist); -void httpHdrCcStatDumper(StoreEntry * sentry, int idx, double val, double size, int count); +extern void httpHdrCcStatDumper(StoreEntry * sentry, int idx, double val, double size, int count); /* Http Header Tools */ class HttpHeaderFieldInfo; @@ -222,9 +221,7 @@ SQUIDCEXTERN int strListIsSubstr(const String * list, const char *s, char del); SQUIDCEXTERN int strListGetItem(const String * str, char del, const char **item, int *ilen, const char **pos); SQUIDCEXTERN const char *getStringPrefix(const char *str, const char *end); SQUIDCEXTERN int httpHeaderParseInt(const char *start, int *val); -SQUIDCEXTERN int httpHeaderParseOffset(const char *start, int64_t * off); -SQUIDCEXTERN void -httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3; +SQUIDCEXTERN void httpHeaderPutStrf(HttpHeader * hdr, http_hdr_type id, const char *fmt,...) PRINTF_FORMAT_ARG3; /* Http Header */ @@ -260,9 +257,9 @@ extern variable_list *snmp_meshCtblFn(variable_list *, snint *); #endif /* SQUID_SNMP */ #if USE_WCCP -SQUIDCEXTERN void wccpInit(void); -SQUIDCEXTERN void wccpConnectionOpen(void); -SQUIDCEXTERN void wccpConnectionClose(void); +extern void wccpInit(void); +extern void wccpConnectionOpen(void); +extern void wccpConnectionClose(void); #endif /* USE_WCCP */ #if USE_WCCPv2 @@ -271,23 +268,23 @@ extern void wccp2ConnectionOpen(void); extern void wccp2ConnectionClose(void); #endif /* USE_WCCPv2 */ -SQUIDCEXTERN char *mime_get_header(const char *mime, const char *header); -SQUIDCEXTERN char *mime_get_header_field(const char *mime, const char *name, const char *prefix); -SQUIDCEXTERN size_t headersEnd(const char *, size_t); +extern char *mime_get_header(const char *mime, const char *header); +extern char *mime_get_header_field(const char *mime, const char *name, const char *prefix); +extern size_t headersEnd(const char *, size_t); -SQUIDCEXTERN void mimeInit(char *filename); -SQUIDCEXTERN void mimeFreeMemory(void); -SQUIDCEXTERN char *mimeGetContentEncoding(const char *fn); -SQUIDCEXTERN char *mimeGetContentType(const char *fn); -SQUIDCEXTERN char const *mimeGetIcon(const char *fn); -SQUIDCEXTERN const char *mimeGetIconURL(const char *fn); -SQUIDCEXTERN char mimeGetTransferMode(const char *fn); -SQUIDCEXTERN int mimeGetDownloadOption(const char *fn); -SQUIDCEXTERN int mimeGetViewOption(const char *fn); +extern void mimeInit(char *filename); +extern void mimeFreeMemory(void); +extern char *mimeGetContentEncoding(const char *fn); +extern char *mimeGetContentType(const char *fn); +extern char const *mimeGetIcon(const char *fn); +extern const char *mimeGetIconURL(const char *fn); +extern char mimeGetTransferMode(const char *fn); +extern int mimeGetDownloadOption(const char *fn); +extern int mimeGetViewOption(const char *fn); #include "ipcache.h" -SQUIDCEXTERN int mcastSetTtl(int, int); -SQUIDCEXTERN IPH mcastJoinGroups; +extern int mcastSetTtl(int, int); +extern IPH mcastJoinGroups; SQUIDCEXTERN peer *getFirstPeer(void); SQUIDCEXTERN peer *getFirstUpParent(HttpRequest *); @@ -405,15 +402,15 @@ SQUIDCEXTERN void memConfigure(void); /* ----------------------------------------------------------------- */ /* repl_modules.c */ -SQUIDCEXTERN void storeReplSetup(void); +extern void storeReplSetup(void); /* * store_log.c */ -SQUIDCEXTERN void storeLog(int tag, const StoreEntry * e); -SQUIDCEXTERN void storeLogRotate(void); -SQUIDCEXTERN void storeLogClose(void); -SQUIDCEXTERN void storeLogOpen(void); +extern void storeLog(int tag, const StoreEntry * e); +extern void storeLogRotate(void); +extern void storeLogClose(void); +extern void storeLogOpen(void); /* @@ -437,10 +434,10 @@ SQUIDCEXTERN HASHCMP storeKeyHashCmp; /* * store_digest.c */ -SQUIDCEXTERN void storeDigestInit(void); -SQUIDCEXTERN void storeDigestNoteStoreReady(void); -SQUIDCEXTERN void storeDigestScheduleRebuild(void); -SQUIDCEXTERN void storeDigestDel(const StoreEntry * entry); +extern void storeDigestInit(void); +extern void storeDigestNoteStoreReady(void); +extern void storeDigestScheduleRebuild(void); +extern void storeDigestDel(const StoreEntry * entry); extern void storeDigestReport(StoreEntry *); /* @@ -452,18 +449,18 @@ SQUIDCEXTERN void storeRebuildComplete(struct _store_rebuild_data *); SQUIDCEXTERN void storeRebuildProgress(int sd_index, int total, int sofar); /// loads entry from disk; fills supplied memory buffer on success -bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, struct _store_rebuild_data &counts); +extern bool storeRebuildLoadEntry(int fd, int diskIndex, MemBuf &buf, struct _store_rebuild_data &counts); /// parses entry buffer and validates entry metadata; fills e on success -bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, struct _store_rebuild_data &counts, uint64_t expectedSize); +extern bool storeRebuildParseEntry(MemBuf &buf, StoreEntry &e, cache_key *key, struct _store_rebuild_data &counts, uint64_t expectedSize); /// checks whether the loaded entry should be kept; updates counters -bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts); +extern bool storeRebuildKeepEntry(const StoreEntry &e, const cache_key *key, struct _store_rebuild_data &counts); /* * store_swapin.c */ class store_client; -SQUIDCEXTERN void storeSwapInStart(store_client *); +extern void storeSwapInStart(store_client *); /* * store_client.c @@ -481,10 +478,10 @@ SQUIDCEXTERN const char *uniqueHostname(void); SQUIDCEXTERN void safeunlink(const char *path, int quiet); #include "fatal.h" -void death(int sig); -void sigusr2_handle(int sig); -void sig_child(int sig); -void sig_shutdown(int sig); ///< handles shutdown notifications from kids +extern void death(int sig); +extern void sigusr2_handle(int sig); +extern void sig_child(int sig); +extern void sig_shutdown(int sig); ///< handles shutdown notifications from kids SQUIDCEXTERN void leave_suid(void); SQUIDCEXTERN void enter_suid(void); SQUIDCEXTERN void no_suid(void); @@ -508,7 +505,7 @@ SQUIDCEXTERN bool IamCoordinatorProcess(); /// whether the current process handles HTTP transactions and such SQUIDCEXTERN bool IamWorkerProcess(); /// whether the current process is dedicated to managing a cache_dir -bool IamDiskProcess(); +extern bool IamDiskProcess(); /// Whether we are running in daemon mode SQUIDCEXTERN bool InDaemonMode(); // try using specific Iam*() checks above first /// Whether there should be more than one worker process running @@ -516,7 +513,7 @@ SQUIDCEXTERN bool UsingSmp(); // try using specific Iam*() checks above first /// number of Kid processes as defined in src/ipc/Kid.h SQUIDCEXTERN int NumberOfKids(); /// a string describing this process roles such as worker or coordinator -String ProcessRoles(); +extern String ProcessRoles(); SQUIDCEXTERN int DebugSignal; /* AYJ debugs function to show locations being reset with memset() */ @@ -577,7 +574,7 @@ SQUIDCEXTERN int stringHasCntl(const char *); SQUIDCEXTERN void linklistPush(link_list **, void *); SQUIDCEXTERN void *linklistShift(link_list **); SQUIDCEXTERN int xrename(const char *from, const char *to); -SQUIDCEXTERN int isPowTen(int); +extern int isPowTen(int); SQUIDCEXTERN void parseEtcHosts(void); SQUIDCEXTERN int getMyPort(void); SQUIDCEXTERN void setUmask(mode_t mask); diff --git a/src/redirect.cc b/src/redirect.cc index ceed8468c4..5751ad4c83 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -33,21 +33,23 @@ * */ -#include "squid-old.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif -#include "comm/Connection.h" -#include "mgr/Registration.h" -#include "Store.h" -#include "fde.h" -#include "client_side_request.h" +#include "squid.h" #include "acl/Checklist.h" -#include "HttpRequest.h" #include "client_side.h" #include "client_side_reply.h" +#include "client_side_request.h" +#include "comm/Connection.h" +#include "fde.h" +#include "globals.h" +#include "HttpRequest.h" #include "helper.h" +#include "mgr/Registration.h" +#include "protos.h" #include "rfc1738.h" +#include "Store.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif #if USE_SSL #include "ssl/support.h" #endif diff --git a/src/refresh.cc b/src/refresh.cc index 97114741f6..09d2362710 100644 --- a/src/refresh.cc +++ b/src/refresh.cc @@ -37,14 +37,15 @@ #define USE_POSIX_REGEX /* put before includes; always use POSIX */ #endif -#include "squid-old.h" -#include "HttpHdrCc.h" +#include "squid.h" #include "mgr/Registration.h" -#include "Store.h" -#include "MemObject.h" +#include "HttpHdrCc.h" #include "HttpRequest.h" #include "HttpReply.h" +#include "MemObject.h" +#include "protos.h" #include "SquidTime.h" +#include "Store.h" typedef enum { rcHTTP, diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc index 68ee1b938c..a0e607cc1b 100644 --- a/src/repl/heap/store_heap_replacement.cc +++ b/src/repl/heap/store_heap_replacement.cc @@ -41,13 +41,17 @@ * http://www.hpl.hp.com/techreports/1999/HPL-1999-69.html */ -#include "squid-old.h" +#include "squid.h" #include "heap.h" #include "store_heap_replacement.h" #include "Store.h" #include "MemObject.h" #include "SquidTime.h" +#if HAVE_MATH_H +#include +#endif + /* * Key generation function to implement the LFU-DA policy (Least * Frequently Used with Dynamic Aging). Similar to classical LFU diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc index 2ff00bcbd1..575ae1514c 100644 --- a/src/repl/heap/store_repl_heap.cc +++ b/src/repl/heap/store_repl_heap.cc @@ -41,8 +41,9 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "heap.h" +#include "protos.h" #include "store_heap_replacement.h" #include "Store.h" #include "MemObject.h" diff --git a/src/repl/lru/store_repl_lru.cc b/src/repl/lru/store_repl_lru.cc index fc70225324..dd0cb70885 100644 --- a/src/repl/lru/store_repl_lru.cc +++ b/src/repl/lru/store_repl_lru.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "MemObject.h" #include "SquidTime.h" diff --git a/src/send-announce.cc b/src/send-announce.cc index 41a9e2bb38..b5ee95a87f 100644 --- a/src/send-announce.cc +++ b/src/send-announce.cc @@ -33,12 +33,14 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "comm/Connection.h" #include "event.h" #include "fde.h" +#include "globals.h" #include "ICP.h" #include "ipcache.h" +#include "protos.h" #include "SquidTime.h" static IPH send_announce; diff --git a/src/snmp/Forwarder.cc b/src/snmp/Forwarder.cc index 8f63020b50..4bf1f9185a 100644 --- a/src/snmp/Forwarder.cc +++ b/src/snmp/Forwarder.cc @@ -9,6 +9,7 @@ #include "base/TextException.h" #include "CommCalls.h" #include "comm.h" +#include "globals.h" #include "ipc/Port.h" #include "snmp_core.h" #include "snmp/Forwarder.h" diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc index 2461851571..d0ab68419e 100644 --- a/src/snmp_agent.cc +++ b/src/snmp_agent.cc @@ -32,14 +32,16 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "cache_snmp.h" -#include "Store.h" +#include "globals.h" #include "mem_node.h" +#include "protos.h" #include "StatCounters.h" #include "StatHist.h" #include "SquidMath.h" #include "SquidTime.h" +#include "Store.h" /************************************************************************ diff --git a/src/snmp_core.cc b/src/snmp_core.cc index 6316a2c491..b96d624f83 100644 --- a/src/snmp_core.cc +++ b/src/snmp_core.cc @@ -29,7 +29,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#include "squid-old.h" +#include "squid.h" #include "acl/FilledChecklist.h" #include "base/CbcPointer.h" #include "comm.h" @@ -38,6 +38,7 @@ #include "comm/UdpOpenDialer.h" #include "ip/Address.h" #include "ip/tools.h" +#include "protos.h" #include "snmp_core.h" #include "snmp/Forwarder.h" diff --git a/src/squid-old.h b/src/squid-old.h deleted file mode 100644 index 9c54dc2466..0000000000 --- a/src/squid-old.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * AUTHOR: Duane Wessels - * - * 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_H -#define SQUID_H - -#include "squid.h" - -#if HAVE_UNISTD_H -#include -#endif -#if HAVE_STDIO_H -#include -#endif -#if HAVE_CTYPE_H -#include -#endif -#if HAVE_ERRNO_H -#include -#endif -#if HAVE_GRP_H -#include -#endif -#if HAVE_GNUMALLOC_H -#include -#elif HAVE_MALLOC_H -#include -#endif -#if HAVE_MEMORY_H -#include -#endif -#if HAVE_NETDB_H -#include -#endif -#if HAVE_PATHS_H -#include -#endif -#if HAVE_PWD_H -#include -#endif -#if HAVE_SIGNAL_H -#include -#endif -#if HAVE_TIME_H -#include -#endif -#if HAVE_SYS_PARAM_H -#include -#endif -#if HAVE_SYS_TIME_H -#include -#endif -#if HAVE_SYS_RESOURCE_H -#include /* needs sys/time.h above it */ -#endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#if HAVE_NETINET_IN_H -#include -#endif -#if HAVE_ARPA_INET_H -#include -#endif -#if HAVE_SYS_STAT_H -#include -#endif -#if HAVE_SYS_UN_H -#include -#endif -#if HAVE_SYS_WAIT_H -#include -#endif -#if HAVE_LIBC_H -#include -#endif -#if HAVE_SYS_SYSCALL_H -#include -#endif -#if HAVE_STRING_H -#include -#endif -#if HAVE_STRINGS_H -#include -#endif -#if HAVE_BSTRING_H -#include -#endif -#if HAVE_GETOPT_H -#include -#endif -#if HAVE_LIMITS_H -#include -#endif -#if _SQUID_WINDOWS_ -#include -#endif -#if HAVE_SYS_MOUNT_H -#include -#endif -#if HAVE_MATH_H -#include -#endif - -#ifndef MAXPATHLEN -#define MAXPATHLEN SQUID_MAXPATHLEN -#endif - -#include "md5.h" -#if SQUID_SNMP -#include "cache_snmp.h" -#endif -#include "hash.h" -#include "rfc3596.h" -#include "defines.h" -#include "enums.h" -#include "typedefs.h" -#include "util.h" -#include "profiler/Profiler.h" -#include "MemPool.h" -#include "ip/Address.h" -#include "structs.h" -#include "protos.h" -#include "globals.h" - -/* - * I'm sick of having to keep doing this .. - */ -#define INDEXSD(i) (Config.cacheSwap.swapDirs[(i)].getRaw()) - -#define FD_READ_METHOD(fd, buf, len) (*fd_table[fd].read_method)(fd, buf, len) -#define FD_WRITE_METHOD(fd, buf, len) (*fd_table[fd].write_method)(fd, buf, len) - -#ifndef IPPROTO_UDP -#define IPPROTO_UDP 0 -#endif - -#ifndef IPPROTO_TCP -#define IPPROTO_TCP 0 -#endif - -#endif /* SQUID_H */ diff --git a/src/ssl/ErrorDetail.cc b/src/ssl/ErrorDetail.cc index 31eb8edf33..bc83b57710 100644 --- a/src/ssl/ErrorDetail.cc +++ b/src/ssl/ErrorDetail.cc @@ -1,9 +1,12 @@ -#include "squid-old.h" +#include "squid.h" #include "errorpage.h" #include "ssl/ErrorDetail.h" #if HAVE_MAP #include #endif +#if HAVE_CLIMITS +#include +#endif struct SslErrorEntry { Ssl::ssl_error_t value; diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc index 8d24bcc2d2..da299df308 100644 --- a/src/ssl/ErrorDetailManager.cc +++ b/src/ssl/ErrorDetailManager.cc @@ -1,7 +1,8 @@ -#include "squid-old.h" +#include "squid.h" #include "ErrorDetail.h" #include "errorpage.h" #include "ErrorDetailManager.h" +#include "protos.h" void Ssl::errorDetailInitialize() { diff --git a/src/ssl/ServerBump.cc b/src/ssl/ServerBump.cc index 5d30b1971a..13de802110 100644 --- a/src/ssl/ServerBump.cc +++ b/src/ssl/ServerBump.cc @@ -9,6 +9,7 @@ #include "client_side.h" #include "forward.h" +#include "protos.h" #include "ssl/ServerBump.h" #include "Store.h" diff --git a/src/ssl/ServerBump.h b/src/ssl/ServerBump.h index acaf91b0b1..f214e726aa 100644 --- a/src/ssl/ServerBump.h +++ b/src/ssl/ServerBump.h @@ -8,6 +8,7 @@ #include "ip/Address.h" class ConnStateData; +class store_client; namespace Ssl { diff --git a/src/ssl/support.cc b/src/ssl/support.cc index c3e970745d..b1cc20dc39 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -33,15 +33,17 @@ * */ -#include "squid-old.h" +#include "squid.h" /* MS Visual Studio Projects are monolithic, so we need the following * #if to exclude the SSL code from compile process when not needed. */ #if USE_SSL -#include "fde.h" #include "acl/FilledChecklist.h" +#include "fde.h" +#include "globals.h" +#include "protos.h" #include "ssl/ErrorDetail.h" #include "ssl/support.h" #include "ssl/gadgets.h" diff --git a/src/stat.cc b/src/stat.cc index 3699308c4c..b6f63e3062 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -32,36 +32,38 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "client_side_request.h" +#include "client_side.h" +#include "comm/Connection.h" #include "comm/Loops.h" #include "event.h" +#include "fde.h" #include "format/Token.h" -#include "StoreClient.h" -#if USE_AUTH -#include "auth/UserRequest.h" -#endif -#include "comm/Connection.h" -#include "mgr/Registration.h" -#include "Store.h" +#include "globals.h" #include "HttpRequest.h" #include "MemObject.h" -#include "fde.h" #include "mem_node.h" -#if USE_DELAY_POOLS -#include "DelayId.h" -#endif -#include "client_side_request.h" -#include "client_side.h" #include "MemBuf.h" -#include "SquidMath.h" -#include "SquidTime.h" -#include "StatCounters.h" #include "mgr/CountersAction.h" #include "mgr/FunAction.h" #include "mgr/InfoAction.h" #include "mgr/IntervalAction.h" #include "mgr/IoAction.h" +#include "mgr/Registration.h" #include "mgr/ServiceTimesAction.h" +#include "protos.h" +#include "SquidMath.h" +#include "SquidTime.h" +#include "StatCounters.h" +#include "StoreClient.h" +#include "Store.h" +#if USE_AUTH +#include "auth/UserRequest.h" +#endif +#if USE_DELAY_POOLS +#include "DelayId.h" +#endif #if USE_SSL #include "ssl/support.h" #endif diff --git a/src/stmem.cc b/src/stmem.cc index 49c0db62c2..d277df270c 100644 --- a/src/stmem.cc +++ b/src/stmem.cc @@ -34,11 +34,12 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" -#include "stmem.h" +#include "squid.h" +#include "Generic.h" #include "mem_node.h" #include "MemObject.h" -#include "Generic.h" +#include "profiler/Profiler.h" +#include "stmem.h" /* * NodeGet() is called to get the data buffer to pass to storeIOWrite(). diff --git a/src/store.cc b/src/store.cc index 2654beac98..fdbead6f35 100644 --- a/src/store.cc +++ b/src/store.cc @@ -33,31 +33,37 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "CacheManager.h" #include "comm/Connection.h" #include "ETag.h" #include "event.h" #include "fde.h" -#include "Store.h" -#include "mgr/Registration.h" -#include "StoreClient.h" -#include "stmem.h" +#include "http.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "MemObject.h" #include "mem_node.h" +#include "MemObject.h" +#include "mgr/Registration.h" +#include "mgr/StoreIoAction.h" +#include "profiler/Profiler.h" +#include "protos.h" +#include "SquidTime.h" +#include "Stack.h" #include "StatCounters.h" +#include "stmem.h" +#include "StoreClient.h" +#include "Store.h" +#include "StoreIOState.h" #include "StoreMeta.h" #include "SwapDir.h" -#include "StoreIOState.h" +#include "swap_log_op.h" #if USE_DELAY_POOLS #include "DelayPools.h" #endif -#include "Stack.h" -#include "SquidTime.h" -#include "swap_log_op.h" -#include "mgr/StoreIoAction.h" +#if HAVE_LIMITS_H +#include +#endif static STMCB storeWriteComplete; diff --git a/src/store_client.cc b/src/store_client.cc index b2d0c7b627..f5bc7dfadb 100644 --- a/src/store_client.cc +++ b/src/store_client.cc @@ -34,20 +34,22 @@ * Portions copyright (c) 2003 Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "event.h" -#include "StoreClient.h" -#include "Store.h" #include "HttpReply.h" +#include "HttpRequest.h" +#include "MemBuf.h" #include "MemObject.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "StatCounters.h" +#include "StoreClient.h" +#include "Store.h" #include "StoreMeta.h" #include "StoreMetaUnpacker.h" #if USE_DELAY_POOLS #include "DelayPools.h" #endif -#include "HttpRequest.h" -#include "MemBuf.h" /* * NOTE: 'Header' refers to the swapfile metadata header. diff --git a/src/store_digest.cc b/src/store_digest.cc index 3e68bf0622..141e928adc 100644 --- a/src/store_digest.cc +++ b/src/store_digest.cc @@ -40,19 +40,26 @@ * storeDigestRebuild/write schedule to be activated */ -#include "squid-old.h" +#include "squid.h" +#include "Debug.h" #include "event.h" +#include "globals.h" #include "mgr/Registration.h" +#include "protos.h" #if USE_CACHE_DIGESTS -#include "Store.h" -#include "HttpRequest.h" #include "HttpReply.h" +#include "HttpRequest.h" #include "MemObject.h" #include "PeerDigest.h" #include "SquidTime.h" +#include "Store.h" #include "StoreSearch.h" +#if HAVE_MATH_H +#include +#endif + /* * local types */ diff --git a/src/store_dir.cc b/src/store_dir.cc index e4560d2ba3..1faf5dd67e 100644 --- a/src/store_dir.cc +++ b/src/store_dir.cc @@ -33,13 +33,16 @@ * */ -#include "squid-old.h" -#include "Store.h" +#include "squid.h" +#include "globals.h" +#include "mem_node.h" #include "MemObject.h" #include "MemStore.h" -#include "mem_node.h" +#include "profiler/Profiler.h" +#include "protos.h" #include "SquidMath.h" #include "SquidTime.h" +#include "Store.h" #include "SwapDir.h" #include "swap_log_op.h" @@ -59,6 +62,9 @@ #if HAVE_SYS_VFS_H #include #endif +#if HAVE_SYS_WAIT_H +#include +#endif #include "StoreHashIndex.h" diff --git a/src/store_io.cc b/src/store_io.cc index ebdbe6eefa..797a5b3415 100644 --- a/src/store_io.cc +++ b/src/store_io.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "Store.h" #include "MemObject.h" #include "SwapDir.h" diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc index 49dd475d8b..8ebb91fad8 100644 --- a/src/store_key_md5.cc +++ b/src/store_key_md5.cc @@ -33,8 +33,10 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "HttpRequest.h" +#include "md5.h" +#include "protos.h" static cache_key null_key[SQUID_MD5_DIGEST_LENGTH]; diff --git a/src/store_log.cc b/src/store_log.cc index 0c7b534306..91688b7f4c 100644 --- a/src/store_log.cc +++ b/src/store_log.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "format/Token.h" #include "HttpReply.h" #include "log/File.h" diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index 460290f09d..e6cf618a81 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -33,8 +33,11 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "event.h" +#include "globals.h" +#include "md5.h" +#include "protos.h" #include "StatCounters.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/store_swapin.cc b/src/store_swapin.cc index 8ad355217d..26f62b65a4 100644 --- a/src/store_swapin.cc +++ b/src/store_swapin.cc @@ -33,7 +33,8 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "globals.h" #include "StatCounters.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/store_swapmeta.cc b/src/store_swapmeta.cc index c3698e6ca8..98a9d0efdd 100644 --- a/src/store_swapmeta.cc +++ b/src/store_swapmeta.cc @@ -33,12 +33,17 @@ * */ -#include "squid-old.h" -#include "Store.h" +#include "squid.h" +#include "md5.h" #include "MemObject.h" +#include "Store.h" #include "StoreMeta.h" #include "StoreMetaUnpacker.h" +#if HAVE_SYS_WAIT_H +#include +#endif + void storeSwapTLVFree(tlv * n) { diff --git a/src/store_swapout.cc b/src/store_swapout.cc index 718c35ffe0..25a4c4c5e0 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -33,13 +33,14 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "cbdata.h" #include "StoreClient.h" #include "Store.h" /* FIXME: Abstract the use of this more */ #include "mem_node.h" #include "MemObject.h" +#include "protos.h" #include "SwapDir.h" #include "StatCounters.h" #include "swap_log_op.h" diff --git a/src/structs.h b/src/structs.h index cec592bb3f..672fcee0e3 100644 --- a/src/structs.h +++ b/src/structs.h @@ -31,8 +31,11 @@ #include "RefCount.h" #include "cbdata.h" +#include "defines.h" #include "dlink.h" #include "err_type.h" +#include "hash.h" +#include "ip/Address.h" /* needed for the global config */ #include "HttpHeader.h" @@ -63,6 +66,7 @@ class ACLChecklist; #if SQUID_SNMP +#include "snmp_session.h" struct _snmp_request_t { u_char *buf; u_char *outbuf; diff --git a/src/test_cache_digest.cc b/src/test_cache_digest.cc index a02e53bee2..a9d95faeac 100644 --- a/src/test_cache_digest.cc +++ b/src/test_cache_digest.cc @@ -36,7 +36,7 @@ * Test-suite for playing with cache digests */ -#include "squid-old.h" +#include "squid.h" typedef struct { int query_count; diff --git a/src/tests/TestSwapDir.cc b/src/tests/TestSwapDir.cc index 19cc0e8786..b43dbd354f 100644 --- a/src/tests/TestSwapDir.cc +++ b/src/tests/TestSwapDir.cc @@ -1,6 +1,4 @@ #include "squid.h" - -#include "squid-old.h" #include "TestSwapDir.h" uint64_t diff --git a/src/tests/TestSwapDir.h b/src/tests/TestSwapDir.h index 5785249c2e..f0f57574fa 100644 --- a/src/tests/TestSwapDir.h +++ b/src/tests/TestSwapDir.h @@ -1,7 +1,6 @@ #ifndef TEST_TESTSWAPDIR #define TEST_TESTSWAPDIR -#include "squid-old.h" #include "SwapDir.h" class TestSwapDir : public SwapDir diff --git a/src/tests/stub_DelayId.cc b/src/tests/stub_DelayId.cc index 3fb5ac0922..4f55df121a 100644 --- a/src/tests/stub_DelayId.cc +++ b/src/tests/stub_DelayId.cc @@ -35,7 +35,6 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "squid-old.h" #include "DelayId.h" #define STUB_API "stub_DelayId.cc" diff --git a/src/tests/stub_access_log.cc b/src/tests/stub_access_log.cc index 836a87a0d8..2c8afff80f 100644 --- a/src/tests/stub_access_log.cc +++ b/src/tests/stub_access_log.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #include "HierarchyLogEntry.h" #define STUB_API "access.log.cc" diff --git a/src/tests/stub_acl.cc b/src/tests/stub_acl.cc index 81421d2a0b..7b82af51e5 100644 --- a/src/tests/stub_acl.cc +++ b/src/tests/stub_acl.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" /* * DO NOT MODIFY: diff --git a/src/tests/stub_cache_cf.cc b/src/tests/stub_cache_cf.cc index e5e9b0c679..6e7ffbdab7 100644 --- a/src/tests/stub_cache_cf.cc +++ b/src/tests/stub_cache_cf.cc @@ -32,8 +32,9 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "ConfigParser.h" +#include "protos.h" #include "wordlist.h" #define STUB_API "cache_cf.cc" diff --git a/src/tests/stub_cache_manager.cc b/src/tests/stub_cache_manager.cc index 819182a4c2..b364a080b9 100644 --- a/src/tests/stub_cache_manager.cc +++ b/src/tests/stub_cache_manager.cc @@ -1,5 +1,6 @@ -#include "squid-old.h" +#include "squid.h" #include "CacheManager.h" +#include "Debug.h" #include "mgr/Registration.h" #define STUB_API "cache_manager.cc" diff --git a/src/tests/stub_errorpage.cc b/src/tests/stub_errorpage.cc index 90eb844d2d..f3ca968062 100644 --- a/src/tests/stub_errorpage.cc +++ b/src/tests/stub_errorpage.cc @@ -1,5 +1,6 @@ #include "squid.h" #include "errorpage.h" +#include "protos.h" #define STUB_API "errorpage.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_fd.cc b/src/tests/stub_fd.cc index a5eab4b03f..5fb6b27c59 100644 --- a/src/tests/stub_fd.cc +++ b/src/tests/stub_fd.cc @@ -1,5 +1,6 @@ #include "squid.h" #include "fde.h" +#include "protos.h" #define STUB_API "fd.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_http.cc b/src/tests/stub_http.cc index e6d2302a57..95497c2188 100644 --- a/src/tests/stub_http.cc +++ b/src/tests/stub_http.cc @@ -1,4 +1,7 @@ -#include "squid-old.h" +#include "squid.h" + +#include "HttpRequest.h" +#include "HttpReply.h" #define STUB_API "http.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_stat.cc b/src/tests/stub_stat.cc index b40e3f51bf..8e62c37d4b 100644 --- a/src/tests/stub_stat.cc +++ b/src/tests/stub_stat.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" /* * DO NOT MODIFY: diff --git a/src/tests/stub_store.cc b/src/tests/stub_store.cc index d58703fad5..0be956e7ab 100644 --- a/src/tests/stub_store.cc +++ b/src/tests/stub_store.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #define STUB_API "store.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc index 16e87d28c0..65a9913862 100644 --- a/src/tests/stub_store_client.cc +++ b/src/tests/stub_store_client.cc @@ -1,6 +1,7 @@ -#include "squid-old.h" +#include "squid.h" #include "StoreClient.h" #include "Store.h" +#include "protos.h" #define STUB_API "store_client.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_store_rebuild.cc b/src/tests/stub_store_rebuild.cc index 744ea932bc..9328898474 100644 --- a/src/tests/stub_store_rebuild.cc +++ b/src/tests/stub_store_rebuild.cc @@ -32,7 +32,9 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "MemBuf.h" +#include "protos.h" #define STUB_API "stub_store_rebuild.cc" #include "tests/STUB.h" diff --git a/src/tests/stub_store_stats.cc b/src/tests/stub_store_stats.cc index ce975ba572..9a43f8441d 100644 --- a/src/tests/stub_store_stats.cc +++ b/src/tests/stub_store_stats.cc @@ -1,4 +1,4 @@ -#include "squid-old.h" +#include "squid.h" #define STUB_API "StoreStats.cc" #include "tests/STUB.h" diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc index 24b9693960..b7be6ec6c2 100644 --- a/src/tests/testACLMaxUserIP.cc +++ b/src/tests/testACLMaxUserIP.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #if USE_AUTH diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc index a4de101b3c..f0fb6dd417 100644 --- a/src/tests/testAuth.cc +++ b/src/tests/testAuth.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #if USE_AUTH diff --git a/src/tests/testBoilerplate.cc b/src/tests/testBoilerplate.cc index c45effb0ac..8d7d2d39cd 100644 --- a/src/tests/testBoilerplate.cc +++ b/src/tests/testBoilerplate.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testBoilerplate.h" #if HAVE_STDEXCEPT diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc index 355057fb36..702a88fb69 100644 --- a/src/tests/testCacheManager.cc +++ b/src/tests/testCacheManager.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include #include "mgr/Action.h" diff --git a/src/tests/testCoss.cc b/src/tests/testCoss.cc index ef68737619..5e5fc4aa28 100644 --- a/src/tests/testCoss.cc +++ b/src/tests/testCoss.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testCoss.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc index ca3f1ff2b0..b06b5a1aa8 100644 --- a/src/tests/testDiskIO.cc +++ b/src/tests/testDiskIO.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testDiskIO.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/testEvent.cc b/src/tests/testEvent.cc index 6d525cb041..ad0fdb9fb6 100644 --- a/src/tests/testEvent.cc +++ b/src/tests/testEvent.cc @@ -3,11 +3,12 @@ #include -#include "testEvent.h" -#include "event.h" #include "base/AsyncCallQueue.h" #include "CapturingStoreEntry.h" +#include "event.h" #include "Mem.h" +#include "protos.h" +#include "testEvent.h" CPPUNIT_TEST_SUITE_REGISTRATION( testEvent ); diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc index d5f3bb2e96..bd4fb74ef1 100644 --- a/src/tests/testEventLoop.cc +++ b/src/tests/testEventLoop.cc @@ -6,12 +6,7 @@ #include "testEventLoop.h" #include "EventLoop.h" #include "Mem.h" - -#if 0 -#include "AsyncEngine.h" -#include "base/AsyncCallQueue.h" -#include "event.h" -#endif +#include "protos.h" CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop ); diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc index 0946c39706..8e00b728e6 100644 --- a/src/tests/testHttpParser.cc +++ b/src/tests/testHttpParser.cc @@ -7,6 +7,7 @@ #include "HttpParser.h" #include "Mem.h" #include "MemBuf.h" +#include "structs.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpParser ); diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc index f7c0a2152c..b87ee3c32a 100644 --- a/src/tests/testHttpReply.cc +++ b/src/tests/testHttpReply.cc @@ -5,6 +5,7 @@ #include "testHttpReply.h" #include "HttpReply.h" #include "Mem.h" +#include "protos.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply ); diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc index 04a01c4942..8197634aad 100644 --- a/src/tests/testHttpRequest.cc +++ b/src/tests/testHttpRequest.cc @@ -6,6 +6,7 @@ #include "testHttpRequest.h" #include "HttpRequest.h" #include "Mem.h" +#include "protos.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest ); diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc index c9c1d285e7..57c4e819c8 100644 --- a/src/tests/testHttpRequestMethod.cc +++ b/src/tests/testHttpRequestMethod.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include #include "Mem.h" diff --git a/src/tests/testNull.cc b/src/tests/testNull.cc index a8d511fbf8..5f4ce2ab8f 100644 --- a/src/tests/testNull.cc +++ b/src/tests/testNull.cc @@ -1,5 +1,5 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testNull.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc index c64f9167ec..79d2482e2a 100644 --- a/src/tests/testRock.cc +++ b/src/tests/testRock.cc @@ -2,18 +2,23 @@ #include "squid.h" #include "DiskIO/DiskIOModule.h" +#include "fs/rock/RockSwapDir.h" +#include "globals.h" #include "HttpHeader.h" #include "HttpReply.h" #include "Mem.h" #include "MemObject.h" +#include "protos.h" #include "Store.h" #include "StoreFileSystem.h" #include "StoreSearch.h" #include "SwapDir.h" -#include "fs/rock/RockSwapDir.h" #include "testRock.h" #include "testStoreSupport.h" +#if HAVE_SYS_STAT_H +#include +#endif #if HAVE_STDEXCEPT #include #endif diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc index 3d4b440753..0c4989d25a 100644 --- a/src/tests/testStore.cc +++ b/src/tests/testStore.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testStore.h" #include "Store.h" diff --git a/src/tests/testStore.h b/src/tests/testStore.h index 90ae69d54d..c0a2ee602c 100644 --- a/src/tests/testStore.h +++ b/src/tests/testStore.h @@ -2,7 +2,6 @@ #ifndef SQUID_SRC_TEST_STORE_H #define SQUID_SRC_TEST_STORE_H -#include "squid-old.h" #include "Store.h" #include diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc index 688ab6bce7..d1e7bd411e 100644 --- a/src/tests/testStoreController.cc +++ b/src/tests/testStoreController.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testStoreController.h" #include "Store.h" diff --git a/src/tests/testStoreEntryStream.cc b/src/tests/testStoreEntryStream.cc index a1a75e0dc5..4b0abdc4b2 100644 --- a/src/tests/testStoreEntryStream.cc +++ b/src/tests/testStoreEntryStream.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "Mem.h" #include "testStore.h" #include "testStoreEntryStream.h" diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc index b6e0b28ebf..3a2169ff4f 100644 --- a/src/tests/testStoreHashIndex.cc +++ b/src/tests/testStoreHashIndex.cc @@ -1,6 +1,6 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include "testStoreHashIndex.h" #include "Store.h" diff --git a/src/tests/testURLScheme.cc b/src/tests/testURLScheme.cc index 5b8678b66a..ee49d08571 100644 --- a/src/tests/testURLScheme.cc +++ b/src/tests/testURLScheme.cc @@ -1,10 +1,11 @@ #define SQUID_UNIT_TEST 1 -#include "squid-old.h" +#include "squid.h" #include #include "Mem.h" +#include "SquidString.h" #include "testURLScheme.h" #include "URLScheme.h" diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc index c85f1beee5..7ee0e74902 100644 --- a/src/tests/testUfs.cc +++ b/src/tests/testUfs.cc @@ -2,15 +2,17 @@ #include "squid.h" #include "DiskIO/DiskIOModule.h" +#include "fs/ufs/UFSSwapDir.h" +#include "globals.h" #include "HttpHeader.h" #include "HttpReply.h" #include "Mem.h" #include "MemObject.h" -#include "testStoreSupport.h" -#include "testUfs.h" +#include "protos.h" #include "Store.h" #include "SwapDir.h" -#include "fs/ufs/UFSSwapDir.h" +#include "testStoreSupport.h" +#include "testUfs.h" #if HAVE_STDEXCEPT #include diff --git a/src/tools.cc b/src/tools.cc index eaf5fc16c8..b5f43e3165 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -32,7 +32,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "base/Subscription.h" #include "fde.h" #include "htcp.h" @@ -46,12 +46,22 @@ #include "ipc/Kids.h" #include "ipc/Coordinator.h" #include "ipcache.h" +#include "protos.h" #include "SwapDir.h" #include "wordlist.h" #if HAVE_SYS_PRCTL_H #include #endif +#if HAVE_SYS_STAT_H +#include +#endif +#if HAVE_SYS_WAIT_H +#include +#endif +#if HAVE_GRP_H +#include +#endif #define DEAD_MSG "\ The Squid Cache (version %s) died.\n\ diff --git a/src/tunnel.cc b/src/tunnel.cc index 5f88d3ddcc..82207571e3 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "errorpage.h" #include "HttpRequest.h" #include "fde.h" @@ -44,15 +44,21 @@ #include "comm/Write.h" #include "client_side_request.h" #include "acl/FilledChecklist.h" -#if USE_DELAY_POOLS -#include "DelayId.h" -#endif #include "client_side.h" #include "MemBuf.h" #include "http.h" #include "PeerSelectState.h" +#include "protos.h" #include "StatCounters.h" +#if USE_DELAY_POOLS +#include "DelayId.h" +#endif + +#if HAVE_LIMITS_H +#include +#endif + class TunnelStateData { diff --git a/src/typedefs.h b/src/typedefs.h index 84e4387faa..619fbd7f33 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -31,7 +31,8 @@ * */ -#include "squid-old.h" +#include "enums.h" +#include "rfc1035.h" #ifndef SQUID_TYPEDEFS_H #define SQUID_TYPEDEFS_H @@ -98,6 +99,8 @@ typedef struct _sslproxy_cert_adapt sslproxy_cert_adapt; #endif #if SQUID_SNMP +#include "snmp_vars.h" +#include "cache_snmp.h" typedef variable_list *(oid_ParseFn) (variable_list *, snint *); typedef struct _snmp_request_t snmp_request_t; diff --git a/src/unlinkd.cc b/src/unlinkd.cc index 62e7ad80a1..5d08e7de8c 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -33,12 +33,14 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "fde.h" +#include "globals.h" +#include "xusleep.h" +#include "protos.h" #include "SquidTime.h" #include "StatCounters.h" #include "SwapDir.h" -#include "fde.h" -#include "xusleep.h" /* This code gets linked to Squid */ diff --git a/src/url.cc b/src/url.cc index eb1f239a26..06be990ab6 100644 --- a/src/url.cc +++ b/src/url.cc @@ -34,10 +34,12 @@ */ #include "squid.h" -#include "URL.h" +#include "globals.h" #include "HttpRequest.h" -#include "URLScheme.h" +#include "protos.h" #include "rfc1738.h" +#include "URL.h" +#include "URLScheme.h" static HttpRequest *urlParseFinish(const HttpRequestMethod& method, const AnyP::ProtocolType protocol, diff --git a/src/urn.cc b/src/urn.cc index a726acf91e..e72cd09932 100644 --- a/src/urn.cc +++ b/src/urn.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "errorpage.h" #include "StoreClient.h" #include "Store.h" @@ -41,8 +41,10 @@ #include "HttpRequest.h" #include "MemBuf.h" #include "forward.h" +#include "globals.h" #include "SquidTime.h" #include "icmp/net_db.h" +#include "protos.h" #define URN_REQBUF_SZ 4096 diff --git a/src/wccp.cc b/src/wccp.cc index aba668700a..826af323d2 100644 --- a/src/wccp.cc +++ b/src/wccp.cc @@ -35,12 +35,12 @@ #include "squid.h" #if USE_WCCP - -#include "squid-old.h" #include "comm.h" #include "comm/Connection.h" #include "comm/Loops.h" #include "event.h" +#include "structs.h" + #define WCCP_PORT 2048 #define WCCP_REVISION 0 diff --git a/src/wccp2.cc b/src/wccp2.cc index b957668bc9..45d0653b67 100644 --- a/src/wccp2.cc +++ b/src/wccp2.cc @@ -30,7 +30,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #if USE_WCCPv2 @@ -40,7 +40,9 @@ #include "compat/strsep.h" #include "event.h" #include "ip/Address.h" +#include "md5.h" #include "Parsing.h" +#include "protos.h" #include "Store.h" #include "SwapDir.h" diff --git a/src/whois.cc b/src/whois.cc index 0a73b9f5af..080cda5dec 100644 --- a/src/whois.cc +++ b/src/whois.cc @@ -33,16 +33,17 @@ * */ -#include "squid-old.h" +#include "squid.h" +#include "comm.h" #include "comm/Write.h" #include "errorpage.h" -#include "Store.h" #include "HttpReply.h" #include "HttpRequest.h" -#include "comm.h" #include "HttpRequest.h" #include "forward.h" +#include "protos.h" #include "StatCounters.h" +#include "Store.h" #define WHOIS_PORT 43 diff --git a/src/win32.cc b/src/win32.cc index 69136407fe..1b18c8ed94 100644 --- a/src/win32.cc +++ b/src/win32.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "squid_windows.h" #if _SQUID_MSWIN_ diff --git a/src/wordlist.h b/src/wordlist.h index 165ab5b379..cec9258a4d 100644 --- a/src/wordlist.h +++ b/src/wordlist.h @@ -32,8 +32,9 @@ #ifndef SQUID_WORDLIST_H #define SQUID_WORDLIST_H -#include "squid-old.h" +#include "globals.h" #include "MemPool.h" +#include "profiler/Profiler.h" class wordlist { diff --git a/test-suite/ESIExpressions.cc b/test-suite/ESIExpressions.cc index 5649bad761..bf3c82fddd 100644 --- a/test-suite/ESIExpressions.cc +++ b/test-suite/ESIExpressions.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "esi/Expression.h" int diff --git a/test-suite/MemPoolTest.cc b/test-suite/MemPoolTest.cc index e2730eb2f4..1ce1e934f5 100644 --- a/test-suite/MemPoolTest.cc +++ b/test-suite/MemPoolTest.cc @@ -32,7 +32,7 @@ * Copyright (c) 2003, Robert Collins */ -#include "squid-old.h" +#include "squid.h" #if USE_MEMPOOLS diff --git a/test-suite/StackTest.cc b/test-suite/StackTest.cc index 4606f95d56..c996f3ac57 100644 --- a/test-suite/StackTest.cc +++ b/test-suite/StackTest.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "Stack.h" int diff --git a/test-suite/VirtualDeleteOperator.cc b/test-suite/VirtualDeleteOperator.cc index 68567d14c2..51db1e6c0f 100644 --- a/test-suite/VirtualDeleteOperator.cc +++ b/test-suite/VirtualDeleteOperator.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid-old.h" +#include "squid.h" #if HAVE_IOSTREAM #include diff --git a/test-suite/debug.cc b/test-suite/debug.cc index 8c8394dfd4..16a861b304 100644 --- a/test-suite/debug.cc +++ b/test-suite/debug.cc @@ -34,9 +34,10 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid-old.h" -#include "stmem.h" +#include "squid.h" +#include "Debug.h" #include "mem_node.h" +#include "stmem.h" class StreamTest { diff --git a/test-suite/mem_hdr_test.cc b/test-suite/mem_hdr_test.cc index fb4443fa8a..76896265d7 100644 --- a/test-suite/mem_hdr_test.cc +++ b/test-suite/mem_hdr_test.cc @@ -34,7 +34,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "stmem.h" #include "mem_node.h" #include "Generic.h" diff --git a/test-suite/mem_node_test.cc b/test-suite/mem_node_test.cc index d362be2fcb..f1d3a5b31b 100644 --- a/test-suite/mem_node_test.cc +++ b/test-suite/mem_node_test.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "mem_node.h" #if HAVE_IOSTREAM diff --git a/test-suite/refcount.cc b/test-suite/refcount.cc index fdb17a4119..93ee96fc00 100644 --- a/test-suite/refcount.cc +++ b/test-suite/refcount.cc @@ -33,7 +33,7 @@ * */ -#include "squid-old.h" +#include "squid.h" #include "RefCount.h" class _ToRefCount :public RefCountable diff --git a/test-suite/syntheticoperators.cc b/test-suite/syntheticoperators.cc index 6c9dfdb9df..dbdebd4e6d 100644 --- a/test-suite/syntheticoperators.cc +++ b/test-suite/syntheticoperators.cc @@ -33,7 +33,7 @@ * Copyright (c) 2003 Robert Collins */ -#include "squid-old.h" +#include "squid.h" #include "stmem.h" #include "mem_node.h" diff --git a/test-suite/test_tools.cc b/test-suite/test_tools.cc index 86f415f46e..29762617f5 100644 --- a/test-suite/test_tools.cc +++ b/test-suite/test_tools.cc @@ -5,7 +5,8 @@ // XXX: This file is made of large pieces of src/tools.cc // with only a few minor modifications. TODO: redesign or delete. -#include "squid-old.h" +#include "squid.h" +#include "dlink.h" void xassert(const char *msg, const char *file, int line) diff --git a/tools/purge/conffile.hh b/tools/purge/conffile.hh index 8d5d5af9a2..867b1d050f 100644 --- a/tools/purge/conffile.hh +++ b/tools/purge/conffile.hh @@ -59,8 +59,8 @@ typedef int bool; #define DEFAULT_SQUID_CONF "/usr/local/squid/etc/squid.conf" #endif -#include // FILE* -#include // minimum STL container +#include +#include struct CacheDir { enum CacheDirType { CDT_NONE, CDT_UFS, CDT_AUFS, CDT_DISKD, CDT_OTHER }; diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc index f0eecc49b2..adafc1681c 100644 --- a/tools/purge/purge.cc +++ b/tools/purge/purge.cc @@ -98,16 +98,12 @@ #endif #include "squid.h" -// for xstrdup #include "util.h" -//#include #include #include #include -//#include #include -//#include #include #include #include @@ -122,10 +118,9 @@ #endif #include -#include // TCP_NODELAY +#include #include -#include // gethostbyname() -//#include //comes via compat.h +#include #include "convert.hh" #include "socket.hh" diff --git a/tools/purge/socket.hh b/tools/purge/socket.hh index e6ef40c0b9..8b702d33fd 100644 --- a/tools/purge/socket.hh +++ b/tools/purge/socket.hh @@ -61,7 +61,7 @@ typedef int bool; #endif /* __cplusplus */ #include -#include // SOMAXCONN +#include #include #if SOMAXCONN <= 5 -- 2.39.2