Bugzilla #293: Request for a icp_query_timeout_min option

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 2e94e989573f74c60aecd572fc3cae05b781b3ba..290a00db2c59bbe4819c37203622cc9357d8f6d2 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -1,6 +1,6 @@
 
 #
-# $Id: cf.data.pre,v 1.254 2002/04/05 08:55:22 hno Exp $
+# $Id: cf.data.pre,v 1.255 2002/04/07 03:35:30 hno Exp $
 #
 #
 # SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -451,6 +451,21 @@ DOC_START
        'icp_query_timeout' directive.
 DOC_END
 
+NAME: minimum_icp_query_timeout
+COMMENT: (msec)
+DEFAULT: 5
+TYPE: int
+LOC: Config.Timeout.icp_query_max
+DOC_START
+       Normally the ICP query timeout is determined dynamically.  But
+       sometimes it can lead to very small timeouts, even lower than
+       the normal latency variance on your link due to traffic.
+       Use this option to put an lower limit on the dynamic timeout
+       value.  Do NOT use this option to always use a fixed (instead
+       of a dynamic) timeout value. To set a fixed timeout see the
+       'icp_query_timeout' directive.
+DOC_END
+
 NAME: mcast_icp_query_timeout
 COMMENT: (msec)
 DEFAULT: 2000

diff --git a/src/neighbors.cc b/src/neighbors.cc
index b23f15dd157f8d95e83b1470883d6f4bcaf82de2..8d5772c855975aaf0fed9b30af82c6ab5fb9a0b0 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.299 2001/10/17 20:25:02 hno Exp $
+ * $Id: neighbors.cc,v 1.300 2002/04/07 03:35:30 hno Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -561,6 +561,8 @@ neighborsUdpPing(request_t * request,
        if (Config.Timeout.icp_query_max)
            if (*timeout > Config.Timeout.icp_query_max)
                *timeout = Config.Timeout.icp_query_max;
+       if (*timeout < Config.Timeout.icp_query_min)
+           *timeout = Config.Timeout.icp_query_min;
     }
     return peers_pinged;
 }

diff --git a/src/structs.h b/src/structs.h
index e75a446fe837a6acea4bef6a28f3688ff235b6b3..2b4b7cfa8b68aea46f8bde681a3f15cc8c14b1e4 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.414 2002/04/06 08:49:28 adrian Exp $
+ * $Id: structs.h,v 1.415 2002/04/07 03:35:30 hno Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -403,6 +403,7 @@ struct _SquidConfig {
        time_t deadPeer;
        int icp_query;          /* msec */
        int icp_query_max;      /* msec */
+       int icp_query_min;      /* msec */
        int mcast_icp_query;    /* msec */
 #if USE_IDENT
        time_t ident;