---------------------
PatchSet 4473 
Date: 2007/05/08 13:55:38
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Rollout to an acl support structure.

Members: 
	src/cache_cf.cc:1.40.2.23->1.40.2.24 
	src/forward.cc:1.35.4.16->1.35.4.17 
	src/structs.h:1.66.2.14->1.66.2.15 

Index: squid3/src/cache_cf.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/cache_cf.cc,v
retrieving revision 1.40.2.23
retrieving revision 1.40.2.24
diff -u -r1.40.2.23 -r1.40.2.24
--- squid3/src/cache_cf.cc	29 Apr 2007 03:01:36 -0000	1.40.2.23
+++ squid3/src/cache_cf.cc	8 May 2007 13:55:38 -0000	1.40.2.24
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.40.2.23 2007/04/29 03:01:36 amosjeffries Exp $
+ * $Id: cache_cf.cc,v 1.40.2.24 2007/05/08 13:55:38 amosjeffries Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -890,11 +890,12 @@
 static void
 dump_acl_address(StoreEntry * entry, const char *name, acl_address * head)
 {
+    char buf[MAX_IPSTRLEN];
     acl_address *l;
 
     for (l = head; l; l = l->next) {
-        if (l->addr.s_addr != INADDR_ANY)
-            storeAppendPrintf(entry, "%s %s", name, inet_ntoa(l->addr));
+        if (!l->addr.IsAnyAddr())
+            storeAppendPrintf(entry, "%s %s", name, l->addr.NtoA(buf,MAX_IPSTRLEN));
         else
             storeAppendPrintf(entry, "%s autoselect", name);
 
@@ -918,7 +919,7 @@
     acl_address **tail = head;	/* sane name below */
     CBDATA_INIT_TYPE_FREECB(acl_address, freed_acl_address);
     l = cbdataAlloc(acl_address);
-    parse_address(&l->addr);
+    parse_address(l->addr);
     aclParseAclList(LegacyParser, &l->aclList);
 
     while (*tail)
Index: squid3/src/forward.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/forward.cc,v
retrieving revision 1.35.4.16
retrieving revision 1.35.4.17
diff -u -r1.35.4.16 -r1.35.4.17
--- squid3/src/forward.cc	1 May 2007 08:32:30 -0000	1.35.4.16
+++ squid3/src/forward.cc	8 May 2007 13:55:38 -0000	1.35.4.17
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.35.4.16 2007/05/01 08:32:30 amosjeffries Exp $
+ * $Id: forward.cc,v 1.35.4.17 2007/05/08 13:55:38 amosjeffries Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -1188,20 +1188,22 @@
 }
 
 static struct IN_ADDR
-            aclMapAddr(acl_address * head, ACLChecklist * ch)
+aclMapAddr(acl_address * head, ACLChecklist * ch)
 {
     acl_address *l;
 
-    struct IN_ADDR addr;
+    IPAddress addr;
 
     for (l = head; l; l = l->next)
     {
         if (ch->matchAclListFast(l->aclList))
-            return l->addr;
+/* FIXME INET6 : drop temp conversion */ { struct IN_ADDR tmp; l->addr.GetInAddr(tmp);
+            return tmp; }
     }
 
-    addr.s_addr = INADDR_ANY;
-    return addr;
+    addr.SetAnyAddr();
+/* FIXME INET6 : drop temp conversion */ struct IN_ADDR tmp; addr.GetInAddr(tmp);
+    return tmp;
 }
 
 static int
Index: squid3/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/structs.h,v
retrieving revision 1.66.2.14
retrieving revision 1.66.2.15
diff -u -r1.66.2.14 -r1.66.2.15
--- squid3/src/structs.h	22 Apr 2007 08:06:32 -0000	1.66.2.14
+++ squid3/src/structs.h	8 May 2007 13:55:38 -0000	1.66.2.15
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.66.2.14 2007/04/22 08:06:32 amosjeffries Exp $
+ * $Id: structs.h,v 1.66.2.15 2007/05/08 13:55:38 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -93,7 +93,7 @@
     acl_address *next;
     acl_list *aclList;
 
-    struct IN_ADDR addr;
+    IPAddress addr;
 };
 
 struct _acl_tos