* Removed the upper limits on number of dnsserver or redirect helpers

also killed the unused dnsStatData type which was the only one actually
depending on these... (well, the actually only the dnsserver limit but..)

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 35123e4ec7dd3188c6c2d080056cfa06dca504d7..c36d0d6eb7f77b18ada3509e2c2616a25097781f 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.378 2001/03/03 10:39:30 hno Exp $
+ * $Id: cache_cf.cc,v 1.379 2001/04/20 12:40:25 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -284,23 +284,11 @@ configDoConfigure(void)
 #if USE_DNSSERVERS
     if (Config.dnsChildren < 1)
        fatal("No dnsservers allocated");
-    if (Config.dnsChildren > DefaultDnsChildrenMax) {
-       debug(3, 0) ("WARNING: dns_children was set to a bad value: %d\n",
-           Config.dnsChildren);
-       debug(3, 0) ("Setting it to the maximum (%d).\n",
-           DefaultDnsChildrenMax);
-       Config.dnsChildren = DefaultDnsChildrenMax;
-    }
 #endif
     if (Config.Program.redirect) {
        if (Config.redirectChildren < 1) {
            Config.redirectChildren = 0;
            wordlistDestroy(&Config.Program.redirect);
-       } else if (Config.redirectChildren > DefaultRedirectChildrenMax) {
-           debug(3, 0) ("WARNING: redirect_children was set to a bad value: %d\n",
-               Config.redirectChildren);
-           debug(3, 0) ("Setting it to the maximum (%d).\n", DefaultRedirectChildrenMax);
-           Config.redirectChildren = DefaultRedirectChildrenMax;
        }
     }
     if (Config.Accel.host) {

diff --git a/src/defines.h b/src/defines.h
index c3cd1ef46d2296cce88430df9ae3b06ab6466ea6..f7ea15c66e5718f1099045840c233856f0396784 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: defines.h,v 1.91 2001/03/20 01:10:25 hno Exp $
+ * $Id: defines.h,v 1.92 2001/04/20 12:40:25 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -51,8 +51,6 @@
 #define ACL_ALLWEEK    0x7F
 #define ACL_WEEKDAYS   0x3E
 
-#define DefaultDnsChildrenMax          32      /* 32 processes */
-#define DefaultRedirectChildrenMax     32      /* 32 processes */
 #define MAXHTTPPORTS                   12
 
 #define COMM_OK                  (0)

diff --git a/src/enums.h b/src/enums.h
index 489643e1be32618b9f114ca457951d8581cef523..8cdc50a44dd9bd5e22b17d667b59918a8911a5df 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.191 2001/04/14 00:25:18 hno Exp $
+ * $Id: enums.h,v 1.192 2001/04/20 12:40:25 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -581,7 +581,6 @@ typedef enum {
     MEM_DLINK_LIST,
     MEM_DLINK_NODE,
     MEM_DNSSERVER_T,
-    MEM_DNSSTATDATA,
     MEM_DOMAIN_PING,
     MEM_DOMAIN_TYPE,
     MEM_DONTFREE,

diff --git a/src/globals.h b/src/globals.h
index 39fbc995e10b7d3fa7bcff3764af1dcf8cd8ecc3..f722460d9809d1a129e2a782e66b09374b8acd79 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: globals.h,v 1.101 2001/01/12 00:37:18 wessels Exp $
+ * $Id: globals.h,v 1.102 2001/04/20 12:40:26 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -61,7 +61,6 @@ extern const char *memStatusStr[];
 extern const char *pingStatusStr[];
 extern const char *storeStatusStr[];
 extern const char *swapStatusStr[];
-extern dnsStatData DnsStats;
 extern fde *fd_table;          /* NULL */
 extern int Biggest_FD;         /* -1 */
 extern int Number_FD;          /* 0 */

diff --git a/src/mem.cc b/src/mem.cc
index 6e6481986c54ce2e5849a257c4f8c3e36b687a61..84d7bedb7dd0415907352a9161a129454d679980 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.56 2001/04/09 21:55:50 hno Exp $
+ * $Id: mem.cc,v 1.57 2001/04/20 12:40:26 hno Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -227,7 +227,6 @@ memInit(void)
     memDataInit(MEM_DLINK_LIST, "dlink_list", sizeof(dlink_list), 10);
     memDataInit(MEM_DLINK_NODE, "dlink_node", sizeof(dlink_node), 10);
     memDataInit(MEM_DNSSERVER_T, "dnsserver_t", sizeof(dnsserver_t), 0);
-    memDataInit(MEM_DNSSTATDATA, "dnsStatData", sizeof(dnsStatData), 0);
     memDataInit(MEM_DOMAIN_PING, "domain_ping", sizeof(domain_ping), 0);
     memDataInit(MEM_DOMAIN_TYPE, "domain_type", sizeof(domain_type), 0);
     memDataInit(MEM_DREAD_CTRL, "dread_ctrl", sizeof(dread_ctrl), 0);

diff --git a/src/structs.h b/src/structs.h
index 3c820c0177cd5d293bd902bc8997a8a8ca2a7f46..de870ad3fbf3c3792d018deab37fda58a575ff10 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.387 2001/04/14 00:25:19 hno Exp $
+ * $Id: structs.h,v 1.388 2001/04/20 12:40:26 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -681,12 +681,6 @@ struct _dnsserver_t {
     void *data;
 };
 
-struct _dnsStatData {
-    int requests;
-    int replies;
-    int hist[DefaultDnsChildrenMax];
-};
-
 struct _dwrite_q {
     off_t file_offset;
     char *buf;

diff --git a/src/typedefs.h b/src/typedefs.h
index e22d11d59760d19ceb6ca56e8a4485ec745dfef1..45841a1fe73b70dde887112d876693a0c4602c36 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.125 2001/04/14 00:03:24 hno Exp $
+ * $Id: typedefs.h,v 1.126 2001/04/20 12:40:26 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -85,7 +85,6 @@ typedef struct _SquidConfig2 SquidConfig2;
 typedef struct _close_handler close_handler;
 typedef struct _dread_ctrl dread_ctrl;
 typedef struct _dnsserver_t dnsserver_t;
-typedef struct _dnsStatData dnsStatData;
 typedef struct _dwrite_q dwrite_q;
 typedef struct _ETag ETag;
 typedef struct _fde fde;