---------------------
PatchSet 4560 
Date: 2007/05/16 07:07:02
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Fix some compile errors under --enable-icmp (some remain).

Members: 
	NOTES-IPv6:1.1.2.17->1.1.2.18 
	src/icmp.cc:1.8.8.9->1.8.8.10 
	src/net_db.cc:1.13.4.13->1.13.4.14 

Index: squid3/NOTES-IPv6
===================================================================
RCS file: /cvsroot/squid-sf//squid3/Attic/NOTES-IPv6,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- squid3/NOTES-IPv6	30 Apr 2007 15:17:21 -0000	1.1.2.17
+++ squid3/NOTES-IPv6	16 May 2007 07:07:02 -0000	1.1.2.18
@@ -1,4 +1,4 @@
-$Id: NOTES-IPv6,v 1.1.2.17 2007/04/30 15:17:21 amosjeffries Exp $
+$Id: NOTES-IPv6,v 1.1.2.18 2007/05/16 07:07:02 amosjeffries Exp $
 
 KNOWN BUGS:
 
@@ -8,9 +8,7 @@
           Solved for all known events now, but this may reccur at any time
           until conversion is completed.
 
-PROBLEM:  HTCP and Pinger Rollout is not complete.
-CAUSE:    My compile-testing is limited is present in these areas.
-	  It compiles with the existign rollout and --enables-* present.
+PROBLEM:  Pinger Rollout is not complete.
 
 
 TODO:
Index: squid3/src/icmp.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/icmp.cc,v
retrieving revision 1.8.8.9
retrieving revision 1.8.8.10
diff -u -r1.8.8.9 -r1.8.8.10
--- squid3/src/icmp.cc	1 May 2007 08:32:31 -0000	1.8.8.9
+++ squid3/src/icmp.cc	16 May 2007 07:07:02 -0000	1.8.8.10
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icmp.cc,v 1.8.8.9 2007/05/01 08:32:31 amosjeffries Exp $
+ * $Id: icmp.cc,v 1.8.8.10 2007/05/16 07:07:02 amosjeffries Exp $
  *
  * DEBUG: section 37    ICMP Routines
  * AUTHOR: Duane Wessels
@@ -228,8 +228,7 @@
     debugs(37, 3, "icmpDomainPing: '" << domain << "'");
     if(to.IsIPv4())
     {
-/* FIXME INET6 : drop temp conversion */ struct IN_ADDR tmp; to.GetInAddr(tmp);
-        icmpSendEcho(tmp, S_ICMP_DOM, domain, 0);
+        icmpSendEcho(to, S_ICMP_DOM, domain, 0);
     }
 #endif
 }
Index: squid3/src/net_db.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/net_db.cc,v
retrieving revision 1.13.4.13
retrieving revision 1.13.4.14
diff -u -r1.13.4.13 -r1.13.4.14
--- squid3/src/net_db.cc	1 May 2007 08:32:31 -0000	1.13.4.13
+++ squid3/src/net_db.cc	16 May 2007 07:07:02 -0000	1.13.4.14
@@ -1,6 +1,6 @@
 
 /*
- * $Id: net_db.cc,v 1.13.4.13 2007/05/01 08:32:31 amosjeffries Exp $
+ * $Id: net_db.cc,v 1.13.4.14 2007/05/16 07:07:02 amosjeffries Exp $
  *
  * DEBUG: section 38    Network Measurement Database
  * AUTHOR: Duane Wessels
@@ -703,7 +703,7 @@
     int oldbufofs = ex->buf_ofs;
 
     rec_sz = 0;
-    rec_sz += 1 + sizeof(addr.s_addr);
+    rec_sz += 1 + sizeof(addr);
     rec_sz += 1 + sizeof(int);
     rec_sz += 1 + sizeof(int);
     debugs(38, 3, "netdbExchangeHandleReply: " << recievedData.length << " read bytes");
@@ -788,8 +788,8 @@
 
             case NETDB_EX_NETWORK:
                 o++;
-                xmemcpy(&addr, p + o, sizeof(addr.s_addr));
-                o += sizeof(addr.s_addr);
+                xmemcpy(&addr, p + o, sizeof(addr));
+                o += sizeof(addr);
                 break;
 
             case NETDB_EX_RTT:
@@ -1130,11 +1130,11 @@
     double rtt = (double) irtt;
     double hops = (double) ihops;
     net_db_peer *p;
-    debugs(38, 3, "netdbUpdatePeer: '" << r->host << "', " << ihops << " hops, " << irtt << " rtt");
-    n = netdbLookupHost(r->host);
+    debugs(38, 3, "netdbUpdatePeer: '" << r->GetHost() << "', " << ihops << " hops, " << irtt << " rtt");
+    n = netdbLookupHost(r->GetHost());
 
     if (n == NULL) {
-        debugs(38, 3, "netdbUpdatePeer: host '" << r->host << "' not found");
+        debugs(38, 3, "netdbUpdatePeer: host '" << r->GetHost() << "' not found");
         return;
     }
 
@@ -1231,7 +1231,7 @@
     reply->setHeaders(version, HTTP_OK, "OK", NULL, -1, squid_curtime, -2);
     s->replaceHttpReply(reply);
     rec_sz = 0;
-    rec_sz += 1 + sizeof(addr.s_addr);
+    rec_sz += 1 + sizeof(addr);
     rec_sz += 1 + sizeof(int);
     rec_sz += 1 + sizeof(int);
     buf = (char *)memAllocate(MEM_4K_BUF);
@@ -1250,9 +1250,9 @@
 
         buf[i++] = (char) NETDB_EX_NETWORK;
 
-        xmemcpy(&buf[i], &addr.s_addr, sizeof(addr.s_addr));
+        xmemcpy(&buf[i], &addr, sizeof(addr));
 
-        i += sizeof(addr.s_addr);
+        i += sizeof(addr);
 
         buf[i++] = (char) NETDB_EX_RTT;
 
@@ -1353,11 +1353,11 @@
     const ipcache_addrs *ia;
     net_db_peer *h;
     int i;
-    n = netdbLookupHost(request->host);
+    n = netdbLookupHost(request->GetHost());
 
     if (NULL == n) {
         /* try IP addr */
-        ia = ipcache_gethostbyname(request->host, 0);
+        ia = ipcache_gethostbyname(request->GetHost(), 0);
 
         if (NULL != ia)
             n = netdbLookupAddr(ia->in_addrs[ia->cur]);