---------------------
PatchSet 3288 
Date: 2001/10/30 12:33:18
Author: rvenning
Branch: ipv6
Tag: (none) 
Log:
linux-netfilter stuff should compile. Almost assuredly won't actually work.

Members: 
	src/client_side.c:1.7.2.7->1.7.2.8 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/client_side.c,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -u -r1.7.2.7 -r1.7.2.8
--- squid/src/client_side.c	25 Oct 2001 18:24:54 -0000	1.7.2.7
+++ squid/src/client_side.c	30 Oct 2001 12:33:18 -0000	1.7.2.8
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.c,v 1.7.2.7 2001/10/25 18:24:54 hno Exp $
+ * $Id: client_side.c,v 1.7.2.8 2001/10/30 12:33:18 rvenning Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -63,7 +63,11 @@
 #endif
 
 #if LINUX_NETFILTER
+#if INET6
+#include <linux/netfilter_ipv6.h>
+#else
 #include <linux/netfilter_ipv4.h>
+#endif /* INET6 */
 #endif
 
 
@@ -2663,9 +2667,9 @@
 #if LINUX_NETFILTER
 	    /* If the call fails the address structure will be unchanged */
 	    getsockopt(conn->fd, SOL_IP, SO_ORIGINAL_DST, &conn->me, &sock_sz);
-	    debug(33, 5) ("parseHttpRequest: addr = %s", inet_ntoa(conn->me.sin_addr));
+	    debug(33, 5) ("parseHttpRequest: addr = %s", INET_NTOA(ADDR_FROM_SA(conn->me)));
 	    if (vport_mode)
-		vport = (int) ntohs(http->conn->me.sin_port);
+		vport = (int) ntohs(PORT_FROM_SA(http->conn->me));
 #endif
 	    snprintf(http->uri, url_sz, "http://%s:%d%s",
 		SA_NTOA(http->conn->me),