Moved SquidConfig definition from structs.h to own header file.

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 05a9d3179edba970d3082d3ef77adc65c6202957..df2402fc94273df2e64036a3e157a6d141959ece 100644 (file)
--- 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 7cecee29bd93c169744a96cfcfe58c84f0e28432..9d5f2fbdc041b28bcc60092bcf39f8f39b40bf5a 100644 (file)
--- 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 0103d607d4ca223845538de5c7d0c8ac65f25e4f..0108ac3afd3701daf9e7193198b3652d7e30d109 100644 (file)
--- 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 eeef9b71f928d6aaeb8cc426011606fe651dd64e..7527e6915345381365c107b27e9d6c4cda7fc24e 100644 (file)
--- 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 99048a614ba9b807cc2179c7b6a47afb2b0f8385..aa07e33be6ce2a6d361d7f302cc3733ec4d13b2a 100644 (file)
--- 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 61e379cb5d70452364a94d92ed4649721d7b6dc2..8d0da2a9d403dc2ce06aa811b1df62ddc646dc48 100644 (file)
--- 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 d6e684583013b04e1f9c4b9906a5251ea9260170..2059dfeb3ea8eeab8cc34d49787c6f134aadb5fa 100644 (file)
--- a/src/DiskIO/DiskThreads/aiops.cc
+++ b/src/DiskIO/DiskThreads/aiops.cc
@@ -36,16 +36,17 @@
 
 #include "squid.h"
 #include "DiskThreads.h"
-
-#include       <stdio.h>
-#include       <sys/stat.h>
-#include       <fcntl.h>
-#include       <pthread.h>
-#include       <errno.h>
-#include       <dirent.h>
-#include       <signal.h>
+#include "SquidConfig.h"
+
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <errno.h>
+#include <dirent.h>
+#include <signal.h>
 #if HAVE_SCHED_H
-#include       <sched.h>
+#include <sched.h>
 #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 cc1300d26fee33d506c8f6591ac6dcc2dc74c06f..9523acbef2b8ea898ef1ad0d87ce9614f74a33b4 100644 (file)
--- 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       <stdio.h>
-#include       <sys/stat.h>
-#include       <fcntl.h>
-#include       <errno.h>
-#include       <dirent.h>
-#include       <signal.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <dirent.h>
+#include <signal.h>
 
 #define RIDICULOUS_LENGTH      4096
 

diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc
index 8832487183c5b38b4d050f3e481ab5af68c40fd3..83d8f13f86cfb4c8223a94d792986dbd6acc626b 100644 (file)
--- 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 ee10a780345a522fb32658d1d6b372b580ea06fc..212916953917fbc298fcfe902c4ddb23bfdccd9a 100644 (file)
--- 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 f4bc95a278ce1eee80fdc19af269d5414a1e7c5d..5f12ab21ccd058a9cc64681f8c135ebd2c6f47db 100644 (file)
--- 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 4ef8d53161d7ce8e3231f650b0aed6d8581ee503..88d22f0f631a76635c60f348573cea3d0c119aa9 100644 (file)
--- 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 8193c0aebde80a81aa109bfcb61db392e88121a9..0ef9ed3b0bf393d4f620ebebe103b14ce450afd9 100644 (file)
--- 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 aa940c94dfc28fce0b79ad67d1df1a17739ee55d..5782f2dc6546a078bac91fde5cc9aac7cda3689e 100644 (file)
--- 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 784e5ec784e954ca230d7a8d34b2499a52486ad4..20a13379c711e6ff3dfc0631e53be51b3b0be8eb 100644 (file)
--- 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 7aef78ee3a2b9e42fbc99cb346face3c06628cfa..0a3bd3bf717e27c43a04865fee5bacb86727b91f 100644 (file)
--- a/src/HttpRequestMethod.h
+++ b/src/HttpRequestMethod.h
@@ -34,6 +34,8 @@
 #include "SquidString.h"
 #include "structs.h"
 
+class SquidConfig;
+
 #include <iosfwd>
 
 enum _method_t {

diff --git a/src/MemObject.cc b/src/MemObject.cc
index e2e7c818efda66198c3a78e964c49556b3f433ec..ecee3fdc7639ee0d7d3787d6b71ec178686b1b9e 100644 (file)
--- 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 090106b3168f383a76b9401db37020b7eea4a5f6..c6fb09b947ffb88c1ac2bae7dadc8b63d4469a79 100644 (file)
--- 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 af342bf1117279e12784e1da388d617d55378770..d295a9cd9ca2df19799e5a3a62356b6f39be4415 100644 (file)
--- 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 c9fe7dafa5c35c583f5d613acdb4285aa2a7eff8..a51b129697c51aa306aa0cdae04883740b9b10be 100644 (file)
--- 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 24104e239b5af07dc9a579135837e0a33f496d84..e1b951088602805f58899430b877dd0bb3d58dc6 100644 (file)
--- 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 (file)
index 0000000..54c62b8
--- /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<SwapDir> *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 b1812ba546c38ddd06dabbb6886e4b1780e8bb95..7061dd4f603cc1428b1f2430daee46c31748612c 100644 (file)
--- 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 8006e73ac8b4a5ffb93e73b774b0499bd71334ff..50bd9a141c68e1c7d8114560adc7d3367a2c367c 100644 (file)
--- 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 cf517d1421660569a4db5f1c1b58896c533b2643..11245fc0ec6969d299b91e1f0b2f6f493620b142 100644 (file)
--- 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 49aa4858fe4992de5a817efb6244350afc9da168..6ed8056caefe4419953bb6c1aeb85dc5f629c9b2 100644 (file)
--- 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 5aeb762f687170ed964c9f0d03060f7b44c1fb99..8826080472d07fdd0c97949f4d2f619b151868a2 100644 (file)
--- 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 eea3fd96ea706a5664f067ffbc5a138b2f7de23b..66ec1307f4a2c990c156e169686d24da0ef4d868 100644 (file)
--- 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 817b99578ed5a1b19f6d411ac5fdadfe53cdc45a..49d97187ac0b66a8fecb0c65bd8b9ae0c2bdf8b0 100644 (file)
--- 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 0e83dd19ad191f590d791e54b85d692a7c38efcb..7fd6798e52636a6b18ae9777c32a72d9906abd76 100644 (file)
--- 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 40535721ae48f4829f0142e9b340993d687029f0..30110d435b547f8bb3144bdfbb4bcbd446ce3198 100644 (file)
--- 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 8d09e827991c4d775633b654841fb896cf1f6da4..94d3d4e97f0fdc70558eb4bfdaaa575d78afb3ea 100644 (file)
--- 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 f9b743cf7690b1baefbf5051b83e73caffb97970..9231a47af791a29c4a982292b9128d9f6575961a 100644 (file)
--- 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 46c5eade501e8d6510dc56ca2b1be2c4a948f1a1..43266f2c318f7bad98497fe8bd7da4e8d90e8a7b 100644 (file)
--- 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 59c9afb948859624645e3597f621ed53d47a426f..5d1fb150c074ce123986b771a15d3075aed2f140 100644 (file)
--- 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 9166e5e32eeddfc02533fe4c2a0253ca650c2207..31bfd638096bd9d11203b06fedbb14b140d292e7 100644 (file)
--- 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 1d4aa6bad381260204a3eec8f0d29746f8484e84..c46c505ce8604ffffd70c24eaea25c9f17002e26 100644 (file)
--- 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 cafc1cb332731dc05e0c0a1217b8c26f5e631091..39fa19917d77117a1450bf8e6775adb375f0b1f8 100644 (file)
--- 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 fa8ef6ba6b296260d4ee1ab6a5708a2f12f28883..9f5790b92e12fca9e953ca45873dc401c1ee60d0 100644 (file)
--- 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 7ed485c04679392e276daefb82929f6955f19ff5..cce0a12c042fe11b08fcbdb469c35027e9fa0d9b 100644 (file)
--- 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 ec8c186e1ec47276ccf23d2c068ebb1b5728ac71..8a30a868518addb306efe1d9c33bf42216fb3f94 100644 (file)
--- 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 adc7ccbabc2afde95cc998e9961f2f0be2784cea..1a32c3bb760aaddcd0be8c4766915498f41a9a9f 100644 (file)
--- 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 75c80293b04a1d5e84c24a1c6370f38577079f16..8bce891ae14a68a3f3893b1d68f4c2260d86b6d7 100644 (file)
--- 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 28ff50b4d42efd4965c0f10516aa31e2a1861293..884b6f0c376640e9b12fed6716052f0a5a1693c0 100644 (file)
--- 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 4c2ea0398fcd665be92f1d627f7323e2dfe00b0c..e21b7730af9a12b2e416b9000cfae417f2073de5 100644 (file)
--- 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 4a3d2f07a973e14e3f71618d38a7bf581e5dc773..1347bd8839df22102a5959be5e282accdcb32c88 100644 (file)
--- 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 b383a3d5c79453c91ff41c2f618b9e0ba3b2af6a..6f388157a93ab872f71d1f81e868413317a446a8 100644 (file)
--- 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 1c53518001f5e9b7cabb74ae6fbdf579838649a9..27578b0dafc80d12399367e966460b358d898495 100644 (file)
--- 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 0b596368a610a2206615c94b782f885d2b4db5bd..d4445a29b94debb1bf063de6f97ebcf1762505d4 100644 (file)
--- 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 0d8005642f242681f4e7fa4100d4abc655408c8f..050a46e032426384a6d9814e9f6051d6f07aede6 100644 (file)
--- 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 59ffbc19b0ee04e12d365635b0d12bb7e193137f..b9cb7d19d841274f875386eca8c84578495e9899 100644 (file)
--- 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 bf18b7a3e266e61b2bc3f08449cbe43e245ca337..adea6bc852506e68c30619851b9ba0c5723ccae6 100644 (file)
--- 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 0e3a2bc63d508493e6a8736cd199cffda61e14a9..072286f6a81454a24810da82e7e998f1f2ab7069 100644 (file)
--- 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 32d284be69735c94bc7b26567c770095a73e6e88..2530ac85520eb50b7c34cbe10220d8f36267e4bd 100644 (file)
--- 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 7f2ae9344dca13b458641da9cc98b5cae05b7d74..b797edd12ef016a455fcde318bbd0d16bf42c8d3 100644 (file)
--- 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 ab502b879005c4dae2d5aa2f957ae306453d3a1f..8aac78ee1295d8269c76219e258cec3e2cd15736 100644 (file)
--- 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 04e3f9f1b98f7236db9b5c301ffd0545ee6f854b..50bb85105a3d82fcab2405dc543ab3ced7dcbebb 100644 (file)
--- 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 f028bf19390f192e78015a917b9f7b95e94d19e9..141143ed28aa0fb957ce95627c5285c4b1cbd8c8 100644 (file)
--- 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 3c2c017c1d1c01183cac86dc585cdf7e9317fd1d..3fa84bc4618a74ef767d06bd215c1237b0fd6c6a 100644 (file)
--- 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 edda7de878a9baab8ed940fabc9278d50c98f620..ec3fca075c227269d7a9f55912b6df5c3f7c3938 100644 (file)
--- 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 9bd404584a479656e730ff3894501b9d8ee77dd3..ce165a9f3cdb5573112646129d4b2deb7169fe5e 100644 (file)
--- 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 327770131a5e6649a65e43115980474b856b52eb..a1d2ae769902558efd3cac215cbf26de218c8b4a 100644 (file)
--- 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 4ac95981b783df427ccbdd51a1c777fe04729656..959d439a661dd12ef5d189c64eb1a3afcd25ef0e 100644 (file)
--- 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 867547bac3239ae53ee5a3e22b7e364c2ae852b0..4d5490be4f64bdc6fc509e48ee6c51723d162c02 100644 (file)
--- 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 b55f0671d597e668fe11b85a89c11b568b11bfd2..6b253bcd5f01e0a39c3e86e332646b8f7b34b538 100644 (file)
--- 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 e25a82a27b6d591ae6c5ec12007cec6115513a1a..15ef9905e756ff830a19e6a98892616dd8cb8218 100644 (file)
--- 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 5a95b131284a90509b7d1564f5ad40dbaa350e2f..e39e01ba595fe7cd59cfd8d9248b0e9d8e18adf9 100644 (file)
--- 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 a05140ab73be4b257134a338a5bd4e0bcb68cc3b..6a371225016887baffceaf501c4cdc17608a3fd8 100644 (file)
--- 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 46ca0220c7c846d4963601a2c3dda75a2b04b31c..bb97d1a1b95cdb6b170bec3aa497bb2d6ce6a118 100644 (file)
--- 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 57e5f4fd632fef095d8122ee87baa16db3090b6b..08768200eea0430c515fa451647cbcc381b057fd 100644 (file)
--- 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 290a1e73c80aee72a146d86a0a5a7d39893d1f3b..088a4bbcb5685b23be237c2bf2db3b42de837fd6 100644 (file)
--- 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 6edd8edd7155961754d244dead56d8b2ddf5e6d2..f9270d6980a052cd0e4c24e8f456ad5149f2a915 100644 (file)
--- 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 016f0c0f34f1d5c082d5618b2133b45da5c9090f..928dae31e1b67748243d814f554193815cc65242 100644 (file)
--- 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 ffe7d324a6bcc39723ac9cca48da3379dd463a0f..b90153338a574142c5f311acb90ac2d6a67b5322 100644 (file)
--- 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 567e431d0d284a6a006bb1a5ede5256d6c9f9bf1..b89f46b47d1120f26c3852b9afbd418a7bd896b1 100644 (file)
--- 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 d4669f44b3de5b7948159645eb2ab5adff8a309d..32b4832f7fedee0244d06f25586fa49251e77a3a 100644 (file)
--- 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 <errno.h>

diff --git a/src/log/ModTcp.cc b/src/log/ModTcp.cc
index db8a9692afc8a275e035e853aaeb3a953c5da254..5238c34e1050b9e022da60577568df82cac839b3 100644 (file)
--- 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 <errno.h>

diff --git a/src/log/ModUdp.cc b/src/log/ModUdp.cc
index c6fd8c92ba92379de3168192cd32727f225ab4c7..b6e6425fe4aa64b56b8f8b463df118b868217c28 100644 (file)
--- 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 <errno.h>

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index 1a361d81f2c88b7fa6b86de31baecc4d8e21ad82..6822faa86c216478cbe80b02de11b676e33beb0b 100644 (file)
--- 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 f07205049b6c71aca1108f86341271b809a5685f..c529051a84e17a1eb3a84f2497b046a1e4b3b5f5 100644 (file)
--- 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 761e5535998465aeca6f7e56342ce95dddb75a2d..6cd3cad16bc7f7aee2d370358dc087e301c50f9d 100644 (file)
--- 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 cae33cad914315c0d791c7ba3515c6bb60d373c5..578a6204f49d823ac31e7e1ec78a24255d5c0a18 100644 (file)
--- 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 da60fe056e98afc06ded9355e2a2d45026b04979..0d49ba7f58fe186edff392c64ed9d91240dfe06f 100644 (file)
--- 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 a8a4bc9f066fad886fc1936ebf4ba1ecc5e5a4b0..ce4cc0dbcdfa7333e1b9dc8eb0ec1f46bcd56736 100644 (file)
--- 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 c66b15626ebaad5fda8c665574cc84dae9ccf3a1..0375c7ebd67f1fed4b0880661832af34a09cf5dd 100644 (file)
--- 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 94d3f4de394b6e66e7d9c1e8f0a4054f50f464d8..0322611c2c2f8e3f9e14bf26bded7b903d429048 100644 (file)
--- 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 55774aebe657849c5c617be4bafe7b6e2f65ca30..0ea8d8836a1e05438ae7e0bdaefc3d80951c6583 100644 (file)
--- 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 2cd385f8e2fc207ac767e53a5f376953c1bced7f..d9c84e92bd6ff253edec33ce6d92436acc88e4d0 100644 (file)
--- 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 ef46b9cffcaec0b07de647e9a714945594ee50fd..bb021be12a386efc8d5a0d8c7917a55229b9186a 100644 (file)
--- 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 15b39cefaf70a8c298f498351f9f3c348fc74abc..a7d4bd8486f2525ff2951d74c47d186d30af05b4 100644 (file)
--- 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 b96cc88ce9941a833a28d33048a20e09280708f5..45519dd875edfdeeff0cb15641327f8be568dcac 100644 (file)
--- 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 247875c3b9ec33d9119c15afdf52fa920d4b510c..4f0a10332842e5af5e1c2c63a6d91cbc261c929e 100644 (file)
--- 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 235bca50b584abd1655a2e5ecb0a7fe0d9fd608e..a26e80edaf20b364eedfbb3c70fa78855d48a2bf 100644 (file)
--- 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 0f76cebf0bb1613124950ff16d5f4ab57efdd16d..6c8803b99fa9726230a1ab3d30475748f2d92a2d 100644 (file)
--- 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 8d01d9a5aa6bbeb6d88f0f25916c8e409110f759..fc25588c9f62b4dff9db746ce712b59766a4e4d1 100644 (file)
--- 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 4781a027e8c99f2032e028735d44960c390c60c0..cbb47a3b2d9dc9cabcc12e649de9056984e1fc56 100644 (file)
--- 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 9d7f77e9bb3713e223f6d88325d9fb49357ac6a6..2e2213f808ae6462267fd33a815d982e887957e4 100644 (file)
--- 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 2c4db1c68871e47bd0a26f61b764eb700d1b6a94..bd9949dd13844bc450cad274b3f05581a3667976 100644 (file)
--- 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 6a56d055e7bd93015a4f8d09a4bbcfa8024d98d6..784fbbe2b1ddf953be3df64e97ecfdbb2f532807 100644 (file)
--- 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 de10f782e242792f1e560dc34b8d3d456040f161..d8acbdb02c08d72379c4aca898648c85d60c043c 100644 (file)
--- 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 797a5b34156b45a63840f18ca7571f06b46c4e70..403a050a56eaef0fdff25741d68fe42492a2fae0 100644 (file)
--- 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 093040a029a805cae9b5d877a37643252b5fb6e8..9464857f32fb808e9a7a32e2fdf8969eef76a9b8 100644 (file)
--- 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 f4b1370ba43b1fad52946e7e6411139e10538a83..5098bfd4b7baa11aeef5d4a1aa9a7aefd9b0464f 100644 (file)
--- 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 4281334e0cf41c02332012033867168908b227d4..f148c68aa170eac9532cb971cf4597232b40fec2 100644 (file)
--- 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 7e473ac3680c5855ef4a1c86446a23662fde0282..804a03a59b5aad64390f574709c0902133f765e7 100644 (file)
--- 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<SwapDir> *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 5e5fc4aa2836db77b936c163a32105f801f19f78..ba48d2ee1060b0c804b77916e46a5b058c2bd72c 100644 (file)
--- 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 <stdexcept>

diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc
index 33ebc46a02516a009ff467f2d0c0502e1f8511ee..8c6c910331fd9e658d09fb16ca9c8028ec57604b 100644 (file)
--- 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 3a819adb4f498ab95d6a368fe29a1d2bbade7f66..e393898de86059294c0add26a1b8cf9d2fa6358c 100644 (file)
--- 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 5f4ce2ab8f11d48aaa42f7190ab1fb4f8c54ef19..eb9cba8af69de437cab2558332cc9da327102baa 100644 (file)
--- 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 088e347c77735cfe9d57845e2d1a034f15016c1c..de5167dd2ba9a50fc581b74bca08cc465f99b711 100644 (file)
--- 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 a7d53229d19c854ca7cc37ff7e30577b7791aa6b..21e62cece9800005121764d5ab18c0c171c413c5 100644 (file)
--- 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 daae502a04f0ec12c8f2e2a937cdd811504ad33d..9d320794f4f83f2f7c217f9f6027b63fe669d5be 100644 (file)
--- 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 8080bbd53110a5773ff1fc5413eac27c4098e1a0..87a99767f782dc19006c5025c4ccb8f6f83e06df 100644 (file)
--- 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 8c69c3570ed9a294ecca9d2695be349e2d622234..3676d0ad7e83f897d49c25f176e8a8a136007989 100644 (file)
--- 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 d42ebc898786d9a1cfdc1689948434bb6e767ba2..b1ed03c7b8bc5888b7743b2b0946960580e92e14 100644 (file)
--- 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 e701f2cc40e5b63f4cf88684dacb21a620d90e4f..5377b1f48254cc3ddb7a912409702e140be1d0f5 100644 (file)
--- 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 78308fcb61186608358837a0fcfe497585fd2b6a..dd778716200b4f2cf8971a5f8c12009b14980ed2 100644 (file)
--- 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 445ddfa216f7b2893f449c2383cae7b081260494..35bde794f9759ca379a7309de583c2e414e8c3c3 100644 (file)
--- 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"