---------------------
PatchSet 11217 
Date: 2007/02/02 12:22:16
Author: hno
Branch: HEAD
Tag: (none) 
Log:
In the access.log hierarchy field log the unique peer name instead of the host name

Members: 
	src/forward.c:1.121->1.122 
	src/ssl.c:1.135->1.136 

Index: squid/src/forward.c
===================================================================
RCS file: /cvsroot/squid/squid/src/forward.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- squid/src/forward.c	21 Jan 2007 12:53:59 -0000	1.121
+++ squid/src/forward.c	2 Feb 2007 12:22:16 -0000	1.122
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.c,v 1.121 2007/01/21 12:53:59 adrian Exp $
+ * $Id: forward.c,v 1.122 2007/02/02 12:22:16 hno Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -530,7 +530,7 @@
 		fwdState->origin_tries++;
 	    comm_add_close_handler(fd, fwdServerClosed, fwdState);
 	    if (fs->peer)
-		hierarchyNote(&fwdState->request->hier, fs->code, fs->peer->host);
+		hierarchyNote(&fwdState->request->hier, fs->code, fs->peer->name);
 	    else if (Config.onoff.log_ip_on_direct && fs->code == HIER_DIRECT)
 		hierarchyNote(&fwdState->request->hier, fs->code, fd_table[fd].ipaddr);
 	    else
@@ -588,7 +588,7 @@
 	fwdConnectTimeout,
 	fwdState);
     if (fs->peer) {
-	hierarchyNote(&fwdState->request->hier, fs->code, fs->peer->host);
+	hierarchyNote(&fwdState->request->hier, fs->code, fs->peer->name);
     } else {
 #if LINUX_TPROXY
 	if (fwdState->request->flags.tproxy) {
Index: squid/src/ssl.c
===================================================================
RCS file: /cvsroot/squid/squid/src/ssl.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- squid/src/ssl.c	21 Jan 2007 12:54:00 -0000	1.135
+++ squid/src/ssl.c	2 Feb 2007 12:22:16 -0000	1.136
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl.c,v 1.135 2007/01/21 12:54:00 adrian Exp $
+ * $Id: ssl.c,v 1.136 2007/02/02 12:22:16 hno Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -414,7 +414,7 @@
     ErrorState *err = NULL;
     if (sslState->servers->peer)
 	hierarchyNote(&sslState->request->hier, sslState->servers->code,
-	    sslState->servers->peer->host);
+	    sslState->servers->peer->name);
     else if (Config.onoff.log_ip_on_direct)
 	hierarchyNote(&sslState->request->hier, sslState->servers->code,
 	    fd_table[sslState->server.fd].ipaddr);
@@ -462,7 +462,7 @@
     ErrorState *err = NULL;
     if (sslState->servers->peer)
 	hierarchyNote(&sslState->request->hier, sslState->servers->code,
-	    sslState->servers->peer->host);
+	    sslState->servers->peer->name);
     else if (Config.onoff.log_ip_on_direct)
 	hierarchyNote(&sslState->request->hier, sslState->servers->code,
 	    fd_table[sslState->server.fd].ipaddr);