added no-netdb-exchange cache_peer option

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index a8bbf0ade159557bb5ad5322dea0dfb5888ad3dc..47ee8a45fb5a170b4280588963bf82efa6091690 100644 (file)
--- 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 a37bf8a820129225c4845d3f1694feaf63b79fab..1659deb945b6ca967381d0671d24e22c7eeab6c4 100644 (file)
--- 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 4b54204d8f907186922e3ef95db35609581e3200..f73ca0c109f61ee8fe8ca58cf234f23af66f70ba 100644 (file)
--- 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 5e43a95af07bd748a4b74f77de01d22e53aad89e..87bc7bb5fdbf37fd0f38a5684a5966a9c5c779b6 100644 (file)
--- 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