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
#include<cstdio>
#endif
+#ifndef MAXPATHLEN
+#define MAXPATHLEN SQUID_MAXPATHLEN
+#endif
+
#endif /* _SQUID_COMPAT_STDIO_H */
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
;;
#include "squid.h"
#include "AccessLogEntry.h"
+#include "HttpReply.h"
#include "HttpRequest.h"
#include "ssl/support.h"
-#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
#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
-#include "squid-old.h"
+#include "squid.h"
#include "base/AsyncJobCalls.h"
#include "base/TextException.h"
#include "BodyPipe.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "md5.h"
+#include "protos.h"
#include "StatCounters.h"
#include "Store.h"
\ingroup CacheManagerAPI
*/
+class HttpRequest;
/**
\ingroup CacheManagerAPI
* a CacheManager - the menu system for interacting with squid.
-#include "squid-old.h"
+#include "squid.h"
#include "base/TextException.h"
+#include "Debug.h"
#include "Parsing.h"
#include "ChunkedCodingParser.h"
#include "MemBuf.h"
#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
{
#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
{
-#include "squid-old.h"
-#include "fde.h"
+#include "squid.h"
#include "comm/Connection.h"
#include "CommCalls.h"
+#include "fde.h"
+#include "globals.h"
/* CommCommonCbParams */
#ifndef COMMREAD_H
#define COMMREAD_H
-#include "squid-old.h"
#include "comm.h"
#include "CommCalls.h"
#include "comm/forward.h"
#define COMMONPOOL_H
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "SquidString.h"
#include "CompositePoolNode.h"
#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.
#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;
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "ConfigOption.h"
ConfigOptionVector::~ConfigOptionVector()
#include "squid.h"
#include "ConfigParser.h"
+#include "Debug.h"
#include "globals.h"
+#include "protos.h"
void
ConfigParser::destruct()
#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.
#include "CpuAffinity.h"
#include "CpuAffinityMap.h"
#include "CpuAffinitySet.h"
+#include "Debug.h"
+#include "protos.h"
#include "structs.h"
#include <algorithm>
#include "squid.h"
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "DelayBucket.h"
#include "DelaySpec.h"
#include "Store.h"
#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()
* #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)
{}
#define DELAYIDCOMPOSITE_H
#if USE_DELAY_POOLS
-#include "squid-old.h"
+#include "fatal.h"
#include "RefCount.h"
class DeferredRead;
#define DELAYPOOL_H
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "CompositePoolNode.h"
class StoreEntry;
#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)
{}
#include "squid.h"
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "comm/Connection.h"
#include "DelayTagged.h"
#include "NullDelayId.h"
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "auth/Gadgets.h"
#include "CompositePoolNode.h"
#include "DelayIdComposite.h"
#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"
#if USE_DELAY_POOLS && USE_AUTH
-#include "squid-old.h"
#include "auth/Gadgets.h"
#include "auth/User.h"
#include "CompositePoolNode.h"
#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)
* 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
#ifndef SQUID_DESCRIPTOR_SET_H
#define SQUID_DESCRIPTOR_SET_H
-#include "squid-old.h"
/** \ingroup Comm
* 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 *
#include "DiskIO/DiskFile.h"
#include "async_io.h"
#include "cbdata.h"
+#include "SquidString.h"
class AIODiskIOStrategy;
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "AIODiskIOModule.h"
#include "AIODiskIOStrategy.h"
#include "Store.h"
* per storedir it should work just fine.
*/
-#include "squid-old.h"
+#include "squid.h"
#include "AIODiskIOStrategy.h"
#include "AIODiskFile.h"
#include "DiskIO/IORequestor.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "comm.h"
#include "aio_win32.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "BlockingDiskIOModule.h"
#include "BlockingIOStrategy.h"
*/
#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);
#include "squid.h"
#include "BlockingIOStrategy.h"
#include "BlockingFile.h"
+#include "protos.h"
bool
BlockingIOStrategy::shedLoad()
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "DiskDaemonDiskIOModule.h"
#include "DiskdIOStrategy.h"
#include "DiskIO/DiskDaemon/DiskdAction.h"
#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()
* CopyRight (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include <sys/ipc.h>
#include <sys/msg.h>
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "comm/Loops.h"
-
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/shm.h>
-#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 <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/shm.h>
+
diskd_stats_t diskd_stats;
size_t DiskdIOStrategy::nextInstanceID (0);
#ifndef SQUID_DISKFILE_H
#define SQUID_DISKFILE_H
-#include "squid-old.h"
+#include "typedefs.h"
#include "RefCount.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "DiskIOModule.h"
Vector<DiskIOModule*> *DiskIOModule::_Modules = NULL;
#ifndef SQUID_DISKIOMODULE_H
#define SQUID_DISKIOMODULE_H
-#include "squid-old.h"
#include "Array.h"
/* forward decls */
#ifndef SQUID_DISKIOSTRATEGY_H
#define SQUID_DISKIOSTRATEGY_H
-#include "squid-old.h"
-
+#include "squid.h"
+#include "Store.h"
#include "RefCount.h"
class DiskFile;
*/
#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()
#define SQUID_SRC_DISKIO_DISKTHREADS_COMMIO_H
#include "fde.h"
+#include "globals.h"
class CommIO
{
*/
-#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 =========================================================== */
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "DiskThreadsDiskIOModule.h"
#include "DiskThreadsIOStrategy.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "DiskThreadsDiskFile.h"
#include "DiskThreadsIOStrategy.h"
#error "_REENTRANT MUST be defined to build squid async io support."
#endif
-#include "squid-old.h"
+#include "squid.h"
#include "DiskThreads.h"
#include <stdio.h>
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "squid_windows.h"
#include "DiskIO/DiskThreads/CommIO.h"
#include "DiskThreads.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "DiskThreads.h"
#include "Store.h"
#include "fde.h"
#ifndef SQUID_IOREQUESTOR_H
#define SQUID_IOREQUESTOR_H
-#include "squid-old.h"
-
#include "RefCount.h"
class ReadRequest;
-#include "squid-old.h"
+#include "squid.h"
#include "IpcIoDiskIOModule.h"
#include "IpcIoIOStrategy.h"
#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"
#include "ipc/mem/Pages.h"
#include "StatCounters.h"
#include "SquidTime.h"
+#include "protos.h"
CBDATA_CLASS_INIT(IpcIoFile);
#include "cbdata.h"
#include "DiskIO/DiskFile.h"
#include "DiskIO/IORequestor.h"
+#include "SquidString.h"
#include "ipc/forward.h"
#include "ipc/mem/Page.h"
#include <list>
#include "squid.h"
#include "IpcIoFile.h"
#include "IpcIoIOStrategy.h"
+#include "protos.h"
bool
IpcIoIOStrategy::shedLoad()
-#include "squid-old.h"
+#include "squid.h"
#include "MmappedDiskIOModule.h"
#include "MmappedIOStrategy.h"
*/
#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 <sys/mman.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
CBDATA_CLASS_INIT(MmappedFile);
#include "squid.h"
#include "MmappedFile.h"
#include "MmappedIOStrategy.h"
+#include "protos.h"
bool
MmappedIOStrategy::shedLoad()
#ifndef SQUID_READREQUEST_H
#define SQUID_READREQUEST_H
-#include "squid-old.h"
-
#include "cbdata.h"
#include "RefCount.h"
#ifndef SQUID_WRITEREQUEST_H
#define SQUID_WRITEREQUEST_H
-#include "squid-old.h"
-
#include "cbdata.h"
#include "RefCount.h"
*/
#include "squid.h"
+#include "Debug.h"
#include "EventLoop.h"
#include "base/AsyncCallQueue.h"
#ifndef SQUID_EVENTLOOP_H
#define SQUID_EVENTLOOP_H
-#include "squid-old.h"
#include "Array.h"
#include "AsyncEngine.h"
#include "SquidTime.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "ExternalACLEntry.h"
#include "SquidTime.h"
* $Id$
*/
-#include "squid-old.h"
+#include "squid.h"
#include "base/TextException.h"
#include "SquidTime.h"
#include "FadingCounter.h"
+#if HAVE_MATH_H
+#include <math.h>
+#endif /* HAVE_MATH_H */
+
FadingCounter::FadingCounter(): horizon(-1), precision(10), delta(-1),
lastTime(0), total(0)
{
#include "squid.h"
+#include "Debug.h"
#include "HelperChildConfig.h"
#include "globals.h"
+#include "protos.h"
#include <string.h>
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "HttpBody.h"
#include "MemBuf.h"
*
*/
-#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 <map>
* 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
{
#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
*
*/
-#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
*
*/
-#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
*
*/
-#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 <map>
#include "dlink.h"
#include "HttpHdrScTarget.h"
+class StatHist;
+
/* http surogate control header field */
class HttpHdrSc
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "HttpHdrSc.h"
#include "StatHist.h"
#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
*
*/
-#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"
*
*/
-#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"
#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 <algorithm>
-#if HAVE_STRING
#include <string>
-#endif
static void httpHeaderPutStrvf(HttpHeader * hdr, http_hdr_type id, const char *fmt, va_list vargs);
#define SQUID_HTTPHEADERTOOLS_H
#include "format/Format.h"
+#include "HttpHeader.h"
#if HAVE_LIST
#include <list>
/// whether fieldValue may contain macros
bool quoted;
};
+
+SQUIDCEXTERN int httpHeaderParseOffset(const char *start, int64_t * off);
+
#endif
*
*/
-#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),
#include "typedefs.h"
#include "HttpHeader.h"
+#include "HttpRequestMethod.h"
#include "HttpStatusCode.h"
#include "HttpVersion.h"
#include "BodyPipe.h"
#include "Debug.h"
#include "HttpParser.h"
#include "structs.h"
+#include "profiler/Profiler.h"
void
HttpParser::clear()
*
*/
-#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 */
#include "HttpBody.h"
#include "HttpMsg.h"
+#include "HttpRequest.h"
#include "HttpStatusLine.h"
extern void httpReplyInitModule(void);
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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)
{
// others must support 1xx control messages
return true;
}
+
+ConnStateData *
+HttpRequest::pinnedConnection() {
+ if (clientConnectionManager.valid() && clientConnectionManager->pinning.pinned)
+ return clientConnectionManager.get();
+ return NULL;
+}
#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);
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;
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "HttpRequestMethod.h"
#include "wordlist.h"
#ifndef SQUID_HTTPREQUESTMETHOD_H
#define SQUID_HTTPREQUESTMETHOD_H
-#include "squid-old.h"
-#include <iosfwd>
#include "SquidString.h"
+#include "structs.h"
+
+#include <iosfwd>
enum _method_t {
METHOD_NONE, /* 000 */
*
*/
-#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! */
/* pack fields using Packer */
SQUIDCEXTERN void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p);
+SQUIDCEXTERN const char *httpStatusString(http_status status);
+
+
#endif /* SQUID_HTTPSTATUSLINE_H */
*/
#include "comm/forward.h"
+#include "icp_opcode.h"
#include "ip/Address.h"
#include "StoreClient.h"
+class HttpRequest;
+
/**
\ingroup ServerProtocolICPAPI
*
* Use these to find memory leaks
*/
-#include "squid-old.h"
+#include "squid.h"
#include "LeakFinder.h"
#include "Store.h"
#include "SquidTime.h"
-#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.
-#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)
send-announce.cc \
$(SBUF_SOURCE) \
$(SNMP_SOURCE) \
- squid-old.h \
SquidMath.h \
SquidMath.cc \
SquidNew.cc \
tests/stub_HelperChildConfig.cc \
HttpRequestMethod.cc \
RemovalPolicy.cc \
- squid-old.h \
$(WIN32_SOURCE) \
tests/stub_fd.cc
ufsdump_LDADD = \
\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
#define VA_COPY __va_copy
#endif
-#include "squid-old.h"
-#include "MemBuf.h"
-
/* local constants */
/* default values for buffer sizes, used by memBufDefInit */
*
*/
-#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
typedef void STMCB (void *data, StoreIOBuffer wroteBuffer);
class store_client;
+class HttpRequest;
#if USE_DELAY_POOLS
#include "DelayId.h"
#endif
#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";
#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)
*/
#ifndef NULLDELAYID_H
#define NULLDELAYID_H
+
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "RefCount.h"
#include "DelayIdComposite.h"
*/
-#include "squid-old.h"
+#include "squid.h"
#include "Store.h"
#include "MemBuf.h"
#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
#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);
#ifndef SQUID_PEERDIGEST_H
#define SQUID_PEERDIGEST_H
-#include "squid-old.h"
-
#if USE_CACHE_DIGESTS
#include "cbdata.h"
-
/* for CacheDigestGuessStats */
#include "StatCounters.h"
*
*/
-#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"
#ifndef SQUID_REMOVALPOLICY_H
#define SQUID_REMOVALPOLICY_H
-#include "squid-old.h"
#include "cbdata.h"
class RemovalPolicyWalker;
*
*/
-#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"
#define _SQUID_EXTERNNEW_
-#include "squid-old.h"
+#include "squid.h"
#ifdef __SUNPRO_CC
#include "squid.h"
#include "StatHist.h"
+#if HAVE_MATH_H
+#include <math.h>
+#endif
/* Local functions */
static StatHistBinDumper statHistBinDumper;
\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
class AsyncCall;
-class StoreClient;
+class HttpRequest;
class MemObject;
+class StoreClient;
class StoreSearch;
class SwapDir;
#ifndef SQUID_STORECLIENT_H
#define SQUID_STORECLIENT_H
+#include "dlink.h"
#include "StoreIOBuffer.h"
#include "StoreIOState.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "StoreFileSystem.h"
Vector<StoreFileSystem*> *StoreFileSystem::_FileSystems = NULL;
#ifndef SQUID_STOREFILESYSTEM_H
#define SQUID_STOREFILESYSTEM_H
-#include "squid-old.h"
#include "Array.h"
/* ****** DOCUMENTATION ***** */
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "Debug.h"
+#include "defines.h"
#include "StoreIOState.h"
void *
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "StoreMeta.h"
#include "Store.h"
#include "MemObject.h"
*
*/
-#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
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "StoreMetaSTD.h"
#include "Store.h"
#include "MemObject.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "StoreMetaSTDLFS.h"
#include "Store.h"
#include "MemObject.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "StoreMetaURL.h"
#include "Store.h"
#include "MemObject.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "defines.h"
+#include "Debug.h"
#include "StoreMetaUnpacker.h"
#include "StoreMeta.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "StoreMetaVary.h"
#include "Store.h"
#include "MemObject.h"
#ifndef SQUID_STORESEARCH_H
#define SQUID_STORESEARCH_H
-#include "squid-old.h"
#include "RefCount.h"
#include "Store.h"
* 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
*
*/
-#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 <limits.h>
+#endif
+
int
String::psize() const
{
#include <cstring>
#if HAVE_STDINT_H
-#include <stdint.h> //for INT_MAX
+#include <stdint.h>
#else /* HAVE_STDINT_H */
#ifndef INT_MAX
#define INT_MAX 1<<31 //hack but a safe bet
*
*/
-#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),
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "squid_windows.h"
#if _SQUID_MSWIN_
#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;
#include "Array.h"
#include "cbdata.h"
+#include "defines.h"
#include "dlink.h"
+#include "MemPool.h"
+#include "structs.h"
#if HAVE_OSTREAM
#include <ostream>
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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<Eui::Eui48 *> **curlist);
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "mgr/Registration.h"
#include "radix.h"
#include "HttpRequest.h"
#include "HttpReply.h"
#include "ipcache.h"
#include "forward.h"
+#include "protos.h"
#include "wordlist.h"
#define WHOIS_PORT 43
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Checklist.h"
#include "acl/Browser.h"
#include "acl/RegexData.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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.
#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
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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)
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Checklist.h"
+#include "Debug.h"
+#include "profiler/Profiler.h"
void
ACLChecklist::matchNonBlocking()
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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_;
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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 *
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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<class T>
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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<Eui::Eui64 *> **curlist);
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#if USE_AUTH
#include "acl/RegexData.h"
#include "acl/UserData.h"
#include "client_side.h"
-#include "HttpRequest.h"
ACLExtUser::~ACLExtUser()
{
-#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);
class ExternalACLEntry;
class ConnStateData;
+class HttpRequest;
/** \ingroup ACLAPI
ACLChecklist filled with specific data, representing Squid and transaction
*
*/
-#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 */
-#include "squid-old.h"
+#include "squid.h"
#include "acl/HierCode.h"
#include "acl/HierCodeData.h"
#include "acl/Checklist.h"
-#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()
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/HttpRepHeader.h"
#include "acl/HttpHeaderData.h"
#include "acl/Checklist.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/HttpReqHeader.h"
#include "acl/HttpHeaderData.h"
#include "acl/Checklist.h"
*/
#include "squid.h"
-#if _SQUID_CYGWIN_
-#include <squid_windows.h>
-#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 <limits.h>
+#endif
+
static void aclParseHTTPStatusList(SplayNode<acl_httpstatus_data *> **curlist);
static int aclHTTPStatusCompare(acl_httpstatus_data * const &a, acl_httpstatus_data * const &b);
static int aclMatchHTTPStatus(SplayNode<acl_httpstatus_data*> **dataptr, http_status status);
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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 */
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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 *
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/LocalIp.h"
#include "acl/FilledChecklist.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/LocalPort.h"
#include "acl/IntRange.h"
#include "acl/Checklist.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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
{
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Method.h"
#include "acl/MethodData.h"
#include "acl/Checklist.h"
#include "acl/Strategy.h"
#include "acl/Strategised.h"
+#include "HttpRequestMethod.h"
/// \ingroup ACLAPI
class ACLMethodStrategy : public ACLStrategy<HttpRequestMethod>
{
public:
- virtual int match (ACLData<MatchType> * &, ACLFilledChecklist *);
+ virtual int match (ACLData<ACLStrategy::MatchType> * &, ACLFilledChecklist *);
virtual bool requiresRequest() const {return true;}
static ACLMethodStrategy *Instance();
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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;
#include "acl/Acl.h"
#include "acl/Data.h"
#include "CbDataList.h"
+#include "HttpRequestMethod.h"
/// \ingroup ACLAPI
class ACLMethodData : public ACLData<HttpRequestMethod>
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/MyPortName.h"
#include "acl/StringData.h"
#include "acl/Checklist.h"
-#include "squid-old.h"
+#include "squid.h"
#include "acl/PeerName.h"
#include "acl/RegexData.h"
#include "acl/StringData.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Protocol.h"
#include "acl/ProtocolData.h"
#include "acl/Checklist.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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 *
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Referer.h"
#include "acl/Checklist.h"
#include "acl/RegexData.h"
* 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)
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/ReplyMimeType.h"
#include "acl/Checklist.h"
#include "acl/RegexData.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/RequestMimeType.h"
#include "acl/Checklist.h"
#include "acl/RegexData.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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_;
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/SourceIp.h"
#include "acl/FilledChecklist.h"
* $Id$
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/SslError.h"
#include "acl/SslErrorData.h"
#include "acl/Checklist.h"
* $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)
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Strategised.h"
/*
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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)
{}
* Copyright (c) 2009, Henrik Nordstrom <henrik@henriknordstrom.net>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Tag.h"
#include "acl/StringData.h"
#include "acl/Checklist.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/Time.h"
#include "acl/TimeData.h"
#include "SquidTime.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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) {}
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/UrlPath.h"
#include "acl/Checklist.h"
#include "acl/RegexData.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/UrlPort.h"
#include "acl/IntRange.h"
#include "acl/Checklist.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "acl/UserData.h"
#include "acl/Checklist.h"
+#include "Debug.h"
#include "wordlist.h"
#include "ConfigParser.h"
-#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;
-#include "squid-old.h"
+#include "squid.h"
#include "structs.h"
#include "ConfigParser.h"
#include "adaptation/AccessRule.h"
#include "adaptation/Service.h"
#include "adaptation/ServiceGroups.h"
-
+#include "Debug.h"
int Adaptation::AccessRule::LastId = 0;
*
*/
-#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;
#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
{
-#include "squid-old.h"
+#include "squid.h"
#include "adaptation/Elements.h"
const char *Adaptation::crlf = "\r\n";
#include "adaptation/History.h"
#include "base/TextException.h"
#include "globals.h"
+#include "protos.h"
#include "SquidTime.h"
/// impossible services value to identify unset theNextServices
* 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"
* 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"
* DEBUG: section 93 Adaptation
*/
-#include "squid-old.h"
+#include "squid.h"
#include "adaptation/Answer.h"
#include "adaptation/Config.h"
#include "adaptation/Iterator.h"
* DEBUG: section 93 Adaptation
*/
-#include "squid-old.h"
+#include "squid.h"
#include "adaptation/Message.h"
#include "base/TextException.h"
#include "HttpMsg.h"
* DEBUG: section 93 Adaptation
*/
-#include "squid-old.h"
+#include "squid.h"
#include "HttpRequest.h"
#include "adaptation/ServiceFilter.h"
#include "adaptation/Service.h"
* 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 <set>
-#include "squid-old.h"
+#include "squid.h"
#include "HttpRequest.h"
#include "HttpReply.h"
#include "adaptation/ServiceFilter.h"
-#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):
* $Id$
* DEBUG: section 93 eCAP Interface
*/
-#include "squid-old.h"
+#include "squid.h"
#include "adaptation/ecap/Host.h"
#include "adaptation/ecap/ServiceRep.h"
/*
* DEBUG: section 93 eCAP Interface
*/
-#include "squid-old.h"
+#include "squid.h"
#include <libecap/adapter/service.h>
#include <libecap/common/names.h>
#include <libecap/common/registry.h>
/*
* DEBUG: section 93 eCAP Interface
*/
-#include "squid-old.h"
+#include "squid.h"
#include "HttpRequest.h"
#include "HttpReply.h"
#include "BodyPipe.h"
/*
* DEBUG: section 93 eCAP Interface
*/
-#include "squid-old.h"
+#include "squid.h"
#include <list>
#include <libecap/adapter/service.h>
#include <libecap/common/options.h>
/*
* DEBUG: section 93 eCAP Interface
*/
-#include "squid-old.h"
+#include "squid.h"
#include <libecap/common/area.h>
#include <libecap/common/delay.h>
#include <libecap/common/named_values.h>
-#include "squid-old.h"
+#include "squid.h"
+#include "Debug.h"
#include "adaptation/icap/Client.h"
void Adaptation::Icap::InitModule()
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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"
-#include "squid-old.h"
+#include "squid.h"
#include "adaptation/icap/Elements.h"
// TODO: remove this file?
-#include "squid-old.h"
+#include "squid.h"
#include "adaptation/icap/History.h"
+#include "Debug.h"
#include "globals.h"
#include "SquidTime.h"
#ifndef SQUID_ICAPHISTORY_H
#define SQUID_ICAPHISTORY_H
-#include "RefCount.h"
#include "enums.h"
+#include "RefCount.h"
+#include "SquidString.h"
namespace Adaptation
{
* 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"
#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"
* 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"
#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
* 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);
-#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"
#ifndef SQUID_ICAPOPTIONS_H
#define SQUID_ICAPOPTIONS_H
-#include "squid-old.h"
#include "adaptation/icap/ServiceRep.h"
+class HttpHeader;
class wordlist;
namespace Adaptation
* 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"
#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);
* 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);
-#include "squid-old.h"
+#include "squid.h"
#include "icap_log.h"
#include "AccessLogEntry.h"
#include "log/File.h"
#ifndef ICAP_LOG_H_
#define ICAP_LOG_H_
+#include "AccessLogEntry.h"
#include "RefCount.h"
typedef RefCount<AccessLogEntry> AccessLogEntryPointer;
-#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"
/**
/*
- * $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 <robertc@squid-cache.org>
*/
-#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"
/*
- * $Id$
- *
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
/*
- * $Id$
- *
* DEBUG: section 28 Access Control
* AUTHOR: Duane Wessels
*
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "auth/AclProxyAuth.h"
#include "auth/Gadgets.h"
#include "acl/FilledChecklist.h"
/*
- * $Id$
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
*
*/
-#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;
* 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"
#include "auth/User.h"
#include "auth/UserRequest.h"
#include "auth/AclProxyAuth.h"
+#include "globals.h"
#include "HttpReply.h"
#include "HttpRequest.h"
* Copyright (c) 2004, Robert Collins <robertc@squid-cache.org>
*/
-#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::Pointer> *Auth::Scheme::_Schemes = NULL;
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "auth/User.h"
#include "auth/UserRequest.h"
#include "auth/Config.h"
#include "acl/Acl.h"
#include "acl/Gadgets.h"
#include "event.h"
+#include "globals.h"
#include "SquidTime.h"
#include "Store.h"
* 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"
#include "squid.h"
#include "auth/basic/Scheme.h"
+#include "Debug.h"
#include "helper.h"
/* for Auth::Config */
#include "auth/basic/User.h"
#include "Debug.h"
#include "SquidTime.h"
+#include "structs.h"
Auth::Basic::User::User(Auth::Config *aConfig) :
Auth::User(aConfig),
#include "auth/basic/UserRequest.h"
#include "auth/State.h"
#include "charset.h"
+#include "Debug.h"
#include "rfc1738.h"
#include "SquidTime.h"
* 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"
#include "mgr/Registration.h"
#include "Store.h"
#include "HttpReply.h"
+#include "protos.h"
#include "rfc1738.h"
#include "uudecode.h"
#include "wordlist.h"
#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;
#include "Debug.h"
#include "dlink.h"
#include "SquidTime.h"
+#include "structs.h"
Auth::Digest::User::User(Auth::Config *aConfig) :
Auth::User(aConfig),
#include "charset.h"
#include "HttpReply.h"
#include "HttpRequest.h"
+#include "protos.h"
#include "SquidTime.h"
Auth::Digest::UserRequest::UserRequest() :
* 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"
#include "Store.h"
#include "HttpRequest.h"
#include "HttpReply.h"
+#include "protos.h"
#include "wordlist.h"
#include "SquidTime.h"
#include "squid.h"
#include "auth/negotiate/Scheme.h"
+#include "Debug.h"
#include "helper.h"
Auth::Scheme::Pointer Auth::Negotiate::Scheme::_instance = NULL;
#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()
* 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"
#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"
#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;
#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"
* 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"
#include "client_side.h"
#include "HttpReply.h"
#include "HttpRequest.h"
+#include "protos.h"
#include "wordlist.h"
#include "SquidTime.h"
* $Id$
*/
-#include "squid-old.h"
+#include "squid.h"
#include "base/AsyncCall.h"
#include "base/AsyncCallQueue.h"
#include "cbdata.h"
-
+#include "Debug.h"
#include <ostream>
InstanceIdDefinitions(AsyncCall, "call");
#include "squid.h"
#include "base/AsyncCallQueue.h"
#include "base/AsyncCall.h"
+#include "Debug.h"
AsyncCallQueue *AsyncCallQueue::TheInstance = 0;
-
-/*
- * $Id$
- *
- */
-
#ifndef SQUID_ASYNCCALLQUEUE_H
#define SQUID_ASYNCCALLQUEUE_H
-#include "squid-old.h"
#include "base/AsyncCall.h"
//class AsyncCall;
* 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"
#include "base/AsyncJob.h"
#include "base/CbcPointer.h"
+#include "Debug.h"
/**
\ingroup AsyncJobAPI
-#include "squid-old.h"
+#include "squid.h"
#include "base/TextException.h"
#include "Debug.h"
#include "util.h"
*
*/
-#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
#if USE_ECAP
#include "adaptation/ecap/Config.h"
#endif
-#include "anyp/PortCfg.h"
#if USE_SSL
#include "ssl/support.h"
#include "ssl/Config.h"
#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 <glob.h>
#if HAVE_LIST
#include <list>
#endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_PWD_H
+#include <pwd.h>
+#endif
+#if HAVE_GRP_H
+#include <grp.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#if USE_SSL
#include "ssl/gadgets.h"
* Reports the percentage of common files and other stats
*/
-#include "squid-old.h"
+#include "squid.h"
typedef struct {
const char *name;
*
*/
-#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 <math.h>
+#endif
+
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
static int n_carp_peers = 0;
#endif
#include "Generic.h"
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
#if WITH_VALGRIND
#define HASHED_CBDATA 1
#endif
#ifndef SQUID_CBDATA_H
#define SQUID_CBDATA_H
-#include "squid-old.h"
+#include "typedefs.h"
/**
\defgroup CBDATAAPI Callback Data Allocator API
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "clientStream.h"
#include "HttpReply.h"
#include "HttpRequest.h"
#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
typedef RefCount<RefCountable_> ClientStreamData;
class clientStreamNode;
-
class ClientHttpRequest;
+class HttpReply;
/* client stream read callback */
/// \ingroup ClientStreamAPI
*
*/
-#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"
* 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"
#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"
#include "ssl/crtd_message.h"
#include "ssl/certificate_db.h"
#endif
-#include "Store.h"
-#include "TimeOrTag.h"
+#if HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#if HAVE_MATH_H
+#include <math.h>
+#endif
#if HAVE_LIMITS
#include <limits>
#endif
#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
*
*/
#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);
* 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"
-
/*
- * $Id$
- *
- *
* SQUID Web Proxy Cache http://www.squid-cache.org/
* ----------------------------------------------------------
*
#ifndef SQUID_CLIENTSIDEREQUEST_H
#define SQUID_CLIENTSIDEREQUEST_H
-#include "squid-old.h"
#include "HttpHeader.h"
#include "clientStream.h"
#include "client_side.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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"
#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
#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
+#if HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#if HAVE_MATH_H
+#include <math.h>
+#endif
/*
* New C-like simple comm code. This stuff is a mess and doesn't really buy us anything.
#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 */
#include "comm/Connection.h"
#include "comm/TcpAcceptor.h"
#include "fde.h"
+#include "globals.h"
Comm::AcceptLimiter Comm::AcceptLimiter::Instance_;
#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);
#define _SQUIDCONNECTIONDETAIL_H_
#include "comm/forward.h"
+#include "defines.h"
#include "hier_code.h"
#include "ip/Address.h"
#include "MemPool.h"
#include "comm/Write.h"
#include "CommCalls.h"
#include "fde.h"
+#include "globals.h"
Comm::CbEntry *Comm::iocb_table;
#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"
#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"
#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 <sys/event.h>
#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"
#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"
#include "StatHist.h"
#include "Store.h"
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
static int MAX_POLL_TIME = 1000; /* see also Comm::QuickPollRequired() */
#ifndef howmany
#include "squid.h"
#if USE_SELECT_WIN32
-
-#include "squid-old.h"
#include "anyp/PortCfg.h"
#include "comm/Connection.h"
#include "comm/Loops.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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"
#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)
#include "base/AsyncCall.h"
#include "comm/forward.h"
+#include "typedefs.h"
+class MemBuf;
namespace Comm
{
#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;
*
*/
-#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;
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "Store.h"
#include "wordlist.h"
#include "SquidTime.h"
*
*/
-#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 <arpa/nameser.h>
#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"
#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
#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
*/
class HttpReply;
+class HttpRequest;
class MemBuf;
/// \ingroup ErrorPageAPI
*
*/
-#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.
#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 */
#ifndef SQUID_ESIATTEMPT_H
#define SQUID_ESIATTEMPT_H
-#include "squid-old.h"
#include "esi/Element.h"
#include "esi/Sequence.h"
*
*/
-#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.
#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
*
*/
-#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;
#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,
#ifndef SQUID_ELEMENTLIST_H
#define SQUID_ELEMENTLIST_H
-#include "squid-old.h"
#include "esi/Element.h"
class ElementList
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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
#ifndef SQUID_ESIEXCEPT_H
#define SQUID_ESIEXCEPT_H
-#include "squid-old.h"
#include "esi/Element.h"
#include "esi/Sequence.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#if USE_SQUID_ESI && HAVE_LIBEXPAT
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "Debug.h"
#include "esi/Expression.h"
+#include "profiler/Profiler.h"
+
+#if HAVE_MATH_H
+#include <math.h>
+#endif
/* stack precedence rules:
* before pushing an operator onto the stack, the
#ifndef SQUID_ESIEXPRESSION_H
#define SQUID_ESIEXPRESSION_H
-#include "squid-old.h"
-
class ESIExpression
{
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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);
#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<ESIInclude> ESIIncludePtr;
* mail@joachim-bauch.de
*/
-#include "squid-old.h"
+#include "squid.h"
#if USE_SQUID_ESI && HAVE_LIBXML2
#ifndef SQUID_ESILITERAL_H
#define SQUID_ESILITERAL_H
-#include "squid-old.h"
#include "esi/Element.h"
class ESIContext;
-#include "squid-old.h"
+#include "squid.h"
#include "esi/Module.h"
#include "esi/CustomParser.h"
#include "esi/Libxml2Parser.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "esi/Parser.h"
+#include "fatal.h"
char *ESIParser::Type = NULL;
ESIParser::Register *ESIParser::Parsers = NULL;
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "Debug.h"
#include "esi/Segment.h"
#include "SquidString.h"
*/
#include "cbdata.h"
+#include "defines.h"
#include "RefCount.h"
#include "SquidString.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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.
#ifndef SQUID_ESISEQUENCE_H
#define SQUID_ESISEQUENCE_H
-#include "squid-old.h"
#include "esi/Element.h"
#include "esi/ElementList.h"
+#include "MemPool.h"
/* esiSequence */
#ifndef SQUID_ESIVAR_H
#define SQUID_ESIVAR_H
-#include "squid-old.h"
#include "esi/Element.h"
#include "esi/Sequence.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "esi/VarState.h"
#include "HttpReply.h"
+#include "protos.h"
CBDATA_TYPE (ESIVarState);
FREE ESIVarStateFree;
#include "mgr/Registration.h"
#include "Store.h"
#include "SquidTime.h"
+#include "profiler/Profiler.h"
+#include "protos.h"
/* The list of event processes */
#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 */
*
*/
-#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
*
*/
-#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
*
*/
-#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)
#include "comm.h"
#include "ip/Address.h"
+#include "structs.h"
#if USE_DELAY_POOLS
class ClientInfo;
#include "squid.h"
#include "AccessLogEntry.h"
+#include "client_side.h"
#include "comm/Connection.h"
#include "err_detail_type.h"
#include "errorpage.h"
#include "format/Token.h"
#include "HttpRequest.h"
#include "MemBuf.h"
+#include "protos.h"
#include "rfc1738.h"
#include "SquidTime.h"
#include "Store.h"
*/
-#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"
#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;
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
*
*/
-#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"
-#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"
/* 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"
/**
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "CossSwapDir.h"
#include "Store.h"
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
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "CossSwapDir.h"
#include "Store.h"
#include "store_coss.h"
#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,
#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);
#include "StoreFileSystem.h"
+class StoreEntry;
namespace Rock
{
#include "ipc/mem/Pages.h"
#include "MemObject.h"
#include "Parsing.h"
+#include "protos.h"
#include "SquidMath.h"
#include <cstdlib>
#include <iomanip>
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
const int64_t Rock::SwapDir::HeaderSize = 16*1024;
Rock::SwapDir::SwapDir(): ::SwapDir("rock"), filePath(NULL), io(NULL), map(NULL)
*/
#include "squid.h"
+#include "protos.h"
#include "RebuildState.h"
#include "SquidTime.h"
#include "StoreSwapLogData.h"
#include "UFSSwapLogParser.h"
+#if HAVE_MATH_H
+#include <math.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,RebuildState);
Fs::Ufs::RebuildState::RebuildState(RefCount<UFSSwapDir> aSwapDir) :
*
*/
-#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"
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
*/
-#include "squid-old.h"
+#include "squid.h"
#define CLEAN_BUF_SZ 16384
#include "StatCounters.h"
#include "UFSSwapDir.h"
+#if HAVE_MATH_H
+#include <math.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
int Fs::Ufs::UFSSwapDir::NumberOfUFSDirs = 0;
int *Fs::Ufs::UFSSwapDir::UFSDirToGlobalDirMapping = NULL;
*/
#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 <sys/stat.h>
+#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.
*
*/
-#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"
#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];
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[];
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 */
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
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_
extern unsigned int WIN32_run_mode; /* _WIN_SQUID_RUN_MODE_INTERACTIVE */
#endif
#if HAVE_SBRK
-
extern void *sbrk_start; /* 0 */
#endif
/// Zero for SMP-unaware code and in no-SMP mode.
extern int KidIdentifier; /* 0 */
-#ifdef __cplusplus
-}
-
-#endif
-
#endif /* SQUID_GLOBALS_H */
*
*/
-#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
*
*/
-#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"
#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"
};
+class MemBuf;
+
class helper_server : public HelperServerBase
{
public:
*
*/
-#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;
#if USE_HTCP
#include "HttpHeader.h"
-
+#include "HttpRequestMethod.h"
#include "ip/forward.h"
+class HttpRequest;
+
/// \ingroup ServerProtocolHTCP
class HtcpReplyData
{
* 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) \
* 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"
*/
//#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"
*/
//#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"
#define SQUID_HELPER 1
-#include "squid-old.h"
+#include "squid.h"
#if USE_ICMP
*
*/
-#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.
* (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"
#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 <sys/stat.h>
+#endif
+
#if USE_ICMP
#include "icmp/IcmpSquid.h"
#include "ipcache.h"
* 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
#define SQUID_UNIT_TEST 1
#define SQUID_HELPER 1
-#include "squid-old.h"
+#include "squid.h"
#include <cppunit/TestAssert.h>
\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);
\ingroup ServerProtocolICPAPI
*/
-#include "squid-old.h"
+#include "squid.h"
#include "Store.h"
#include "ICP.h"
#include "HttpRequest.h"
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#if USE_IDENT
#include "acl/UserData.h"
#include "client_side.h"
#include "comm/Connection.h"
+#include "globals.h"
#include "ident/AclIdent.h"
#include "ident/Ident.h"
#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"
*
*/
-#include "squid-old.h"
+#include "squid.h"
+
+#if HAVE_MATH_H
+#include <math.h>
+#endif
+
int
isPowTen(int count)
{
*
*/
-#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,
/* Inline QOS functions */
#include "comm/Connection.h"
+#include "Debug.h"
int
Ip::Qos::setSockTos(const Comm::ConnectionPointer &conn, tos_t tos)
-#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 */
-#include "squid-old.h"
+#include "squid.h"
#include "ip/QosConfig.h"
#include "Store.h"
*
*/
-#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";
#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"
* DEBUG: section 54 Interprocess Communication
*/
-#include "squid-old.h"
+#include "squid.h"
#include "Store.h"
#include "ipc/ReadWriteLock.h"
#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
#include "comm/Connection.h"
#include "ipc/SharedListen.h"
#include "ipc/StartListening.h"
-
+#include "protos.h"
Ipc::StartListeningCb::StartListeningCb(): conn(NULL), errNo(0)
{
* DEBUG: section 54 Interprocess Communication
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "protos.h"
#include "Store.h"
#include "ipc/StoreMap.h"
#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"
#include "SquidString.h"
#include "base/AsyncJob.h"
+#include "cbdata.h"
#include "comm/forward.h"
#include "ipc/TypedMsgHdr.h"
#include "ipc/FdNotes.h"
#include "base/RunnersRegistry.h"
#include "ipc/mem/PagePool.h"
#include "ipc/mem/Pages.h"
+#include "protos.h"
#include "structs.h"
#include "SwapDir.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "comm.h"
#include "fde.h"
#include "ip/Address.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "cbdata.h"
#include "CacheManager.h"
#include "DnsLookupDetails.h"
#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"
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "protos.h"
+#include "typedefs.h"
/* This should go away, in favour of the List template class */
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "fde.h"
#include "log/File.h"
#include "log/ModDaemon.h"
#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"
#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"
#include "HttpRequest.h"
#include "log/File.h"
#include "log/Formats.h"
+#include "protos.h"
#include "SquidTime.h"
void
#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"
*
*/
-#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 */
*
*/
-#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;
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "Debug.h"
#if HAVE_SYSLOG
*
*/
-#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
*
*/
-#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
*/
-#include "squid-old.h"
+#include "squid.h"
#include "AccessLogEntry.h"
// Store.h Required by configuration directives parsing/dumping only
#include "eui/Eui64.h"
#endif
#include "format/Token.h"
+#include "globals.h"
#include "hier_code.h"
#include "HttpReply.h"
#include "HttpRequest.h"
*
*/
-#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
#if USE_SQUID_ESI
#include "esi/Module.h"
#endif
-#include "fs/Module.h"
#if HAVE_PATHS_H
#include <paths.h>
#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
#if USE_WIN32_SERVICE
#include "squid_windows.h"
{
if (IamPrimaryProcess()) {
#if USE_WCCP
-
wccpConnectionOpen();
#endif
*
*/
-#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 <iomanip>
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "mem_node.h"
+#include "protos.h"
static ptrdiff_t makeMemNodeDataOffset();
#ifndef SQUID_MEM_NODE_H
#define SQUID_MEM_NODE_H
+#include "defines.h"
+#include "MemPool.h"
#include "StoreIOBuffer.h"
#include "Range.h"
#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)
{
#include "ipc/Messages.h"
#include "ipc/TypedMsgHdr.h"
#include "mgr/CountersAction.h"
+#include "protos.h"
#include "SquidTime.h"
#include "Store.h"
#include "CommCalls.h"
#include "comm/Connection.h"
#include "errorpage.h"
+#include "globals.h"
#include "HttpReply.h"
#include "HttpRequest.h"
#include "ipc/Port.h"
#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"
#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"
#include "mgr/InfoAction.h"
#include "mgr/Request.h"
#include "mgr/Response.h"
+#include "protos.h"
#include "SquidTime.h"
#include "Store.h"
#include "squid.h"
#include "base/TextException.h"
+#include "comm.h"
#include "comm/Connection.h"
#include "comm/Write.h"
#include "CommCalls.h"
#include "ipc/Messages.h"
#include "ipc/TypedMsgHdr.h"
#include "mgr/IntervalAction.h"
+#include "protos.h"
#include "SquidMath.h"
#include "Store.h"
#include "ipc/Messages.h"
#include "ipc/TypedMsgHdr.h"
#include "mgr/IoAction.h"
+#include "protos.h"
#include "SquidMath.h"
#include "Store.h"
#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);
#include "ipc/Messages.h"
#include "ipc/TypedMsgHdr.h"
#include "mgr/StoreIoAction.h"
+#include "protos.h"
#include "Store.h"
#include "comm/Write.h"
#include "ipc/FdNotes.h"
#include "mgr/StoreToCommWriter.h"
+#include "protos.h"
#include "StoreClient.h"
#include "Store.h"
*
*/
-#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 <sys/stat.h>
+#endif
#define GET_HDR_SZ 1024
*
*/
-#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
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)
{
*
*/
-#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"
*
*/
-#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
*
*/
-#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 */
*
*/
-#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 */
*
*/
-#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;
*
*/
-#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 <math.h>
+#endif
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
*
*/
-#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 <math.h>
+#endif
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
#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);
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 *);
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;
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;
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;
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 */
#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
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 *);
/* ----------------------------------------------------------------- */
/* 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);
/*
/*
* 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 *);
/*
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
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);
/// 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
/// 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() */
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);
*
*/
-#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
#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,
* 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 <math.h>
+#endif
+
/*
* Key generation function to implement the LFU-DA policy (Least
* Frequently Used with Dynamic Aging). Similar to classical LFU
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "heap.h"
+#include "protos.h"
#include "store_heap_replacement.h"
#include "Store.h"
#include "MemObject.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "Store.h"
#include "MemObject.h"
#include "SquidTime.h"
*
*/
-#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;
#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"
*
*/
-#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"
/************************************************************************
* 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"
#include "comm/UdpOpenDialer.h"
#include "ip/Address.h"
#include "ip/tools.h"
+#include "protos.h"
#include "snmp_core.h"
#include "snmp/Forwarder.h"
+++ /dev/null
-/*
- * 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 <unistd.h>
-#endif
-#if HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif
-#if HAVE_GRP_H
-#include <grp.h>
-#endif
-#if HAVE_GNUMALLOC_H
-#include <gnumalloc.h>
-#elif HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#if HAVE_MEMORY_H
-#include <memory.h>
-#endif
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#if HAVE_PATHS_H
-#include <paths.h>
-#endif
-#if HAVE_PWD_H
-#include <pwd.h>
-#endif
-#if HAVE_SIGNAL_H
-#include <signal.h>
-#endif
-#if HAVE_TIME_H
-#include <time.h>
-#endif
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#if HAVE_SYS_RESOURCE_H
-#include <sys/resource.h> /* needs sys/time.h above it */
-#endif
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#if HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#if HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#if HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-#if HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-#if HAVE_LIBC_H
-#include <libc.h>
-#endif
-#if HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
-#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-#if HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#if HAVE_BSTRING_H
-#include <bstring.h>
-#endif
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
-#if _SQUID_WINDOWS_
-#include <io.h>
-#endif
-#if HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#if HAVE_MATH_H
-#include <math.h>
-#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 */
-#include "squid-old.h"
+#include "squid.h"
#include "errorpage.h"
#include "ssl/ErrorDetail.h"
#if HAVE_MAP
#include <map>
#endif
+#if HAVE_CLIMITS
+#include <climits>
+#endif
struct SslErrorEntry {
Ssl::ssl_error_t value;
-#include "squid-old.h"
+#include "squid.h"
#include "ErrorDetail.h"
#include "errorpage.h"
#include "ErrorDetailManager.h"
+#include "protos.h"
void Ssl::errorDetailInitialize()
{
#include "client_side.h"
#include "forward.h"
+#include "protos.h"
#include "ssl/ServerBump.h"
#include "Store.h"
#include "ip/Address.h"
class ConnStateData;
+class store_client;
namespace Ssl
{
*
*/
-#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"
*
*/
-#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
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#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().
*
*/
-#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 <limits.h>
+#endif
static STMCB storeWriteComplete;
* Portions copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
*/
-#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.
* 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 <math.h>
+#endif
+
/*
* local types
*/
*
*/
-#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"
#if HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
#include "StoreHashIndex.h"
-#include "squid-old.h"
+#include "squid.h"
#include "Store.h"
#include "MemObject.h"
#include "SwapDir.h"
*
*/
-#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];
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "format/Token.h"
#include "HttpReply.h"
#include "log/File.h"
*
*/
-#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"
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "globals.h"
#include "StatCounters.h"
#include "StoreClient.h"
#include "Store.h"
*
*/
-#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 <sys/wait.h>
+#endif
+
void
storeSwapTLVFree(tlv * n)
{
*
*/
-#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"
#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"
#if SQUID_SNMP
+#include "snmp_session.h"
struct _snmp_request_t {
u_char *buf;
u_char *outbuf;
* Test-suite for playing with cache digests
*/
-#include "squid-old.h"
+#include "squid.h"
typedef struct {
int query_count;
#include "squid.h"
-
-#include "squid-old.h"
#include "TestSwapDir.h"
uint64_t
#ifndef TEST_TESTSWAPDIR
#define TEST_TESTSWAPDIR
-#include "squid-old.h"
#include "SwapDir.h"
class TestSwapDir : public SwapDir
#include "squid.h"
#if USE_DELAY_POOLS
-#include "squid-old.h"
#include "DelayId.h"
#define STUB_API "stub_DelayId.cc"
-#include "squid-old.h"
+#include "squid.h"
#include "HierarchyLogEntry.h"
#define STUB_API "access.log.cc"
*
*/
-#include "squid-old.h"
+#include "squid.h"
/*
* DO NOT MODIFY:
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "ConfigParser.h"
+#include "protos.h"
#include "wordlist.h"
#define STUB_API "cache_cf.cc"
-#include "squid-old.h"
+#include "squid.h"
#include "CacheManager.h"
+#include "Debug.h"
#include "mgr/Registration.h"
#define STUB_API "cache_manager.cc"
#include "squid.h"
#include "errorpage.h"
+#include "protos.h"
#define STUB_API "errorpage.cc"
#include "tests/STUB.h"
#include "squid.h"
#include "fde.h"
+#include "protos.h"
#define STUB_API "fd.cc"
#include "tests/STUB.h"
-#include "squid-old.h"
+#include "squid.h"
+
+#include "HttpRequest.h"
+#include "HttpReply.h"
#define STUB_API "http.cc"
#include "tests/STUB.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
/*
* DO NOT MODIFY:
-#include "squid-old.h"
+#include "squid.h"
#define STUB_API "store.cc"
#include "tests/STUB.h"
-#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"
*
*/
-#include "squid-old.h"
+#include "squid.h"
+#include "MemBuf.h"
+#include "protos.h"
#define STUB_API "stub_store_rebuild.cc"
#include "tests/STUB.h"
-#include "squid-old.h"
+#include "squid.h"
#define STUB_API "StoreStats.cc"
#include "tests/STUB.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#if USE_AUTH
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#if USE_AUTH
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testBoilerplate.h"
#if HAVE_STDEXCEPT
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include <cppunit/TestAssert.h>
#include "mgr/Action.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testCoss.h"
#include "Store.h"
#include "SwapDir.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testDiskIO.h"
#include "Store.h"
#include "SwapDir.h"
#include <cppunit/TestAssert.h>
-#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 );
#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 );
#include "HttpParser.h"
#include "Mem.h"
#include "MemBuf.h"
+#include "structs.h"
CPPUNIT_TEST_SUITE_REGISTRATION( testHttpParser );
#include "testHttpReply.h"
#include "HttpReply.h"
#include "Mem.h"
+#include "protos.h"
CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
#include "testHttpRequest.h"
#include "HttpRequest.h"
#include "Mem.h"
+#include "protos.h"
CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include <cppunit/TestAssert.h>
#include "Mem.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testNull.h"
#include "Store.h"
#include "SwapDir.h"
#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 <sys/stat.h>
+#endif
#if HAVE_STDEXCEPT
#include <stdexcept>
#endif
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testStore.h"
#include "Store.h"
#ifndef SQUID_SRC_TEST_STORE_H
#define SQUID_SRC_TEST_STORE_H
-#include "squid-old.h"
#include "Store.h"
#include <cppunit/extensions/HelperMacros.h>
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testStoreController.h"
#include "Store.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "Mem.h"
#include "testStore.h"
#include "testStoreEntryStream.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include "testStoreHashIndex.h"
#include "Store.h"
#define SQUID_UNIT_TEST 1
-#include "squid-old.h"
+#include "squid.h"
#include <cppunit/TestAssert.h>
#include "Mem.h"
+#include "SquidString.h"
#include "testURLScheme.h"
#include "URLScheme.h"
#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 <stdexcept>
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "base/Subscription.h"
#include "fde.h"
#include "htcp.h"
#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 <sys/prctl.h>
#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+#if HAVE_GRP_H
+#include <grp.h>
+#endif
#define DEAD_MSG "\
The Squid Cache (version %s) died.\n\
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "errorpage.h"
#include "HttpRequest.h"
#include "fde.h"
#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 <limits.h>
+#endif
+
class TunnelStateData
{
*
*/
-#include "squid-old.h"
+#include "enums.h"
+#include "rfc1035.h"
#ifndef SQUID_TYPEDEFS_H
#define SQUID_TYPEDEFS_H
#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;
*
*/
-#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 */
*/
#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,
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "errorpage.h"
#include "StoreClient.h"
#include "Store.h"
#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
#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
*
*/
-#include "squid-old.h"
+#include "squid.h"
#if USE_WCCPv2
#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"
*
*/
-#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
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "squid_windows.h"
#if _SQUID_MSWIN_
#ifndef SQUID_WORDLIST_H
#define SQUID_WORDLIST_H
-#include "squid-old.h"
+#include "globals.h"
#include "MemPool.h"
+#include "profiler/Profiler.h"
class wordlist
{
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "esi/Expression.h"
int
* Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#if USE_MEMPOOLS
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "Stack.h"
int
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#if HAVE_IOSTREAM
#include <iostream>
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
-#include "stmem.h"
+#include "squid.h"
+#include "Debug.h"
#include "mem_node.h"
+#include "stmem.h"
class StreamTest
{
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "stmem.h"
#include "mem_node.h"
#include "Generic.h"
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "mem_node.h"
#if HAVE_IOSTREAM
*
*/
-#include "squid-old.h"
+#include "squid.h"
#include "RefCount.h"
class _ToRefCount :public RefCountable
* Copyright (c) 2003 Robert Collins <robertc@squid-cache.org>
*/
-#include "squid-old.h"
+#include "squid.h"
#include "stmem.h"
#include "mem_node.h"
// 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)
#define DEFAULT_SQUID_CONF "/usr/local/squid/etc/squid.conf"
#endif
-#include <stdio.h> // FILE*
-#include <vector> // minimum STL container
+#include <stdio.h>
+#include <vector>
struct CacheDir {
enum CacheDirType { CDT_NONE, CDT_UFS, CDT_AUFS, CDT_DISKD, CDT_OTHER };
#endif
#include "squid.h"
-// for xstrdup
#include "util.h"
-//#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <dirent.h>
-//#include <ctype.h>
#include <string.h>
-//#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <fcntl.h>
#endif
#include <netinet/in.h>
-#include <netinet/tcp.h> // TCP_NODELAY
+#include <netinet/tcp.h>
#include <arpa/inet.h>
-#include <netdb.h> // gethostbyname()
-//#include <regex.h> //comes via compat.h
+#include <netdb.h>
#include "convert.hh"
#include "socket.hh"
#endif /* __cplusplus */
#include <sys/types.h>
-#include <sys/socket.h> // SOMAXCONN
+#include <sys/socket.h>
#include <netinet/in.h>
#if SOMAXCONN <= 5
projects / thirdparty / squid.git / commitdiff
