From: wessels <>
Date: Thu, 16 Jul 1998 08:39:59 +0000 (+0000)
Subject: added no-netdb-exchange cache_peer option
X-Git-Tag: SQUID_3_0_PRE1~3074
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=223213dff47e8d3b43313a2487648b0f4b0512dc;p=thirdparty%2Fsquid.git

added no-netdb-exchange cache_peer option
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index a8bbf0ade1..47ee8a45fb 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.286 1998/06/08 17:29:14 wessels Exp $
+ * $Id: cache_cf.cc,v 1.287 1998/07/16 02:39:59 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -781,6 +781,8 @@ parse_peer(peer ** head)
 	} else if (!strncasecmp(token, "htcp", 4)) {
 	    EBIT_SET(p->options, NEIGHBOR_HTCP);
 #endif
+	} else if (!strncasecmp(token, "no-netdb-exchange", 17)) {
+	    EBIT_SET(p->options, NEIGHBOR_NO_NETDB_EXCHANGE);
 	} else {
 	    debug(3, 0) ("parse_peer: token='%s'\n", token);
 	    self_destruct();
diff --git a/src/cf.data.pre b/src/cf.data.pre
index a37bf8a820..1659deb945 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -178,6 +178,7 @@ DOC_START
 		     round-robin
 		     multicast-responder
 		     closest-only
+		     no-netdb-exchange
 
 		     use 'proxy-only' to specify that objects fetched
 		     from this cache should not be saved locally.
@@ -214,6 +215,9 @@ DOC_START
 		     replies, we'll only forward CLOSEST_PARENT_MISSes
 		     and never FIRST_PARENT_MISSes.
 
+		     'no-netdb-exchange' disables requesting ICMP
+		     RTT database (NetDB) from the neighbor.
+
 	NOTE: non-ICP neighbors must be specified as 'parent'.
 
 cache_peer hostname type 3128 3130
diff --git a/src/enums.h b/src/enums.h
index 4b54204d8f..f73ca0c109 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -498,6 +498,7 @@ enum {
 #if USE_HTCP
     NEIGHBOR_HTCP,
 #endif
+    NEIGHBOR_NO_NETDB_EXCHANGE,
     NEIGHBOR_END
 };
 
diff --git a/src/neighbors.cc b/src/neighbors.cc
index 5e43a95af0..87bc7bb5fd 100644
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.224 1998/07/13 21:37:45 wessels Exp $
+ * $Id: neighbors.cc,v 1.225 1998/07/16 02:40:01 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -936,7 +936,8 @@ peerDNSConfigure(const ipcache_addrs * ia, void *data)
     if (p->type == PEER_MULTICAST)
 	peerCountMcastPeersSchedule(p, 10);
     if (p->type != PEER_MULTICAST)
-	eventAddIsh("netdbExchangeStart", netdbExchangeStart, p, 30.0, 1);
+	if (!EBIT_TEST(p->options, NEIGHBOR_NO_NETDB_EXCHANGE))
+	    eventAddIsh("netdbExchangeStart", netdbExchangeStart, p, 30.0, 1);
 }
 
 static void