---------------------
PatchSet 1404 
Date: 2005/05/22 14:19:26
Author: rmartinez
Branch: squid3-ipv6
Tag: (none) 
Log:
Ordinary change. Module ready unless error

Members: 
	src/tools.cc:1.22.2.3->1.22.2.4 

Index: squid3/src/tools.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/tools.cc,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -r1.22.2.3 -r1.22.2.4
--- squid3/src/tools.cc	5 May 2005 09:22:33 -0000	1.22.2.3
+++ squid3/src/tools.cc	22 May 2005 14:19:26 -0000	1.22.2.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.22.2.3 2005/05/05 09:22:33 rmartinez Exp $
+ * $Id: tools.cc,v 1.22.2.4 2005/05/22 14:19:26 rmartinez Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -935,7 +935,7 @@
 {
 
     struct IN_ADDR s;
-    xmemcpy(&s.s_addr, hp->h_addr, sizeof(s.s_addr));
+    xmemcpy(&s, hp->h_addr, sizeof(s));
     return s;
 }
 
@@ -1169,12 +1169,12 @@
 getMyPort(void)
 {
     if (Config.Sockaddr.http)
-        return ntohs(Config.Sockaddr.http->s.sin_port);
+        return ntohs(PORT_FROM_SA(Config.Sockaddr.http->s));
 
 #if USE_SSL
 
     if (Config.Sockaddr.https)
-        return ntohs(Config.Sockaddr.https->http.s.sin_port);
+        return ntohs(PORT_FROM_SA(Config.Sockaddr.https->http.s));
 
 #endif