--------------------- PatchSet 4127 Date: 2007/03/27 09:50:06 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: grr, looks ike it was all lost somewhere. Members: lib/IPAddress.cc:1.1.2.8->1.1.2.9 Index: squid3/lib/IPAddress.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/Attic/IPAddress.cc,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -u -r1.1.2.8 -r1.1.2.9 --- squid3/lib/IPAddress.cc 26 Mar 2007 10:51:00 -0000 1.1.2.8 +++ squid3/lib/IPAddress.cc 27 Mar 2007 09:50:06 -0000 1.1.2.9 @@ -1,5 +1,5 @@ /* - * $Id: IPAddress.cc,v 1.1.2.8 2007/03/26 10:51:00 amosjeffries Exp $ + * $Id: IPAddress.cc,v 1.1.2.9 2007/03/27 09:50:06 amosjeffries Exp $ */ #include "IPAddress.h" @@ -256,7 +256,18 @@ return false; } - return operator=(hp->h_addr_list[0]); + if(hp->h_addrtype == AF_INET) + operator=( *((struct in_addr*)hp->h_addr_list[0]) ); +#ifdef USE_IPV6 + else if(hp->h_addrtype == AF_INET6) + operator=( *((struct in6_addr*)hp->h_addr_list[0]) ); +#endif + else + { + fprintf(stderr, "IPAddress::operator=(hostent*) : Discarding IP address '%s'.\n",s); + return false; + } + return true; }