--------------------- PatchSet 5111 Date: 2007/07/30 11:06:49 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Finish IPC code conversion. Members: src/icp_v2.cc:1.17.8.20->1.17.8.21 Index: squid3/src/icp_v2.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/icp_v2.cc,v retrieving revision 1.17.8.20 retrieving revision 1.17.8.21 diff -u -r1.17.8.20 -r1.17.8.21 --- squid3/src/icp_v2.cc 30 Jul 2007 03:17:59 -0000 1.17.8.20 +++ squid3/src/icp_v2.cc 30 Jul 2007 11:06:49 -0000 1.17.8.21 @@ -1,6 +1,6 @@ /* - * $Id: icp_v2.cc,v 1.17.8.20 2007/07/30 03:17:59 amosjeffries Exp $ + * $Id: icp_v2.cc,v 1.17.8.21 2007/07/30 11:06:49 amosjeffries Exp $ * * DEBUG: section 12 Internet Cache Protocol (ICP) * AUTHOR: Duane Wessels @@ -568,15 +568,15 @@ icpPktDump(icp_common_t * pkt) { - struct in_addr a; + IPAddress a; debugs(12, 9, "opcode: " << std::setw(3) << pkt->opcode << " " << icp_opcode_str[pkt->opcode]); debugs(12, 9, "version: "<< std::left << std::setw(8) << pkt->version); debugs(12, 9, "length: "<< std::left << std::setw(8) << ntohs(pkt->length)); debugs(12, 9, "reqnum: "<< std::left << std::setw(8) << ntohl(pkt->reqnum)); debugs(12, 9, "flags: "<< std::left << std::hex << std::setw(8) << ntohl(pkt->flags)); - a.s_addr = pkt->shostid; - debugs(12, 9, "shostid: " << inet_ntoa(a)); + a = (struct in_addr)pkt->shostid; + debugs(12, 9, "shostid: " << a ); debugs(12, 9, "payload: " << (char *) pkt + sizeof(icp_common_t)); }