--------------------- PatchSet 4172 Date: 2007/04/05 10:51:40 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Set DEBUG LEVEL for IP address handlers at 14. Members: lib/IPAddress.cc:1.1.2.18->1.1.2.19 src/comm.cc:1.47.2.15->1.47.2.16 Index: squid3/lib/IPAddress.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/Attic/IPAddress.cc,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -u -r1.1.2.18 -r1.1.2.19 --- squid3/lib/IPAddress.cc 5 Apr 2007 09:47:57 -0000 1.1.2.18 +++ squid3/lib/IPAddress.cc 5 Apr 2007 10:51:40 -0000 1.1.2.19 @@ -1,5 +1,5 @@ /* - * $Id: IPAddress.cc,v 1.1.2.18 2007/04/05 09:47:57 amosjeffries Exp $ + * $Id: IPAddress.cc,v 1.1.2.19 2007/04/05 10:51:40 amosjeffries Exp $ */ #include "IPAddress.h" @@ -19,7 +19,7 @@ /* We want to use the debug routines when running as module of squid. */ /* otherwise fallback to printf if those are not available. */ #ifndef SQUID_DEBUG -# define debugs(a,b) printf +# define debug(a,b) printf #else # include "../Debug.h" #endif @@ -245,7 +245,7 @@ } #endif - debugs(36,1)("ERROR: IPAddress::GetReverseString : Address stored cannot be converted to type requested.\n"); + debug(14,1)("IPAddress::GetReverseString : Address stored cannot be converted to type requested.\n"); buf[0] = '\0'; return false; } @@ -266,7 +266,7 @@ struct hostent *hp = NULL; if ((hp = gethostbyname(s)) == NULL) { - debugs(36,1)("IPAddress:::operator= : Given Bad IP '%s'\n", s); + debug(14,1)("IPAddress:::operator= : Given Bad IP '%s'\n", s); return false; } @@ -278,7 +278,7 @@ #endif else { - debugs(36,1)("IPAddress::operator=(hostent*) : Discarding IP address '%s'.\n",s); + debug(14,1)("IPAddress::operator=(hostent*) : Discarding IP address '%s'.\n",s); return false; } return true; @@ -411,7 +411,7 @@ #ifdef USE_IPV6 /* this */ operator=(*ipv6); #else - debugs(36,1)("IPAddress::operator= : Discarded IPv6 Address. Protocol disabled.\n"); + debug(14,1)("IPAddress::operator= : Discarded IPv6 Address. Protocol disabled.\n"); // TODO see if there is another address in the list that might be usable ?? return false; @@ -501,7 +501,7 @@ // Ensure we have a buffer. if(buf == NULL) { - debugs(36,1)("IPAddress::NtoA : Buffer received has no allocated space.\n"); + debug(14,1)("IPAddress::NtoA : Buffer received has no allocated space.\n"); return NULL; } memset(buf,0,blen); @@ -521,7 +521,7 @@ // Ensure we have a buffer. if(buf == NULL) { - debugs(36,1)("IPAddress::ToURL : Buffer received has no allocated space.\n"); + debug(14,1)("IPAddress::ToURL : Buffer received has no allocated space.\n"); return NULL; } @@ -640,7 +640,7 @@ case IPv6: // non-compatible IPv6 Pure Address default: - debugs(36,1)("IPAddress::GetInAddr : Cannot convert non-IP to IPv4.\n"); + debug(14,1)("IPAddress::GetInAddr : Cannot convert non-IP to IPv4.\n"); memset(&buf,0xFFFFFFFF,sizeof(struct in_addr)); return false; } Index: squid3/src/comm.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/comm.cc,v retrieving revision 1.47.2.15 retrieving revision 1.47.2.16 diff -u -r1.47.2.15 -r1.47.2.16 --- squid3/src/comm.cc 1 Apr 2007 11:01:26 -0000 1.47.2.15 +++ squid3/src/comm.cc 5 Apr 2007 10:51:41 -0000 1.47.2.16 @@ -1,6 +1,6 @@ /* - * $Id: comm.cc,v 1.47.2.15 2007/04/01 11:01:26 amosjeffries Exp $ + * $Id: comm.cc,v 1.47.2.16 2007/04/05 10:51:41 amosjeffries Exp $ * * DEBUG: section 5 Socket Functions * AUTHOR: Harvest Derived @@ -1269,7 +1269,7 @@ if (x < 0) { debug(5, 9) ("connect FD %d: %s\n", sock, xstrerror()); - debug(36,1) ("connect() to: %s \n",address.ToURL(buf,MAX_IPSTRLEN) ); + debug(14,9) ("connected to: %s \n",address.ToURL(buf,MAX_IPSTRLEN) ); } } else {