From: Francesco Chemolli Date: Tue, 4 Sep 2012 09:10:20 +0000 (+0200) Subject: Moved SquidConfig definition from structs.h to own header file. X-Git-Tag: sourceformat-review-1~6^2~32 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d5904f7f956aba44e8ba95dfdb029aba597983b;p=thirdparty%2Fsquid.git Moved SquidConfig definition from structs.h to own header file. --- diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc index 05a9d3179e..df2402fc94 100644 --- a/src/AccessLogEntry.cc +++ b/src/AccessLogEntry.cc @@ -2,6 +2,7 @@ #include "AccessLogEntry.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "SquidConfig.h" #include "ssl/support.h" #if USE_SSL diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc index 7cecee29bd..9d5f2fbdc0 100644 --- a/src/CpuAffinity.cc +++ b/src/CpuAffinity.cc @@ -9,6 +9,7 @@ #include "CpuAffinitySet.h" #include "Debug.h" #include "globals.h" +#include "SquidConfig.h" #include "structs.h" #include "tools.h" diff --git a/src/DelayBucket.cc b/src/DelayBucket.cc index 0103d607d4..0108ac3afd 100644 --- a/src/DelayBucket.cc +++ b/src/DelayBucket.cc @@ -39,6 +39,7 @@ #if USE_DELAY_POOLS #include "DelayBucket.h" #include "DelaySpec.h" +#include "SquidConfig.h" #include "Store.h" void diff --git a/src/DelayId.cc b/src/DelayId.cc index eeef9b71f9..7527e69153 100644 --- a/src/DelayId.cc +++ b/src/DelayId.cc @@ -48,6 +48,7 @@ #include "DelayPool.h" #include "DelayPools.h" #include "HttpRequest.h" +#include "SquidConfig.h" DelayId::DelayId () : pool_ (0), compositeId(NULL), markedAsNoDelay(false) {} diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc index 99048a614b..aa07e33be6 100644 --- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc +++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc @@ -41,6 +41,7 @@ #include "fd.h" #include "Store.h" #include "StatCounters.h" +#include "SquidConfig.h" #include "SquidIpc.h" #include "SquidTime.h" #include "unlinkd.h" diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc index 61e379cb5d..8d0da2a9d4 100644 --- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc +++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc @@ -38,8 +38,8 @@ #include "DiskThreadsIOStrategy.h" #include "fde.h" #include "mgr/Registration.h" +#include "SquidConfig.h" #include "StatCounters.h" -/* for statfs */ #include "Store.h" void diff --git a/src/DiskIO/DiskThreads/aiops.cc b/src/DiskIO/DiskThreads/aiops.cc index d6e6845830..2059dfeb3e 100644 --- a/src/DiskIO/DiskThreads/aiops.cc +++ b/src/DiskIO/DiskThreads/aiops.cc @@ -36,16 +36,17 @@ #include "squid.h" #include "DiskThreads.h" - -#include -#include -#include -#include -#include -#include -#include +#include "SquidConfig.h" + +#include +#include +#include +#include +#include +#include +#include #if HAVE_SCHED_H -#include +#include #endif #include "DiskIO/DiskThreads/CommIO.h" #include "SquidTime.h" diff --git a/src/DiskIO/DiskThreads/aiops_win32.cc b/src/DiskIO/DiskThreads/aiops_win32.cc index cc1300d26f..9523acbef2 100644 --- a/src/DiskIO/DiskThreads/aiops_win32.cc +++ b/src/DiskIO/DiskThreads/aiops_win32.cc @@ -36,15 +36,16 @@ #include "squid_windows.h" #include "DiskIO/DiskThreads/CommIO.h" #include "DiskThreads.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define RIDICULOUS_LENGTH 4096 diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc index 8832487183..83d8f13f86 100644 --- a/src/DiskIO/IpcIo/IpcIoFile.cc +++ b/src/DiskIO/IpcIo/IpcIoFile.cc @@ -18,6 +18,7 @@ #include "ipc/Queue.h" #include "ipc/StrandSearch.h" #include "ipc/UdsOp.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "tools.h" diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc index ee10a78034..2129169539 100644 --- a/src/HttpHeader.cc +++ b/src/HttpHeader.cc @@ -45,6 +45,7 @@ #include "StatHist.h" #include "Store.h" #include "StrList.h" +#include "SquidConfig.h" #include "SquidString.h" #include "TimeOrTag.h" diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc index f4bc95a278..5f12ab21cc 100644 --- a/src/HttpHeaderTools.cc +++ b/src/HttpHeaderTools.cc @@ -43,6 +43,7 @@ #include "HttpHeaderTools.h" #include "HttpRequest.h" #include "MemBuf.h" +#include "SquidConfig.h" #include "Store.h" #include "StrList.h" diff --git a/src/HttpMsg.cc b/src/HttpMsg.cc index 4ef8d53161..88d22f0f63 100644 --- a/src/HttpMsg.cc +++ b/src/HttpMsg.cc @@ -38,6 +38,7 @@ #include "MemBuf.h" #include "mime_header.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" HttpMsg::HttpMsg(http_hdr_owner_type owner): header(owner), cache_control(NULL), hdr_sz(0), content_length(0), protocol(AnyP::PROTO_NONE), diff --git a/src/HttpParser.cc b/src/HttpParser.cc index 8193c0aebd..0ef9ed3b0b 100644 --- a/src/HttpParser.cc +++ b/src/HttpParser.cc @@ -1,8 +1,9 @@ #include "squid.h" #include "Debug.h" #include "HttpParser.h" -#include "structs.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" +#include "structs.h" void HttpParser::clear() diff --git a/src/HttpReply.cc b/src/HttpReply.cc index aa940c94df..5782f2dc65 100644 --- a/src/HttpReply.cc +++ b/src/HttpReply.cc @@ -41,6 +41,7 @@ #include "HttpReply.h" #include "HttpRequest.h" #include "MemBuf.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "StrList.h" diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 784e5ec784..20a13379c7 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -45,6 +45,7 @@ #include "HttpRequest.h" #include "log/Config.h" #include "MemBuf.h" +#include "SquidConfig.h" #include "Store.h" #include "URL.h" diff --git a/src/HttpRequestMethod.h b/src/HttpRequestMethod.h index 7aef78ee3a..0a3bd3bf71 100644 --- a/src/HttpRequestMethod.h +++ b/src/HttpRequestMethod.h @@ -34,6 +34,8 @@ #include "SquidString.h" #include "structs.h" +class SquidConfig; + #include enum _method_t { diff --git a/src/MemObject.cc b/src/MemObject.cc index e2e7c818ef..ecee3fdc76 100644 --- a/src/MemObject.cc +++ b/src/MemObject.cc @@ -40,6 +40,7 @@ #include "MemBuf.h" #include "MemObject.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "Store.h" #include "StoreClient.h" diff --git a/src/MemStore.cc b/src/MemStore.cc index 090106b316..c6fb09b947 100644 --- a/src/MemStore.cc +++ b/src/MemStore.cc @@ -11,6 +11,7 @@ #include "MemObject.h" #include "MemStore.h" #include "mime_header.h" +#include "SquidConfig.h" #include "StoreStats.h" #include "tools.h" diff --git a/src/PeerDigest.h b/src/PeerDigest.h index af342bf111..d295a9cd9c 100644 --- a/src/PeerDigest.h +++ b/src/PeerDigest.h @@ -38,7 +38,8 @@ /* for CacheDigestGuessStats */ #include "StatCounters.h" -struct _Version { +class Version { +public: short int current; /* current version */ short int required; /* minimal version that can safely handle current version */ }; diff --git a/src/Server.cc b/src/Server.cc index c9fe7dafa5..a51b129697 100644 --- a/src/Server.cc +++ b/src/Server.cc @@ -53,6 +53,7 @@ #include "adaptation/Answer.h" #include "adaptation/Iterator.h" #include "base/AsyncCall.h" +#include "SquidConfig.h" #endif // implemented in client_side_reply.cc until sides have a common parent diff --git a/src/SquidConfig.cc b/src/SquidConfig.cc index 24104e239b..e1b9510886 100644 --- a/src/SquidConfig.cc +++ b/src/SquidConfig.cc @@ -1,12 +1,7 @@ -/* - * $Id$ - */ - #include "squid.h" -#include "ip/Address.h" -// just for the global definition of Config and Config2 -#include "structs.h" +#include "SquidConfig.h" struct SquidConfig Config; struct SquidConfig2 Config2; + diff --git a/src/SquidConfig.h b/src/SquidConfig.h new file mode 100644 index 0000000000..54c62b8d3d --- /dev/null +++ b/src/SquidConfig.h @@ -0,0 +1,536 @@ +#ifndef SQUID_SQUIDCONFIG_H_ +#define SQUID_SQUIDCONFIG_H_ +/* + * DEBUG: section + * AUTHOR: + * + * 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. + * + */ + +#include "ClientDelayConfig.h" +#include "DelayConfig.h" +#include "HttpHeaderTools.h" +#include "icmp/IcmpConfig.h" +#include "ip/Address.h" +#include "RefCount.h" +#include "structs.h" + +class acl_access; +class acl_deny_info_list; +class acl_size_t; +class HeaderManglers; +class refresh_t; +class SwapDir; +class RemovalPolicySettings; + +namespace AnyP { +class PortCfg; +} + +class SquidConfig { +public: + struct { + /* These should be for the Store::Root instance. + * this needs pluggable parsing to be done smoothly. + */ + int highWaterMark; + int lowWaterMark; + } Swap; + + YesNoNone memShared; ///< whether the memory cache is shared among workers + size_t memMaxSize; + + struct { + int64_t min; + int pct; + int64_t max; + } quickAbort; + int64_t readAheadGap; + RemovalPolicySettings *replPolicy; + RemovalPolicySettings *memPolicy; +#if USE_HTTP_VIOLATIONS + time_t negativeTtl; +#endif + time_t maxStale; + time_t negativeDnsTtl; + time_t positiveDnsTtl; + time_t shutdownLifetime; + time_t backgroundPingRate; + + struct { + time_t read; + time_t write; + time_t lifetime; + time_t connect; + time_t forward; + time_t peer_connect; + time_t request; + time_t clientIdlePconn; + time_t serverIdlePconn; + time_t siteSelect; + time_t deadPeer; + int icp_query; /* msec */ + int icp_query_max; /* msec */ + int icp_query_min; /* msec */ + int mcast_icp_query; /* msec */ + +#if !USE_DNSHELPER + time_msec_t idns_retransmit; + time_msec_t idns_query; +#endif + + } Timeout; + size_t maxRequestHeaderSize; + int64_t maxRequestBodySize; + int64_t maxChunkedRequestBodySize; + size_t maxRequestBufferSize; + size_t maxReplyHeaderSize; + acl_size_t *ReplyBodySize; + + struct { + unsigned short icp; +#if USE_HTCP + + unsigned short htcp; +#endif +#if SQUID_SNMP + + unsigned short snmp; +#endif + } Port; + + struct { + AnyP::PortCfg *http; +#if USE_SSL + AnyP::PortCfg *https; +#endif + } Sockaddr; +#if SQUID_SNMP + + struct { + char *configFile; + char *agentInfo; + } Snmp; +#endif +#if USE_WCCP + + struct { + Ip::Address router; + Ip::Address address; + int version; + } Wccp; +#endif +#if USE_WCCPv2 + + struct { + Ip::Address_list *router; + Ip::Address address; + int forwarding_method; + int return_method; + int assignment_method; + int weight; + int rebuildwait; + void *info; + } Wccp2; +#endif + +#if USE_ICMP + IcmpConfig pinger; +#endif + + char *as_whois_server; + + struct { + char *store; + char *swap; + customlog *accesslogs; +#if ICAP_CLIENT + customlog *icaplogs; +#endif + int rotateNumber; + } Log; + char *adminEmail; + char *EmailFrom; + char *EmailProgram; + char *effectiveUser; + char *visible_appname_string; + char *effectiveGroup; + + struct { +#if USE_DNSHELPER + char *dnsserver; +#endif + + wordlist *redirect; +#if USE_UNLINKD + + char *unlinkd; +#endif + + char *diskd; +#if USE_SSL + + char *ssl_password; +#endif + + } Program; +#if USE_DNSHELPER + HelperChildConfig dnsChildren; +#endif + + HelperChildConfig redirectChildren; + time_t authenticateGCInterval; + time_t authenticateTTL; + time_t authenticateIpTTL; + + struct { + char *surrogate_id; + } Accel; + char *appendDomain; + size_t appendDomainLen; + char *pidFilename; + char *netdbFilename; + char *mimeTablePathname; + char *etcHostsPath; + char *visibleHostname; + char *uniqueHostname; + wordlist *hostnameAliases; + char *errHtmlText; + + struct { + char *host; + char *file; + time_t period; + unsigned short port; + } Announce; + + struct { + + Ip::Address udp_incoming; + Ip::Address udp_outgoing; +#if SQUID_SNMP + Ip::Address snmp_incoming; + Ip::Address snmp_outgoing; +#endif + /* FIXME INET6 : this should really be a CIDR value */ + Ip::Address client_netmask; + } Addrs; + size_t tcpRcvBufsz; + size_t udpMaxHitObjsz; + wordlist *hierarchy_stoplist; + wordlist *mcast_group_list; + wordlist *dns_nameservers; + peer *peers; + int npeers; + + struct { + int size; + int low; + int high; + } ipcache; + + struct { + int size; + } fqdncache; + int minDirectHops; + int minDirectRtt; + cachemgr_passwd *passwd_list; + + struct { + int objectsPerBucket; + int64_t avgObjectSize; + int64_t maxObjectSize; + int64_t minObjectSize; + size_t maxInMemObjSize; + } Store; + + struct { + int high; + int low; + time_t period; + } Netdb; + + struct { + int log_udp; + int res_defnames; + int anonymizer; + int client_db; + int query_icmp; + int icp_hit_stale; + int buffered_logs; + int common_log; + int log_mime_hdrs; + int log_fqdn; + int announce; + int mem_pools; + int test_reachability; + int half_closed_clients; + int refresh_all_ims; +#if USE_HTTP_VIOLATIONS + + int reload_into_ims; +#endif + + int offline; + int redir_rewrites_host; + int prefer_direct; + int nonhierarchical_direct; + int strip_query_terms; + int redirector_bypass; + int ignore_unknown_nameservers; + int client_pconns; + int server_pconns; + int error_pconns; +#if USE_CACHE_DIGESTS + + int digest_generation; +#endif + + int ie_refresh; + int vary_ignore_expire; + int pipeline_prefetch; + int surrogate_is_remote; + int request_entities; + int detect_broken_server_pconns; + int balance_on_multiple_ip; + int relaxed_header_parser; + int check_hostnames; + int allow_underscore; + int via; + int emailErrData; + int httpd_suppress_version_string; + int global_internal_static; + +#if FOLLOW_X_FORWARDED_FOR + int acl_uses_indirect_client; + int delay_pool_uses_indirect_client; + int log_uses_indirect_client; +#if LINUX_NETFILTER + int tproxy_uses_indirect_client; +#endif +#endif /* FOLLOW_X_FORWARDED_FOR */ + + int WIN32_IpAddrChangeMonitor; + int memory_cache_first; + int memory_cache_disk; + int hostStrictVerify; + int client_dst_passthru; + } onoff; + + int forward_max_tries; + int connect_retries; + + class ACL *aclList; + + struct { + acl_access *http; + acl_access *adapted_http; + acl_access *icp; + acl_access *miss; + acl_access *NeverDirect; + acl_access *AlwaysDirect; + acl_access *ASlists; + acl_access *noCache; + acl_access *log; +#if SQUID_SNMP + + acl_access *snmp; +#endif +#if USE_HTTP_VIOLATIONS + acl_access *brokenPosts; +#endif + acl_access *redirector; + acl_access *reply; + acl_address *outgoing_address; +#if USE_HTCP + + acl_access *htcp; + acl_access *htcp_clr; +#endif + +#if USE_SSL + acl_access *ssl_bump; +#endif +#if FOLLOW_X_FORWARDED_FOR + acl_access *followXFF; +#endif /* FOLLOW_X_FORWARDED_FOR */ + +#if ICAP_CLIENT + acl_access* icap; +#endif + } accessList; + acl_deny_info_list *denyInfoList; + + struct { + size_t list_width; + int list_wrap; + char *anon_user; + int passive; + int epsv_all; + int epsv; + int eprt; + int sanitycheck; + int telnet; + } Ftp; + refresh_t *Refresh; + + struct _cacheSwap { + RefCount *swapDirs; + int n_allocated; + int n_configured; + /// number of disk processes required to support all cache_dirs + int n_strands; + } cacheSwap; + /* + * I'm sick of having to keep doing this .. + */ +#define INDEXSD(i) (Config.cacheSwap.swapDirs[(i)].getRaw()) + + struct { + char *directory; + int use_short_names; + } icons; + char *errorDirectory; +#if USE_ERR_LOCALES + char *errorDefaultLanguage; + int errorLogMissingLanguages; +#endif + char *errorStylesheet; + + struct { + int onerror; + } retry; + + struct { + int64_t limit; + } MemPools; +#if USE_DELAY_POOLS + + DelayConfig Delay; + ClientDelayConfig ClientDelay; +#endif + + struct { + struct { + int average; + int min_poll; + } dns, udp, tcp; + } comm_incoming; + int max_open_disk_fds; + int uri_whitespace; + acl_size_t *rangeOffsetLimit; +#if MULTICAST_MISS_STREAM + + struct { + + Ip::Address addr; + int ttl; + unsigned short port; + char *encode_key; + } mcast_miss; +#endif + + /// request_header_access and request_header_replace + HeaderManglers *request_header_access; + /// reply_header_access and reply_header_replace + HeaderManglers *reply_header_access; + ///request_header_add access list + HeaderWithAclList *request_header_add; + char *coredump_dir; + char *chroot_dir; +#if USE_CACHE_DIGESTS + + struct { + int bits_per_entry; + time_t rebuild_period; + time_t rewrite_period; + size_t swapout_chunk_size; + int rebuild_chunk_percentage; + } digest; +#endif +#if USE_SSL + + struct { + int unclean_shutdown; + char *ssl_engine; + } SSL; +#endif + + wordlist *ext_methods; + + struct { + int high_rptm; + int high_pf; + size_t high_memory; + } warnings; + char *store_dir_select_algorithm; + int sleep_after_fork; /* microseconds */ + time_t minimum_expiry_time; /* seconds */ + external_acl *externalAclHelperList; + +#if USE_SSL + + struct { + char *cert; + char *key; + int version; + char *options; + char *cipher; + char *cafile; + char *capath; + char *crlfile; + char *flags; + acl_access *cert_error; + SSL_CTX *sslContext; + sslproxy_cert_sign *cert_sign; + sslproxy_cert_adapt *cert_adapt; + } ssl_client; +#endif + + char *accept_filter; + int umask; + int max_filedescriptors; + int workers; + CpuAffinityMap *cpuAffinityMap; + +#if USE_LOADABLE_MODULES + wordlist *loadable_module_names; +#endif + + int client_ip_max_connections; + + struct { + int v4_first; ///< Place IPv4 first in the order of DNS results. + ssize_t packet_max; ///< maximum size EDNS advertised for DNS replies. + } dns; + +}; + +extern SquidConfig Config; + +#endif /* SQUID_SQUIDCONFIG_H_ */ diff --git a/src/SwapDir.cc b/src/SwapDir.cc index b1812ba546..7061dd4f60 100644 --- a/src/SwapDir.cc +++ b/src/SwapDir.cc @@ -36,6 +36,7 @@ #include "ConfigOption.h" #include "globals.h" #include "Parsing.h" +#include "SquidConfig.h" #include "StoreFileSystem.h" #include "SwapDir.h" #include "tools.h" diff --git a/src/SwapDir.h b/src/SwapDir.h index 8006e73ac8..50bd9a141c 100644 --- a/src/SwapDir.h +++ b/src/SwapDir.h @@ -30,6 +30,7 @@ #ifndef SQUID_SWAPDIR_H #define SQUID_SWAPDIR_H +#include "SquidConfig.h" #include "Store.h" #include "StoreIOState.h" diff --git a/src/acl/Acl.cc b/src/acl/Acl.cc index cf517d1421..11245fc0ec 100644 --- a/src/acl/Acl.cc +++ b/src/acl/Acl.cc @@ -37,6 +37,7 @@ #include "Debug.h" #include "dlink.h" #include "globals.h" +#include "SquidConfig.h" const char *AclMatchedName = NULL; diff --git a/src/acl/Asn.cc b/src/acl/Asn.cc index 49aa4858fe..6ed8056cae 100644 --- a/src/acl/Asn.cc +++ b/src/acl/Asn.cc @@ -47,6 +47,7 @@ #include "HttpReply.h" #include "ipcache.h" #include "forward.h" +#include "SquidConfig.h" #include "StoreClient.h" #include "wordlist.h" diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc index 5aeb762f68..8826080472 100644 --- a/src/acl/DestinationIp.cc +++ b/src/acl/DestinationIp.cc @@ -37,6 +37,7 @@ #include "client_side.h" #include "comm/Connection.h" #include "HttpRequest.h" +#include "SquidConfig.h" #include "structs.h" char const * diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc index eea3fd96ea..66ec1307f4 100644 --- a/src/acl/FilledChecklist.cc +++ b/src/acl/FilledChecklist.cc @@ -5,6 +5,7 @@ #include "comm/forward.h" #include "HttpReply.h" #include "HttpRequest.h" +#include "SquidConfig.h" #if USE_AUTH #include "auth/UserRequest.h" #include "auth/AclProxyAuth.h" diff --git a/src/acl/MaxConnection.cc b/src/acl/MaxConnection.cc index 817b99578e..49d97187ac 100644 --- a/src/acl/MaxConnection.cc +++ b/src/acl/MaxConnection.cc @@ -38,6 +38,7 @@ #include "cache_cf.h" #include "client_db.h" #include "Debug.h" +#include "SquidConfig.h" #include "wordlist.h" ACL * diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc index 0e83dd19ad..7fd6798e52 100644 --- a/src/adaptation/icap/Config.cc +++ b/src/adaptation/icap/Config.cc @@ -38,6 +38,7 @@ #include "adaptation/icap/ServiceRep.h" #include "HttpRequest.h" #include "HttpReply.h" +#include "SquidConfig.h" #include "wordlist.h" Adaptation::Icap::Config Adaptation::Icap::TheConfig; diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index 40535721ae..30110d435b 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -17,6 +17,7 @@ #include "globals.h" #include "HttpReply.h" #include "ip/tools.h" +#include "SquidConfig.h" #include "SquidTime.h" CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ServiceRep); diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index 8d09e82799..94d3d4e97f 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -24,6 +24,7 @@ #include "ipcache.h" #include "Mem.h" #include "pconn.h" +#include "SquidConfig.h" #include "SquidTime.h" //CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, Xaction); diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc index f9b743cf76..9231a47af7 100644 --- a/src/adaptation/icap/icap_log.cc +++ b/src/adaptation/icap/icap_log.cc @@ -3,6 +3,7 @@ #include "AccessLogEntry.h" #include "log/File.h" #include "log/Formats.h" +#include "SquidConfig.h" int IcapLogfileStatus = LOG_DISABLE; diff --git a/src/auth/User.cc b/src/auth/User.cc index 46c5eade50..43266f2c31 100644 --- a/src/auth/User.cc +++ b/src/auth/User.cc @@ -40,6 +40,7 @@ #include "acl/Gadgets.h" #include "event.h" #include "globals.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc index 59c9afb948..5d1fb150c0 100644 --- a/src/auth/basic/User.cc +++ b/src/auth/basic/User.cc @@ -2,6 +2,7 @@ #include "auth/basic/auth_basic.h" #include "auth/basic/User.h" #include "Debug.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "structs.h" diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc index 9166e5e32e..31bfd63809 100644 --- a/src/auth/digest/User.cc +++ b/src/auth/digest/User.cc @@ -3,6 +3,7 @@ #include "auth/digest/User.h" #include "Debug.h" #include "dlink.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "structs.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 1d4aa6bad3..c46c505ce8 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -59,6 +59,7 @@ #include "Parsing.h" #include "PeerDigest.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidString.h" #include "Store.h" #include "StoreFileSystem.h" diff --git a/src/cache_manager.cc b/src/cache_manager.cc index cafc1cb332..39fa19917d 100644 --- a/src/cache_manager.cc +++ b/src/cache_manager.cc @@ -49,6 +49,7 @@ #include "mgr/QueryParams.h" #include "protos.h" /* rotate_logs() */ #include "tools.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "wordlist.h" diff --git a/src/carp.cc b/src/carp.cc index fa8ef6ba6b..9f5790b92e 100644 --- a/src/carp.cc +++ b/src/carp.cc @@ -36,6 +36,7 @@ #include "HttpRequest.h" #include "mgr/Registration.h" #include "neighbors.h" +#include "SquidConfig.h" #include "Store.h" #include "URL.h" #include "URLScheme.h" diff --git a/src/client_db.cc b/src/client_db.cc index 7ed485c046..cce0a12c04 100644 --- a/src/client_db.cc +++ b/src/client_db.cc @@ -40,6 +40,7 @@ #include "log/access_log.h" #include "Mem.h" #include "mgr/Registration.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/client_side.cc b/src/client_side.cc index ec8c186e1e..8a30a86851 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -120,6 +120,7 @@ #include "mime_header.h" #include "profiler/Profiler.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "StatHist.h" diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index adc7ccbabc..1a32c3bb76 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -54,6 +54,7 @@ #include "mime_header.h" #include "neighbors.h" #include "refresh.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "StoreClient.h" diff --git a/src/client_side_request.cc b/src/client_side_request.cc index 75c80293b0..8bce891ae1 100644 --- a/src/client_side_request.cc +++ b/src/client_side_request.cc @@ -67,6 +67,7 @@ #include "MemObject.h" #include "Parsing.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "StrList.h" diff --git a/src/comm.cc b/src/comm.cc index 28ff50b4d4..884b6f0c37 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -59,6 +59,7 @@ #include "MemBuf.h" #include "pconn.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "StoreIOBuffer.h" diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc index 4c2ea0398f..e21b7730af 100644 --- a/src/comm/ConnOpener.cc +++ b/src/comm/ConnOpener.cc @@ -12,6 +12,7 @@ #include "globals.h" #include "icmp/net_db.h" #include "ipcache.h" +#include "SquidConfig.h" #include "SquidTime.h" #if HAVE_ERRNO_H diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc index 4a3d2f07a9..1347bd8839 100644 --- a/src/comm/ModPoll.cc +++ b/src/comm/ModPoll.cc @@ -40,6 +40,7 @@ #include "ICP.h" #include "mgr/Registration.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc index b383a3d5c7..6f388157a9 100644 --- a/src/comm/TcpAcceptor.cc +++ b/src/comm/TcpAcceptor.cc @@ -46,6 +46,7 @@ #include "globals.h" #include "ip/Intercept.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/dns_internal.cc b/src/dns_internal.cc index 1c53518001..27578b0daf 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -45,6 +45,7 @@ #include "MemBuf.h" #include "mgr/Registration.h" #include "rfc3596.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "tools.h" diff --git a/src/errorpage.cc b/src/errorpage.cc index 0b596368a6..d4445a29b9 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -46,6 +46,7 @@ #include "fde.h" #include "MemBuf.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "URL.h" #include "URLScheme.h" #include "URL.h" diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc index 0d8005642f..050a46e032 100644 --- a/src/esi/Esi.cc +++ b/src/esi/Esi.cc @@ -60,6 +60,7 @@ #include "Mem.h" #include "MemBuf.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" /* quick reference on behaviour here. * The ESI specification 1.0 requires the ESI processor to be able to diff --git a/src/external_acl.cc b/src/external_acl.cc index 59ffbc19b0..b9cb7d19d8 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -55,6 +55,7 @@ #include "MemBuf.h" #include "mgr/Registration.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidString.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/format/Token.cc b/src/format/Token.cc index bf18b7a3e2..adea6bc852 100644 --- a/src/format/Token.cc +++ b/src/format/Token.cc @@ -2,6 +2,7 @@ #include "format/Config.h" #include "format/Token.h" #include "format/TokenTableEntry.h" +#include "SquidConfig.h" #include "Store.h" const char *Format::log_tags[] = { diff --git a/src/forward.cc b/src/forward.cc index 0e3a2bc63d..072286f6a8 100644 --- a/src/forward.cc +++ b/src/forward.cc @@ -63,6 +63,7 @@ #include "neighbors.h" #include "pconn.h" #include "PeerSelectState.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "StoreClient.h" diff --git a/src/fqdncache.cc b/src/fqdncache.cc index 32d284be69..2530ac8552 100644 --- a/src/fqdncache.cc +++ b/src/fqdncache.cc @@ -36,6 +36,7 @@ #include "event.h" #include "Mem.h" #include "mgr/Registration.h" +#include "SquidConfig.h" #include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc index 7f2ae9344d..b797edd12e 100644 --- a/src/fs/coss/store_dir_coss.cc +++ b/src/fs/coss/store_dir_coss.cc @@ -52,6 +52,7 @@ #include "store_key_md5.h" #include "swap_log_op.h" #include "store_rebuild.h" +#include "SquidConfig.h" #include "SquidMath.h" #if HAVE_ERRNO_H diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc index ab502b8790..8aac78ee12 100644 --- a/src/fs/coss/store_io_coss.cc +++ b/src/fs/coss/store_io_coss.cc @@ -33,13 +33,14 @@ #include "squid.h" #include "CossSwapDir.h" -#include "Store.h" -#include "store_coss.h" -#include "MemObject.h" +#include "DiskIO/DiskIOStrategy.h" #include "fde.h" -#include "SwapDir.h" +#include "MemObject.h" +#include "SquidConfig.h" +#include "store_coss.h" +#include "Store.h" #include "StoreFScoss.h" -#include "DiskIO/DiskIOStrategy.h" +#include "SwapDir.h" CBDATA_TYPE(CossMemBuf); diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 04e3f9f1b9..50bb85105a 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -17,6 +17,7 @@ #include "ipc/mem/Pages.h" #include "MemObject.h" #include "Parsing.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "tools.h" diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc index f028bf1939..141143ed28 100644 --- a/src/fs/ufs/RebuildState.cc +++ b/src/fs/ufs/RebuildState.cc @@ -34,6 +34,7 @@ #include "disk.h" #include "globals.h" #include "RebuildState.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "store_key_md5.h" #include "store_rebuild.h" diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index 3c2c017c1d..3fa84bc461 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -46,6 +46,7 @@ #include "store_key_md5.h" #include "StoreSearchUFS.h" #include "StoreSwapLogData.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "tools.h" diff --git a/src/ftp.cc b/src/ftp.cc index edda7de878..ec3fca075c 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -53,6 +53,7 @@ #include "mime.h" #include "rfc1738.h" #include "Server.h" +#include "SquidConfig.h" #include "SquidString.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/gopher.cc b/src/gopher.cc index 9bd404584a..ce165a9f3c 100644 --- a/src/gopher.cc +++ b/src/gopher.cc @@ -43,6 +43,7 @@ #include "MemBuf.h" #include "mime.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/htcp.cc b/src/htcp.cc index 327770131a..a1d2ae7699 100644 --- a/src/htcp.cc +++ b/src/htcp.cc @@ -49,6 +49,7 @@ #include "md5.h" #include "MemBuf.h" #include "refresh.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "store_key_md5.h" diff --git a/src/http.cc b/src/http.cc index 4ac95981b7..959d439a66 100644 --- a/src/http.cc +++ b/src/http.cc @@ -65,6 +65,7 @@ #include "profiler/Profiler.h" #include "refresh.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/icmp/IcmpSquid.cc b/src/icmp/IcmpSquid.cc index 867547bac3..4d5490be4f 100644 --- a/src/icmp/IcmpSquid.cc +++ b/src/icmp/IcmpSquid.cc @@ -37,6 +37,7 @@ #include "icmp/IcmpSquid.h" #include "icmp/net_db.h" #include "ip/tools.h" +#include "SquidConfig.h" #include "SquidIpc.h" #include "SquidTime.h" diff --git a/src/icp_v2.cc b/src/icp_v2.cc index b55f0671d5..6b253bcd5f 100644 --- a/src/icp_v2.cc +++ b/src/icp_v2.cc @@ -56,6 +56,7 @@ #include "neighbors.h" #include "refresh.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StatCounters.h" #include "Store.h" diff --git a/src/internal.cc b/src/internal.cc index e25a82a27b..15ef9905e7 100644 --- a/src/internal.cc +++ b/src/internal.cc @@ -40,6 +40,7 @@ #include "HttpRequest.h" #include "HttpReply.h" #include "MemBuf.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "tools.h" #include "URL.h" diff --git a/src/ipc.cc b/src/ipc.cc index 5a95b13128..e39e01ba59 100644 --- a/src/ipc.cc +++ b/src/ipc.cc @@ -36,6 +36,7 @@ #include "fde.h" #include "globals.h" #include "ip/Address.h" +#include "SquidConfig.h" #include "SquidIpc.h" #include "tools.h" #include "rfc1738.h" diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc index a05140ab73..6a37122501 100644 --- a/src/ipc/Kids.cc +++ b/src/ipc/Kids.cc @@ -7,6 +7,7 @@ #include "globals.h" #include "ipc/Kids.h" #include "tools.h" +#include "SquidConfig.h" #include "structs.h" Kids TheKids; diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc index 46ca0220c7..bb97d1a1b9 100644 --- a/src/ipc_win32.cc +++ b/src/ipc_win32.cc @@ -38,6 +38,7 @@ #include "fde.h" #include "ip/Address.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidIpc.h" #include "SquidTime.h" #include "tools.h" diff --git a/src/ipcache.cc b/src/ipcache.cc index 57e5f4fd63..08768200ee 100644 --- a/src/ipcache.cc +++ b/src/ipcache.cc @@ -41,6 +41,7 @@ #include "Mem.h" #include "mgr/Registration.h" #include "rfc3596.h" +#include "SquidConfig.h" #include "SquidDns.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc index 290a1e73c8..088a4bbcb5 100644 --- a/src/log/FormatHttpdCombined.cc +++ b/src/log/FormatHttpdCombined.cc @@ -38,6 +38,7 @@ #include "HttpRequest.h" #include "log/File.h" #include "log/Formats.h" +#include "SquidConfig.h" #include "SquidTime.h" void diff --git a/src/log/FormatHttpdCommon.cc b/src/log/FormatHttpdCommon.cc index 6edd8edd71..f9270d6980 100644 --- a/src/log/FormatHttpdCommon.cc +++ b/src/log/FormatHttpdCommon.cc @@ -37,6 +37,7 @@ #include "globals.h" #include "log/File.h" #include "log/Formats.h" +#include "SquidConfig.h" #include "SquidTime.h" void diff --git a/src/log/FormatSquidIcap.cc b/src/log/FormatSquidIcap.cc index 016f0c0f34..928dae31e1 100644 --- a/src/log/FormatSquidIcap.cc +++ b/src/log/FormatSquidIcap.cc @@ -40,6 +40,7 @@ #include "HttpRequest.h" #include "log/File.h" #include "log/Formats.h" +#include "SquidConfig.h" #include "SquidTime.h" void diff --git a/src/log/FormatSquidNative.cc b/src/log/FormatSquidNative.cc index ffe7d324a6..b90153338a 100644 --- a/src/log/FormatSquidNative.cc +++ b/src/log/FormatSquidNative.cc @@ -37,6 +37,7 @@ #include "globals.h" #include "log/File.h" #include "log/Formats.h" +#include "SquidConfig.h" #include "SquidTime.h" void diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc index 567e431d0d..b89f46b47d 100644 --- a/src/log/ModDaemon.cc +++ b/src/log/ModDaemon.cc @@ -39,6 +39,7 @@ #include "log/File.h" #include "log/ModDaemon.h" #include "SquidIpc.h" +#include "SquidConfig.h" #include "SquidTime.h" #if HAVE_ERRNO_H diff --git a/src/log/ModStdio.cc b/src/log/ModStdio.cc index d4669f44b3..32b4832f7f 100644 --- a/src/log/ModStdio.cc +++ b/src/log/ModStdio.cc @@ -37,6 +37,7 @@ #include "globals.h" #include "log/File.h" #include "log/ModStdio.h" +#include "SquidConfig.h" #if HAVE_ERRNO_H #include diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc index db8a9692af..5238c34e10 100644 --- a/src/log/ModTcp.cc +++ b/src/log/ModTcp.cc @@ -40,6 +40,7 @@ #include "log/ModTcp.h" #include "Parsing.h" #include "structs.h" +#include "SquidConfig.h" #if HAVE_ERRNO_H #include diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc index c6fd8c92ba..b6e6425fe4 100644 --- a/src/log/ModUdp.cc +++ b/src/log/ModUdp.cc @@ -39,6 +39,7 @@ #include "log/ModUdp.h" #include "Parsing.h" #include "structs.h" +#include "SquidConfig.h" #if HAVE_ERRNO_H #include diff --git a/src/log/access_log.cc b/src/log/access_log.cc index 1a361d81f2..6822faa86c 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -49,6 +49,7 @@ #include "MemBuf.h" #include "mgr/Registration.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidTime.h" #if USE_SQUID_EUI diff --git a/src/main.cc b/src/main.cc index f07205049b..c529051a84 100644 --- a/src/main.cc +++ b/src/main.cc @@ -83,6 +83,7 @@ #include "send-announce.h" #include "store_log.h" #include "tools.h" +#include "SquidConfig.h" #include "SquidDns.h" #include "SquidTime.h" #include "stat.h" diff --git a/src/mem.cc b/src/mem.cc index 761e553599..6cd3cad16b 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -38,6 +38,7 @@ #include "MemBuf.h" #include "memMeter.h" #include "mgr/Registration.h" +#include "SquidConfig.h" #include "SquidList.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc index cae33cad91..578a6204f4 100644 --- a/src/mgr/BasicActions.cc +++ b/src/mgr/BasicActions.cc @@ -12,6 +12,7 @@ #include "mgr/Registration.h" #include "protos.h" #include "Store.h" +#include "SquidConfig.h" Mgr::IndexAction::Pointer Mgr::IndexAction::Create(const Command::Pointer &cmd) diff --git a/src/mime.cc b/src/mime.cc index da60fe056e..0d49ba7f58 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -43,6 +43,7 @@ #include "MemBuf.h" #include "mime.h" #include "MemObject.h" +#include "SquidConfig.h" #include "Store.h" #include "StoreClient.h" diff --git a/src/neighbors.cc b/src/neighbors.cc index a8a4bc9f06..ce4cc0dbcd 100644 --- a/src/neighbors.cc +++ b/src/neighbors.cc @@ -53,6 +53,7 @@ #include "neighbors.h" #include "PeerDigest.h" #include "PeerSelectState.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "SquidTime.h" #include "stat.h" diff --git a/src/pconn.cc b/src/pconn.cc index c66b15626e..0375c7ebd6 100644 --- a/src/pconn.cc +++ b/src/pconn.cc @@ -38,6 +38,7 @@ #include "globals.h" #include "mgr/Registration.h" #include "pconn.h" +#include "SquidConfig.h" #include "Store.h" #define PCONN_FDS_SZ 8 /* pconn set size, increase for better memcache hit rate */ diff --git a/src/peer_select.cc b/src/peer_select.cc index 94d3f4de39..0322611c2c 100644 --- a/src/peer_select.cc +++ b/src/peer_select.cc @@ -50,6 +50,7 @@ #include "peer_sourcehash.h" #include "peer_userhash.h" #include "PeerSelectState.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc index 55774aebe6..0ea8d8836a 100644 --- a/src/peer_sourcehash.cc +++ b/src/peer_sourcehash.cc @@ -36,6 +36,7 @@ #include "HttpRequest.h" #include "mgr/Registration.h" #include "neighbors.h" +#include "SquidConfig.h" #include "Store.h" #if HAVE_MATH_H diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc index 2cd385f8e2..d9c84e92bd 100644 --- a/src/peer_userhash.cc +++ b/src/peer_userhash.cc @@ -41,6 +41,7 @@ #include "HttpRequest.h" #include "mgr/Registration.h" #include "neighbors.h" +#include "SquidConfig.h" #include "Store.h" #if HAVE_MATH_H diff --git a/src/redirect.cc b/src/redirect.cc index ef46b9cffc..bb021be12a 100644 --- a/src/redirect.cc +++ b/src/redirect.cc @@ -44,6 +44,7 @@ #include "mgr/Registration.h" #include "redirect.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "Store.h" #if USE_AUTH #include "auth/UserRequest.h" diff --git a/src/refresh.cc b/src/refresh.cc index 15b39cefaf..a7d4bd8486 100644 --- a/src/refresh.cc +++ b/src/refresh.cc @@ -42,6 +42,7 @@ #include "HttpReply.h" #include "MemObject.h" #include "SquidTime.h" +#include "SquidConfig.h" #include "Store.h" #include "URL.h" diff --git a/src/send-announce.cc b/src/send-announce.cc index b96cc88ce9..45519dd875 100644 --- a/src/send-announce.cc +++ b/src/send-announce.cc @@ -39,6 +39,7 @@ #include "globals.h" #include "ICP.h" #include "ipcache.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "tools.h" diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc index 247875c3b9..4f0a103328 100644 --- a/src/snmp_agent.cc +++ b/src/snmp_agent.cc @@ -39,6 +39,7 @@ #include "snmp_core.h" #include "StatCounters.h" #include "StatHist.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "SquidTime.h" #include "stat.h" diff --git a/src/snmp_core.cc b/src/snmp_core.cc index 235bca50b5..a26e80edaf 100644 --- a/src/snmp_core.cc +++ b/src/snmp_core.cc @@ -42,6 +42,7 @@ #include "snmp_agent.h" #include "snmp_core.h" #include "snmp/Forwarder.h" +#include "SquidConfig.h" #include "tools.h" static void snmpPortOpened(const Comm::ConnectionPointer &conn, int errNo); diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc index 0f76cebf0b..6c8803b99f 100644 --- a/src/ssl/helper.cc +++ b/src/ssl/helper.cc @@ -1,7 +1,3 @@ -/* - * 2008/11/14 - */ - #include "squid.h" #include "anyp/PortCfg.h" #include "ssl/Config.h" @@ -10,6 +6,7 @@ #include "SquidTime.h" #include "SwapDir.h" #include "wordlist.h" +#include "SquidConfig.h" Ssl::Helper * Ssl::Helper::GetInstance() { diff --git a/src/ssl/support.cc b/src/ssl/support.cc index 8d01d9a5aa..fc25588c9f 100644 --- a/src/ssl/support.cc +++ b/src/ssl/support.cc @@ -41,6 +41,7 @@ #include "acl/FilledChecklist.h" #include "fde.h" #include "globals.h" +#include "SquidConfig.h" #include "ssl/ErrorDetail.h" #include "ssl/support.h" #include "ssl/gadgets.h" diff --git a/src/stat.cc b/src/stat.cc index 4781a027e8..cbb47a3b2d 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -53,6 +53,7 @@ #include "mgr/ServiceTimesAction.h" #include "neighbors.h" #include "PeerDigest.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "SquidTime.h" #include "StatCounters.h" diff --git a/src/store.cc b/src/store.cc index 9d7f77e9bb..2e2213f808 100644 --- a/src/store.cc +++ b/src/store.cc @@ -48,6 +48,7 @@ #include "mgr/StoreIoAction.h" #include "profiler/Profiler.h" #include "repl_modules.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Stack.h" #include "StatCounters.h" diff --git a/src/store_client.cc b/src/store_client.cc index 2c4db1c688..bd9949dd13 100644 --- a/src/store_client.cc +++ b/src/store_client.cc @@ -40,6 +40,7 @@ #include "MemObject.h" #include "mime_header.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "StatCounters.h" #include "StoreClient.h" #include "Store.h" diff --git a/src/store_digest.cc b/src/store_digest.cc index 6a56d055e7..784fbbe2b1 100644 --- a/src/store_digest.cc +++ b/src/store_digest.cc @@ -51,6 +51,7 @@ #include "MemObject.h" #include "PeerDigest.h" #include "refresh.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "Store.h" #include "StoreSearch.h" diff --git a/src/store_dir.cc b/src/store_dir.cc index de10f782e2..d8acbdb02c 100644 --- a/src/store_dir.cc +++ b/src/store_dir.cc @@ -37,6 +37,7 @@ #include "MemObject.h" #include "MemStore.h" #include "profiler/Profiler.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "SquidTime.h" #include "Store.h" diff --git a/src/store_io.cc b/src/store_io.cc index 797a5b3415..403a050a56 100644 --- a/src/store_io.cc +++ b/src/store_io.cc @@ -1,6 +1,7 @@ #include "squid.h" #include "Store.h" #include "MemObject.h" +#include "SquidConfig.h" #include "SwapDir.h" StoreIoStats store_io_stats; diff --git a/src/store_log.cc b/src/store_log.cc index 093040a029..9464857f32 100644 --- a/src/store_log.cc +++ b/src/store_log.cc @@ -38,6 +38,7 @@ #include "mgr/Registration.h" #include "Store.h" #include "store_log.h" +#include "SquidConfig.h" #include "SquidTime.h" static const char *storeLogTags[] = { diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc index f4b1370ba4..5098bfd4b7 100644 --- a/src/store_rebuild.cc +++ b/src/store_rebuild.cc @@ -41,6 +41,7 @@ #include "store_digest.h" #include "store_rebuild.h" #include "StoreSearch.h" +#include "SquidConfig.h" #include "SquidTime.h" #if HAVE_ERRNO_H diff --git a/src/store_swapout.cc b/src/store_swapout.cc index 4281334e0c..f148c68aa1 100644 --- a/src/store_swapout.cc +++ b/src/store_swapout.cc @@ -39,6 +39,7 @@ /* FIXME: Abstract the use of this more */ #include "mem_node.h" #include "MemObject.h" +#include "SquidConfig.h" #include "SwapDir.h" #include "StatCounters.h" #include "store_log.h" diff --git a/src/structs.h b/src/structs.h index 7e473ac368..804a03a59b 100644 --- a/src/structs.h +++ b/src/structs.h @@ -169,486 +169,6 @@ private: int option; ///< configured value or zero }; -struct SquidConfig { - - struct { - /* These should be for the Store::Root instance. - * this needs pluggable parsing to be done smoothly. - */ - int highWaterMark; - int lowWaterMark; - } Swap; - - YesNoNone memShared; ///< whether the memory cache is shared among workers - size_t memMaxSize; - - struct { - int64_t min; - int pct; - int64_t max; - } quickAbort; - int64_t readAheadGap; - RemovalPolicySettings *replPolicy; - RemovalPolicySettings *memPolicy; -#if USE_HTTP_VIOLATIONS - time_t negativeTtl; -#endif - time_t maxStale; - time_t negativeDnsTtl; - time_t positiveDnsTtl; - time_t shutdownLifetime; - time_t backgroundPingRate; - - struct { - time_t read; - time_t write; - time_t lifetime; - time_t connect; - time_t forward; - time_t peer_connect; - time_t request; - time_t clientIdlePconn; - time_t serverIdlePconn; - time_t siteSelect; - time_t deadPeer; - int icp_query; /* msec */ - int icp_query_max; /* msec */ - int icp_query_min; /* msec */ - int mcast_icp_query; /* msec */ - -#if !USE_DNSHELPER - time_msec_t idns_retransmit; - time_msec_t idns_query; -#endif - - } Timeout; - size_t maxRequestHeaderSize; - int64_t maxRequestBodySize; - int64_t maxChunkedRequestBodySize; - size_t maxRequestBufferSize; - size_t maxReplyHeaderSize; - acl_size_t *ReplyBodySize; - - struct { - unsigned short icp; -#if USE_HTCP - - unsigned short htcp; -#endif -#if SQUID_SNMP - - unsigned short snmp; -#endif - } Port; - - struct { - AnyP::PortCfg *http; -#if USE_SSL - AnyP::PortCfg *https; -#endif - } Sockaddr; -#if SQUID_SNMP - - struct { - char *configFile; - char *agentInfo; - } Snmp; -#endif -#if USE_WCCP - - struct { - Ip::Address router; - Ip::Address address; - int version; - } Wccp; -#endif -#if USE_WCCPv2 - - struct { - Ip::Address_list *router; - Ip::Address address; - int forwarding_method; - int return_method; - int assignment_method; - int weight; - int rebuildwait; - void *info; - } Wccp2; -#endif - -#if USE_ICMP - IcmpConfig pinger; -#endif - - char *as_whois_server; - - struct { - char *store; - char *swap; - customlog *accesslogs; -#if ICAP_CLIENT - customlog *icaplogs; -#endif - int rotateNumber; - } Log; - char *adminEmail; - char *EmailFrom; - char *EmailProgram; - char *effectiveUser; - char *visible_appname_string; - char *effectiveGroup; - - struct { -#if USE_DNSHELPER - char *dnsserver; -#endif - - wordlist *redirect; -#if USE_UNLINKD - - char *unlinkd; -#endif - - char *diskd; -#if USE_SSL - - char *ssl_password; -#endif - - } Program; -#if USE_DNSHELPER - HelperChildConfig dnsChildren; -#endif - - HelperChildConfig redirectChildren; - time_t authenticateGCInterval; - time_t authenticateTTL; - time_t authenticateIpTTL; - - struct { - char *surrogate_id; - } Accel; - char *appendDomain; - size_t appendDomainLen; - char *pidFilename; - char *netdbFilename; - char *mimeTablePathname; - char *etcHostsPath; - char *visibleHostname; - char *uniqueHostname; - wordlist *hostnameAliases; - char *errHtmlText; - - struct { - char *host; - char *file; - time_t period; - unsigned short port; - } Announce; - - struct { - - Ip::Address udp_incoming; - Ip::Address udp_outgoing; -#if SQUID_SNMP - Ip::Address snmp_incoming; - Ip::Address snmp_outgoing; -#endif - /* FIXME INET6 : this should really be a CIDR value */ - Ip::Address client_netmask; - } Addrs; - size_t tcpRcvBufsz; - size_t udpMaxHitObjsz; - wordlist *hierarchy_stoplist; - wordlist *mcast_group_list; - wordlist *dns_nameservers; - peer *peers; - int npeers; - - struct { - int size; - int low; - int high; - } ipcache; - - struct { - int size; - } fqdncache; - int minDirectHops; - int minDirectRtt; - cachemgr_passwd *passwd_list; - - struct { - int objectsPerBucket; - int64_t avgObjectSize; - int64_t maxObjectSize; - int64_t minObjectSize; - size_t maxInMemObjSize; - } Store; - - struct { - int high; - int low; - time_t period; - } Netdb; - - struct { - int log_udp; - int res_defnames; - int anonymizer; - int client_db; - int query_icmp; - int icp_hit_stale; - int buffered_logs; - int common_log; - int log_mime_hdrs; - int log_fqdn; - int announce; - int mem_pools; - int test_reachability; - int half_closed_clients; - int refresh_all_ims; -#if USE_HTTP_VIOLATIONS - - int reload_into_ims; -#endif - - int offline; - int redir_rewrites_host; - int prefer_direct; - int nonhierarchical_direct; - int strip_query_terms; - int redirector_bypass; - int ignore_unknown_nameservers; - int client_pconns; - int server_pconns; - int error_pconns; -#if USE_CACHE_DIGESTS - - int digest_generation; -#endif - - int ie_refresh; - int vary_ignore_expire; - int pipeline_prefetch; - int surrogate_is_remote; - int request_entities; - int detect_broken_server_pconns; - int balance_on_multiple_ip; - int relaxed_header_parser; - int check_hostnames; - int allow_underscore; - int via; - int emailErrData; - int httpd_suppress_version_string; - int global_internal_static; - -#if FOLLOW_X_FORWARDED_FOR - int acl_uses_indirect_client; - int delay_pool_uses_indirect_client; - int log_uses_indirect_client; -#if LINUX_NETFILTER - int tproxy_uses_indirect_client; -#endif -#endif /* FOLLOW_X_FORWARDED_FOR */ - - int WIN32_IpAddrChangeMonitor; - int memory_cache_first; - int memory_cache_disk; - int hostStrictVerify; - int client_dst_passthru; - } onoff; - - int forward_max_tries; - int connect_retries; - - class ACL *aclList; - - struct { - acl_access *http; - acl_access *adapted_http; - acl_access *icp; - acl_access *miss; - acl_access *NeverDirect; - acl_access *AlwaysDirect; - acl_access *ASlists; - acl_access *noCache; - acl_access *log; -#if SQUID_SNMP - - acl_access *snmp; -#endif -#if USE_HTTP_VIOLATIONS - acl_access *brokenPosts; -#endif - acl_access *redirector; - acl_access *reply; - acl_address *outgoing_address; -#if USE_HTCP - - acl_access *htcp; - acl_access *htcp_clr; -#endif - -#if USE_SSL - acl_access *ssl_bump; -#endif -#if FOLLOW_X_FORWARDED_FOR - acl_access *followXFF; -#endif /* FOLLOW_X_FORWARDED_FOR */ - -#if ICAP_CLIENT - acl_access* icap; -#endif - } accessList; - acl_deny_info_list *denyInfoList; - - struct { - size_t list_width; - int list_wrap; - char *anon_user; - int passive; - int epsv_all; - int epsv; - int eprt; - int sanitycheck; - int telnet; - } Ftp; - refresh_t *Refresh; - - struct _cacheSwap { - RefCount *swapDirs; - int n_allocated; - int n_configured; - /// number of disk processes required to support all cache_dirs - int n_strands; - } cacheSwap; - /* - * I'm sick of having to keep doing this .. - */ -#define INDEXSD(i) (Config.cacheSwap.swapDirs[(i)].getRaw()) - - struct { - char *directory; - int use_short_names; - } icons; - char *errorDirectory; -#if USE_ERR_LOCALES - char *errorDefaultLanguage; - int errorLogMissingLanguages; -#endif - char *errorStylesheet; - - struct { - int onerror; - } retry; - - struct { - int64_t limit; - } MemPools; -#if USE_DELAY_POOLS - - DelayConfig Delay; - ClientDelayConfig ClientDelay; -#endif - - struct { - struct { - int average; - int min_poll; - } dns, udp, tcp; - } comm_incoming; - int max_open_disk_fds; - int uri_whitespace; - acl_size_t *rangeOffsetLimit; -#if MULTICAST_MISS_STREAM - - struct { - - Ip::Address addr; - int ttl; - unsigned short port; - char *encode_key; - } mcast_miss; -#endif - - /// request_header_access and request_header_replace - HeaderManglers *request_header_access; - /// reply_header_access and reply_header_replace - HeaderManglers *reply_header_access; - ///request_header_add access list - HeaderWithAclList *request_header_add; - char *coredump_dir; - char *chroot_dir; -#if USE_CACHE_DIGESTS - - struct { - int bits_per_entry; - time_t rebuild_period; - time_t rewrite_period; - size_t swapout_chunk_size; - int rebuild_chunk_percentage; - } digest; -#endif -#if USE_SSL - - struct { - int unclean_shutdown; - char *ssl_engine; - } SSL; -#endif - - wordlist *ext_methods; - - struct { - int high_rptm; - int high_pf; - size_t high_memory; - } warnings; - char *store_dir_select_algorithm; - int sleep_after_fork; /* microseconds */ - time_t minimum_expiry_time; /* seconds */ - external_acl *externalAclHelperList; - -#if USE_SSL - - struct { - char *cert; - char *key; - int version; - char *options; - char *cipher; - char *cafile; - char *capath; - char *crlfile; - char *flags; - acl_access *cert_error; - SSL_CTX *sslContext; - sslproxy_cert_sign *cert_sign; - sslproxy_cert_adapt *cert_adapt; - } ssl_client; -#endif - - char *accept_filter; - int umask; - int max_filedescriptors; - int workers; - CpuAffinityMap *cpuAffinityMap; - -#if USE_LOADABLE_MODULES - wordlist *loadable_module_names; -#endif - - int client_ip_max_connections; - - struct { - int v4_first; ///< Place IPv4 first in the order of DNS results. - ssize_t packet_max; ///< maximum size EDNS advertised for DNS replies. - } dns; -}; - -SQUIDCEXTERN SquidConfig Config; - struct SquidConfig2 { struct { int enable_purge; diff --git a/src/tests/testCoss.cc b/src/tests/testCoss.cc index 5e5fc4aa28..ba48d2ee10 100644 --- a/src/tests/testCoss.cc +++ b/src/tests/testCoss.cc @@ -11,6 +11,7 @@ #include "HttpReply.h" #include "StoreFileSystem.h" #include "testStoreSupport.h" +#include "SquidConfig.h" #if HAVE_STDEXCEPT #include diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc index 33ebc46a02..8c6c910331 100644 --- a/src/tests/testHttpParser.cc +++ b/src/tests/testHttpParser.cc @@ -8,6 +8,7 @@ #include "Mem.h" #include "MemBuf.h" #include "structs.h" +#include "SquidConfig.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpParser ); diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc index 3a819adb4f..e393898de8 100644 --- a/src/tests/testHttpReply.cc +++ b/src/tests/testHttpReply.cc @@ -7,10 +7,11 @@ #include "HttpReply.h" #include "Mem.h" #include "mime_header.h" +#include "SquidConfig.h" CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply ); -struct SquidConfig Config; +class SquidConfig Config; /* stub functions to link successfully */ diff --git a/src/tests/testNull.cc b/src/tests/testNull.cc index 5f4ce2ab8f..eb9cba8af6 100644 --- a/src/tests/testNull.cc +++ b/src/tests/testNull.cc @@ -9,6 +9,7 @@ #include "MemObject.h" #include "HttpHeader.h" #include "HttpReply.h" +#include "SquidConfig.h" #include "StoreFileSystem.h" #include "testStoreSupport.h" diff --git a/src/tests/testRock.cc b/src/tests/testRock.cc index 088e347c77..de5167dd2b 100644 --- a/src/tests/testRock.cc +++ b/src/tests/testRock.cc @@ -8,6 +8,7 @@ #include "HttpReply.h" #include "Mem.h" #include "MemObject.h" +#include "SquidConfig.h" #include "Store.h" #include "StoreFileSystem.h" #include "StoreSearch.h" diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc index a7d53229d1..21e62cece9 100644 --- a/src/tests/testStoreController.cc +++ b/src/tests/testStoreController.cc @@ -6,6 +6,7 @@ #include "SwapDir.h" #include "TestSwapDir.h" #include "Mem.h" +#include "SquidConfig.h" #include "SquidTime.h" #include "StoreSearch.h" diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc index daae502a04..9d320794f4 100644 --- a/src/tests/testStoreHashIndex.cc +++ b/src/tests/testStoreHashIndex.cc @@ -8,6 +8,7 @@ #include "StoreHashIndex.h" #include "Mem.h" #include "StoreSearch.h" +#include "SquidConfig.h" #include "SquidTime.h" CPPUNIT_TEST_SUITE_REGISTRATION( testStoreHashIndex ); diff --git a/src/tests/testUfs.cc b/src/tests/testUfs.cc index 8080bbd531..87a99767f7 100644 --- a/src/tests/testUfs.cc +++ b/src/tests/testUfs.cc @@ -8,6 +8,7 @@ #include "HttpReply.h" #include "Mem.h" #include "MemObject.h" +#include "SquidConfig.h" #include "Store.h" #include "SwapDir.h" #include "testStoreSupport.h" diff --git a/src/tools.cc b/src/tools.cc index 8c69c3570e..3676d0ad7e 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -42,6 +42,7 @@ #include "ip/QosConfig.h" #include "MemBuf.h" #include "anyp/PortCfg.h" +#include "SquidConfig.h" #include "SquidMath.h" #include "SquidTime.h" #include "ipc/Kids.h" diff --git a/src/tunnel.cc b/src/tunnel.cc index d42ebc8987..b1ed03c7b8 100644 --- a/src/tunnel.cc +++ b/src/tunnel.cc @@ -46,6 +46,7 @@ #include "MemBuf.h" #include "http.h" #include "PeerSelectState.h" +#include "SquidConfig.h" #include "StatCounters.h" #include "tools.h" diff --git a/src/url.cc b/src/url.cc index e701f2cc40..5377b1f482 100644 --- a/src/url.cc +++ b/src/url.cc @@ -35,6 +35,7 @@ #include "globals.h" #include "HttpRequest.h" #include "rfc1738.h" +#include "SquidConfig.h" #include "SquidString.h" #include "URL.h" #include "URLScheme.h" diff --git a/src/wccp.cc b/src/wccp.cc index 78308fcb61..dd77871620 100644 --- a/src/wccp.cc +++ b/src/wccp.cc @@ -37,6 +37,7 @@ #include "comm/Connection.h" #include "comm/Loops.h" #include "event.h" +#include "SquidConfig.h" #include "structs.h" #define WCCP_PORT 2048 diff --git a/src/whois.cc b/src/whois.cc index 445ddfa216..35bde794f9 100644 --- a/src/whois.cc +++ b/src/whois.cc @@ -39,6 +39,7 @@ #include "HttpRequest.h" #include "HttpRequest.h" #include "forward.h" +#include "SquidConfig.h" #include "StatCounters.h" #include "Store.h" #include "tools.h"