From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 6 Apr 2008 12:37:53 +0000 (+1200)
Subject: Bug 2299: src/ACLARP.cc fails to compile on Solaris 10
X-Git-Tag: BASIC_TPROXY4~3^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c33cf01ca4fdbc9e3ca1d79fd88c2e612854b35;p=thirdparty%2Fsquid.git

Bug 2299: src/ACLARP.cc fails to compile on Solaris 10
Author: Christos Tsantilas <chtsanti@users.sourceforge.net>
---

diff --git a/src/ACLARP.cc b/src/ACLARP.cc
index 391edb2daa..ee008dd0b6 100644
--- a/src/ACLARP.cc
+++ b/src/ACLARP.cc
@@ -247,6 +247,7 @@ int
 aclMatchArp(SplayNode<acl_arp_data *> **dataptr, IPAddress &c)
 {
     struct arpreq arpReq;
+    struct sockaddr_in *sa = NULL;
 
     IPAddress ipAddr = c;
 
@@ -254,7 +255,6 @@ aclMatchArp(SplayNode<acl_arp_data *> **dataptr, IPAddress &c)
 
     unsigned char ifbuffer[sizeof(struct ifreq) * 64];
     struct ifconf ifc;
-    struct sockaddr_in *sa = NULL;
 
     struct ifreq *ifr;
     int offset;
@@ -406,7 +406,8 @@ aclMatchArp(SplayNode<acl_arp_data *> **dataptr, IPAddress &c)
 
     memset(&arpReq, '\0', sizeof(arpReq));
 
-    ipAddr.GetSockAddr(arpReq.arp_pa);
+    sa = (sockaddr_in*)&arpReq.arp_pa;
+    ipAddr.GetSockAddr(*sa);
 
     /* Query ARP table */
     if (ioctl(HttpSockets[0], SIOCGARP, &arpReq) != -1) {