---------------------
PatchSet 4166 
Date: 2007/04/05 09:47:56
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
patch cleaning, with post-clean compile fixes.

Members: 
	NOTES-IPv6:1.1.2.12->1.1.2.13 
	include/IPAddress.h:1.1.2.7->1.1.2.8 
	lib/IPAddress.cc:1.1.2.17->1.1.2.18 
	src/ipcache.cc:1.9.2.17->1.9.2.18 
	src/squid.h:1.18.4.1->1.18.4.2 

Index: squid3/NOTES-IPv6
===================================================================
RCS file: /cvsroot/squid-sf//squid3/Attic/NOTES-IPv6,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- squid3/NOTES-IPv6	4 Apr 2007 23:45:12 -0000	1.1.2.12
+++ squid3/NOTES-IPv6	5 Apr 2007 09:47:56 -0000	1.1.2.13
@@ -1,4 +1,4 @@
-$Id: NOTES-IPv6,v 1.1.2.12 2007/04/04 23:45:12 amosjeffries Exp $
+$Id: NOTES-IPv6,v 1.1.2.13 2007/04/05 09:47:56 amosjeffries Exp $
 
 KNOWN BUGS:
 
@@ -19,9 +19,10 @@
 
 3	Determin what plumbing can still be passed up immediately to simplify
 
-3.1		RFC's, IPAddress.* files
-
-3.2		Rollout to ACL and client_streams
+3.2		changes in include/
+3.3		changes in lib/
+3.4		changes in src/
+3.5		changes in /
 
 4.1	Write an rfc3596 DNS Resolver library (IPv6 partner to lib/rfc1035.c )
 		defines AAAA records and IPv6 rDNS
Index: squid3/include/IPAddress.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/Attic/IPAddress.h,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- squid3/include/IPAddress.h	28 Mar 2007 10:39:14 -0000	1.1.2.7
+++ squid3/include/IPAddress.h	5 Apr 2007 09:47:56 -0000	1.1.2.8
@@ -1,5 +1,5 @@
 /*
- * $Id: IPAddress.h,v 1.1.2.7 2007/03/28 10:39:14 amosjeffries Exp $
+ * $Id: IPAddress.h,v 1.1.2.8 2007/04/05 09:47:56 amosjeffries Exp $
  */
 #ifndef _INC_IPADDRESS_H
 #define _INC_IPADDRESS_H
@@ -22,7 +22,8 @@
 };
 
 /// Length of buffer that needs to be allocated to old a null-terminated IP-string
-extern const unsigned int MAX_IPSTRLEN;
+// Yuck. But there are still structures that need it to be an 'integer constant'.
+#define MAX_IPSTRLEN  75
 
 /**
  * Holds and manipulates IPv4, IPv6, and Socket Addresses.
Index: squid3/lib/IPAddress.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/Attic/IPAddress.cc,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- squid3/lib/IPAddress.cc	1 Apr 2007 05:38:33 -0000	1.1.2.17
+++ squid3/lib/IPAddress.cc	5 Apr 2007 09:47:57 -0000	1.1.2.18
@@ -1,5 +1,5 @@
 /*
- * $Id: IPAddress.cc,v 1.1.2.17 2007/04/01 05:38:33 amosjeffries Exp $
+ * $Id: IPAddress.cc,v 1.1.2.18 2007/04/05 09:47:57 amosjeffries Exp $
  */
 #include "IPAddress.h"
 
@@ -50,11 +50,7 @@
 static const unsigned int STRLEN_IP6R = 75;           // f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f f.f.f.f ipv6.arpa./0
 static const unsigned int STRLEN_IP6S = 48;           // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:00000/0
 static const unsigned int MAX_IP6_STRLEN = STRLEN_IP6R;
-#ifdef USE_IPV6
-const unsigned int MAX_IPSTRLEN = MAX_IP6_STRLEN;
-#else
-const unsigned int MAX_IPSTRLEN = MAX_IP4_STRLEN;
-#endif
+
 
 IPAddress::IPAddress()
 {
@@ -69,7 +65,6 @@
 {
     memset(this,0,sizeof(IPAddress));
 }
-
 const int IPAddress::ApplyMask(IPAddress const &mask_addr)
 {
     uint32_t *p1 = (uint32_t*)(&m_SocketAddr.sin6_addr);
Index: squid3/src/ipcache.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ipcache.cc,v
retrieving revision 1.9.2.17
retrieving revision 1.9.2.18
diff -u -r1.9.2.17 -r1.9.2.18
--- squid3/src/ipcache.cc	5 Apr 2007 09:23:58 -0000	1.9.2.17
+++ squid3/src/ipcache.cc	5 Apr 2007 09:47:57 -0000	1.9.2.18
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.9.2.17 2007/04/05 09:23:58 amosjeffries Exp $
+ * $Id: ipcache.cc,v 1.9.2.18 2007/04/05 09:47:57 amosjeffries Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -453,7 +453,6 @@
             debug(14, 3) ("ipcacheParse: #%d %s\n",
                           j - 1,
                           INET_NTOA(i->addrs.in_addrs[j - 1]));
-#endif
 #ifdef INET6
         } else if (answers[k].type == RFC1035_TYPE_AAAA) {
             if (answers[k].rdlength != sizeof(struct in6_addr))
Index: squid3/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/squid.h,v
retrieving revision 1.18.4.1
retrieving revision 1.18.4.2
diff -u -r1.18.4.1 -r1.18.4.2
--- squid3/src/squid.h	5 Jan 2007 16:59:34 -0000	1.18.4.1
+++ squid3/src/squid.h	5 Apr 2007 09:47:57 -0000	1.18.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.18.4.1 2007/01/05 16:59:34 hno Exp $
+ * $Id: squid.h,v 1.18.4.2 2007/04/05 09:47:57 amosjeffries Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -365,6 +365,7 @@
 #include "util.h"
 #include "profiling.h"
 #include "MemPool.h"
+#include "IPAddress.h"
 
 #if !HAVE_TEMPNAM
 #include "tempnam.h"