---------------------
PatchSet 4171 
Date: 2007/04/05 10:37:17
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
patch cleaning.

Members: 
	src/ACLDestinationIP.cc:1.6.6.2->1.6.6.3 
	src/ACLMaxUserIP.cc:1.5.6.5->1.5.6.6 
	src/fqdncache.cc:1.9.2.9->1.9.2.10 
	src/ipc.cc:1.9.4.7->1.9.4.8 
	src/tools.cc:1.22.2.9->1.22.2.10 

Index: squid3/src/ACLDestinationIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLDestinationIP.cc,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -u -r1.6.6.2 -r1.6.6.3
--- squid3/src/ACLDestinationIP.cc	9 Mar 2007 11:46:26 -0000	1.6.6.2
+++ squid3/src/ACLDestinationIP.cc	5 Apr 2007 10:37:17 -0000	1.6.6.3
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLDestinationIP.cc,v 1.6.6.2 2007/03/09 11:46:26 amosjeffries Exp $
+ * $Id: ACLDestinationIP.cc,v 1.6.6.3 2007/04/05 10:37:17 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -53,7 +53,7 @@
         /* Entry in cache found */
 
         for (int k = 0; k < (int) ia->count; k++) {
- /* FIXME : drop conversion temporary cast */ IPAddress tmp(ia->in_addrs[k]);
+ /* FIXME INET6 : drop temporary conversion */ IPAddress tmp(ia->in_addrs[k]);
             if (ACLIP::match(tmp))
                 return 1;
         }
Index: squid3/src/ACLMaxUserIP.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ACLMaxUserIP.cc,v
retrieving revision 1.5.6.5
retrieving revision 1.5.6.6
diff -u -r1.5.6.5 -r1.5.6.6
--- squid3/src/ACLMaxUserIP.cc	5 Apr 2007 06:15:12 -0000	1.5.6.5
+++ squid3/src/ACLMaxUserIP.cc	5 Apr 2007 10:37:17 -0000	1.5.6.6
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMaxUserIP.cc,v 1.5.6.5 2007/04/05 06:15:12 amosjeffries Exp $
+ * $Id: ACLMaxUserIP.cc,v 1.5.6.6 2007/04/05 10:37:17 amosjeffries Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -161,7 +161,6 @@
     if ((ti = checklist->authenticated()) != 1)
         return ti;
 
-//    /* FIXME INET6 : drop temp conversion */ struct IN_ADDR tmp; checklist->src_addr.GetInAddr(tmp);
     ti = match(checklist->auth_user_request, checklist->src_addr);
 
     checklist->auth_user_request = NULL;
Index: squid3/src/fqdncache.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fqdncache.cc,v
retrieving revision 1.9.2.9
retrieving revision 1.9.2.10
diff -u -r1.9.2.9 -r1.9.2.10
--- squid3/src/fqdncache.cc	5 Apr 2007 07:28:11 -0000	1.9.2.9
+++ squid3/src/fqdncache.cc	5 Apr 2007 10:37:17 -0000	1.9.2.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fqdncache.cc,v 1.9.2.9 2007/04/05 07:28:11 amosjeffries Exp $
+ * $Id: fqdncache.cc,v 1.9.2.10 2007/04/05 10:37:17 amosjeffries Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -441,7 +441,6 @@
 }
 
 void
-
 fqdncache_nbgethostbyaddr(IPAddress &addr, FQDNH * handler, void *handlerData)
 {
     fqdncache_entry *f = NULL;
Index: squid3/src/ipc.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ipc.cc,v
retrieving revision 1.9.4.7
retrieving revision 1.9.4.8
diff -u -r1.9.4.7 -r1.9.4.8
--- squid3/src/ipc.cc	5 Apr 2007 09:23:57 -0000	1.9.4.7
+++ squid3/src/ipc.cc	5 Apr 2007 10:37:17 -0000	1.9.4.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipc.cc,v 1.9.4.7 2007/04/05 09:23:57 amosjeffries Exp $
+ * $Id: ipc.cc,v 1.9.4.8 2007/04/05 10:37:17 amosjeffries Exp $
  *
  * DEBUG: section 54    Interprocess Communication
  * AUTHOR: Duane Wessels
@@ -247,8 +247,8 @@
         cwfd = crfd = -1;
 
         if (type == IPC_TCP_SOCKET || type == IPC_UDP_SOCKET) {
-            /* FIXME Remove: */ IPAddress ChS_b(ChS);
-            if (comm_connect_addr(pwfd, ChS_b) == COMM_ERROR)
+            /* FIXME INET6 : drop temp conversion */ IPAddress tmp(ChS);
+            if (comm_connect_addr(pwfd, tmp) == COMM_ERROR)
                 return ipcCloseAllFD(prfd, pwfd, crfd, cwfd);
         }
 
@@ -319,8 +319,8 @@
         close(crfd);
         cwfd = crfd = fd;
     } else if (type == IPC_UDP_SOCKET) {
-        /* FIXME Remove: */ IPAddress PaS_b(PaS);
-        if (comm_connect_addr(crfd, PaS_b) == COMM_ERROR)
+        /* FIXME INET6 : drop temp conversion */ IPAddress tmp(PaS);
+        if (comm_connect_addr(crfd, tmp) == COMM_ERROR)
             return ipcCloseAllFD(prfd, pwfd, crfd, cwfd);
     }
 
Index: squid3/src/tools.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/tools.cc,v
retrieving revision 1.22.2.9
retrieving revision 1.22.2.10
diff -u -r1.22.2.9 -r1.22.2.10
--- squid3/src/tools.cc	5 Apr 2007 09:24:00 -0000	1.22.2.9
+++ squid3/src/tools.cc	5 Apr 2007 10:37:22 -0000	1.22.2.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.22.2.9 2007/04/05 09:24:00 amosjeffries Exp $
+ * $Id: tools.cc,v 1.22.2.10 2007/04/05 10:37:22 amosjeffries Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -1247,7 +1247,7 @@
 #if USE_SSL
 
     if (Config.Sockaddr.https)
-        return ntohs(Config.Sockaddr.https->s.sin_port);
+        return ntohs(Config.Sockaddr.https->http.s.sin_port);
 
 #endif