---------------------
PatchSet 1396 
Date: 2005/05/20 15:14:31
Author: rmartinez
Branch: squid3-ipv6
Tag: (none) 
Log:
Fixing some AF family parameters. Module ready unless error

Members: 
	src/neighbors.cc:1.23.4.4->1.23.4.5 

Index: squid3/src/neighbors.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/neighbors.cc,v
retrieving revision 1.23.4.4
retrieving revision 1.23.4.5
diff -u -r1.23.4.4 -r1.23.4.5
--- squid3/src/neighbors.cc	5 May 2005 09:22:02 -0000	1.23.4.4
+++ squid3/src/neighbors.cc	20 May 2005 15:14:31 -0000	1.23.4.5
@@ -1,6 +1,6 @@
 
 /*
- * $Id: neighbors.cc,v 1.23.4.4 2005/05/05 09:22:02 rmartinez Exp $
+ * $Id: neighbors.cc,v 1.23.4.5 2005/05/20 15:14:31 rmartinez Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -563,7 +563,7 @@
         echo_hdr.reqnum = 0;
         echo_hdr.flags = 0;
         echo_hdr.pad = 0;
-// Rafa        echo_hdr.shostid = name.sin_addr.s_addr;
+        echo_hdr.shostid = ADDR_FROM_SA(name);
         sep = getservbyname("echo", "udp");
         echo_port = sep ? ntohs((u_short) sep->s_port) : 7;
     }
@@ -730,7 +730,7 @@
             if (icmp_sock != -1) {
                 icmpSourcePing(ia->in_addrs[ia->cur], &echo_hdr, url);
             } else {
-                FAMILY_FROM_SA(to_addr) = AF_INET;
+                FAMILY_FROM_SA(to_addr) = AF_FAMILY;
                 ADDR_FROM_SA(to_addr) = ia->in_addrs[ia->cur];
                 PORT_FROM_SA(to_addr) = htons(echo_port);
                 query = _icp_common_t::createMessage(ICP_SECHO, 0, url, reqnum, 0);
@@ -1318,7 +1318,7 @@
     ap = &p->in_addr;
 
     memset(ap, '\0', sizeof(struct SOCKADDR_IN));
-    FAMILY_FROM_SA(*ap)=AF_INET;
+    FAMILY_FROM_SA(*ap)=AF_FAMILY;
     ADDR_FROM_SA(*ap) = p->addresses[0];
     PORT_FROM_SA(*ap) = htons(p->icp.port);