---------------------
PatchSet 11262 
Date: 2007/02/26 22:45:24
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Clean up relations between TCP probing and DNS checks of peers with no known addresses.

Merged changes:
2007/02/05 15:16:31 hno	+6 -4  Clean up relations between TCP probing and DNS checks of peers with no known addresses.
2007/02/05 15:17:12 hno	+5 -3  MFC: Clean up relations between TCP probing and DNS checks of peers with no known addresses.

Members: 
	src/cache_cf.c:1.463->1.463.2.1 
	src/neighbors.c:1.313->1.313.2.1 

Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid/squid/src/cache_cf.c,v
retrieving revision 1.463
retrieving revision 1.463.2.1
diff -u -r1.463 -r1.463.2.1
--- squid/src/cache_cf.c	18 Jan 2007 23:19:14 -0000	1.463
+++ squid/src/cache_cf.c	26 Feb 2007 22:45:24 -0000	1.463.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.c,v 1.463 2007/01/18 23:19:14 hno Exp $
+ * $Id: cache_cf.c,v 1.463.2.1 2007/02/26 22:45:24 hno Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -1765,7 +1765,6 @@
     if (p->weight < 1)
 	p->weight = 1;
     p->icp.version = ICP_VERSION_CURRENT;
-    p->tcp_up = PEER_TCP_MAGIC_COUNT;
     p->test_fd = -1;
 #if USE_CACHE_DIGESTS
     if (!p->options.no_digest) {
Index: squid/src/neighbors.c
===================================================================
RCS file: /cvsroot/squid/squid/src/neighbors.c,v
retrieving revision 1.313
retrieving revision 1.313.2.1
diff -u -r1.313 -r1.313.2.1
--- squid/src/neighbors.c	19 Jan 2007 00:19:26 -0000	1.313
+++ squid/src/neighbors.c	26 Feb 2007 22:45:24 -0000	1.313.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.c,v 1.313 2007/01/19 00:19:26 hno Exp $
+ * $Id: neighbors.c,v 1.313.2.1 2007/02/26 22:45:24 hno Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -1014,6 +1014,7 @@
 	debug(0, 0) ("WARNING: No IP address found for '%s'!\n", p->host);
 	return;
     }
+    p->tcp_up = PEER_TCP_MAGIC_COUNT;
     for (j = 0; j < (int) ia->count && j < PEER_MAX_ADDRESSES; j++) {
 	p->addresses[j] = ia->in_addrs[j];
 	debug(15, 2) ("--> IP address #%d: %s\n", j, inet_ntoa(p->addresses[j]));
@@ -1081,6 +1082,8 @@
 	    neighborTypeStr(p), p->name);
 	peerMonitorNow(p);
 	p->stats.logged_state = PEER_ALIVE;
+	if (!p->n_addresses)
+	    ipcache_nbgethostbyname(p->host, peerDNSConfigure, p);
     }
     p->tcp_up = PEER_TCP_MAGIC_COUNT;
 }