--------------------- PatchSet 1439 Date: 2005/06/01 17:06:10 Author: rmartinez Branch: squid3-ipv6 Tag: (none) Log: Ordinary changes. But only on _SQUID_LINUX box ! . Must study how ARP works with IPv6 ! Members: src/ACLARP.cc:1.9.4.2->1.9.4.3 Index: squid3/src/ACLARP.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ACLARP.cc,v retrieving revision 1.9.4.2 retrieving revision 1.9.4.3 diff -u -r1.9.4.2 -r1.9.4.3 --- squid3/src/ACLARP.cc 25 Apr 2005 13:17:00 -0000 1.9.4.2 +++ squid3/src/ACLARP.cc 1 Jun 2005 17:06:10 -0000 1.9.4.3 @@ -1,5 +1,5 @@ /* - * $Id: ACLARP.cc,v 1.9.4.2 2005/04/25 13:17:00 rmartinez Exp $ + * $Id: ACLARP.cc,v 1.9.4.3 2005/06/01 17:06:10 rmartinez Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -260,9 +260,9 @@ /* * Set up structures for ARP lookup with blank interface name */ - FAMILY_FROM_SA(ipAddr) = AF_INET; + FAMILY_FROM_SA(ipAddr) = AF_FAMILY; PORT_FROM_SA(ipAddr) = 0; - ipAddr.sin_addr = c; + ADDR_FROM_SA(ipAddr) = c; memset(&arpReq, '\0', sizeof(arpReq)); xmemcpy(&arpReq.arp_pa, &ipAddr, sizeof(struct SOCKADDR_IN)); @@ -323,11 +323,11 @@ ifr->ifr_name); /* Set up structures for ARP lookup */ - FAMILY_FROM_SA(ipAddr) = AF_INET; + FAMILY_FROM_SA(ipAddr) = AF_FAMILY; PORT_FROM_SA(ipAddr) = 0; - ipAddr.sin_addr = c; + ADDR_FROM_SA(ipAddr) = c; memset(&arpReq, '\0', sizeof(arpReq)); @@ -402,7 +402,7 @@ PORT_FROM_SA(ipAddr) = 0; - ipAddr.sin_addr = c; + ADDR_FROM_SA(ipAddr) = c; memset(&arpReq, '\0', sizeof(arpReq)); @@ -463,7 +463,7 @@ PORT_FROM_SA(ipAddr) = 0; - ipAddr.sin_addr = c; + ADDR_FROM_SA(ipAddr) = c; memset(&arpReq, '\0', sizeof(arpReq));