---------------------
PatchSet 5862 
Date: 2007/09/29 12:21:10
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix more mask-related bugs in transition from HEAD to IPv6

Members: 
	src/ACLIP.cc:1.8.2.51->1.8.2.52 

Index: squid3/src/ACLIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLIP.cc,v
retrieving revision 1.8.2.51
retrieving revision 1.8.2.52
diff -u -r1.8.2.51 -r1.8.2.52
--- squid3/src/ACLIP.cc	27 Sep 2007 23:04:02 -0000	1.8.2.51
+++ squid3/src/ACLIP.cc	29 Sep 2007 12:21:10 -0000	1.8.2.52
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLIP.cc,v 1.8.2.51 2007/09/27 23:04:02 amosjeffries Exp $
+ * $Id: ACLIP.cc,v 1.8.2.52 2007/09/29 12:21:10 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -335,7 +335,7 @@
             debugs(28, 3, "aclIpParseIpData: Located host/IP: '" << r->addr1 << "'");
 
             r->addr2.SetAnyAddr();
-            DecodeMask(NULL, r->mask, AF_UNSPEC);
+            r->mask.SetNoAddr();
 
             Q = &r->next;
 
@@ -380,7 +380,7 @@
     else q->addr2 = l_addr2;
 
     /* Decode mask (NULL or empty means a exact host mask) */
-    if (!DecodeMask(l_mask, &q->mask)) {
+    if (!DecodeMask(l_mask, q->mask, iptype)) {
         debugs(28, 0, "aclParseIpData: unknown netmask '" << l_mask << "' in '" << t << "'");
         delete q;
         self_destruct();