X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=filters.c;h=15dba3da4331bb83b308e8c992a8f55b4d02db5d;hp=43b002f2b39d3b821087c13b09402b27f77b5bb7;hb=c052221ed80f6c8cddccdbb18907375502652042;hpb=df9616f1dacac74ba9469d6c334d0105a6effe15 diff --git a/filters.c b/filters.c index 43b002f2..15dba3da 100644 --- a/filters.c +++ b/filters.c @@ -1,4 +1,4 @@ -const char filters_rcs[] = "$Id: filters.c,v 1.113 2009/03/08 14:19:23 fabiankeil Exp $"; +const char filters_rcs[] = "$Id: filters.c,v 1.114 2009/04/17 11:27:49 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/filters.c,v $ @@ -40,6 +40,9 @@ const char filters_rcs[] = "$Id: filters.c,v 1.113 2009/03/08 14:19:23 fabiankei * * Revisions : * $Log: filters.c,v $ + * Revision 1.114 2009/04/17 11:27:49 fabiankeil + * Petr Pisar's privoxy-3.0.12-ipv6-3.diff. + * * Revision 1.113 2009/03/08 14:19:23 fabiankeil * Fix justified (but harmless) compiler warnings * on platforms where sizeof(int) < sizeof(long). @@ -822,14 +825,14 @@ int match_sockaddr(const struct sockaddr_storage *network, /* Check for family */ if (network->ss_family == AF_INET && address->ss_family == AF_INET6 && - IN6_IS_ADDR_V4MAPPED(address_addr)) + IN6_IS_ADDR_V4MAPPED((struct in6_addr *)address_addr)) { /* Map AF_INET6 V4MAPPED address into AF_INET */ address_addr += 12; addr_len = 4; } else if (network->ss_family == AF_INET6 && address->ss_family == AF_INET && - IN6_IS_ADDR_V4MAPPED(network_addr)) + IN6_IS_ADDR_V4MAPPED((struct in6_addr *)network_addr)) { /* Map AF_INET6 V4MAPPED network into AF_INET */ network_addr += 12;