---------------------
PatchSet 6361 
Date: 2004/12/08 19:52:13
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Added native Windows support for ARP ACL

Members: 
	port/win32/include/autoconf.h:1.1.2.37->1.1.2.38 
	port/win32/include/squid-mswin.h:1.1.2.23->1.1.2.24 
	port/win32/squid/squid.dsp:1.1.2.11->1.1.2.12 

Index: squid/port/win32/include/autoconf.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v
retrieving revision 1.1.2.37
retrieving revision 1.1.2.38
diff -u -r1.1.2.37 -r1.1.2.38
--- squid/port/win32/include/autoconf.h	3 Oct 2004 15:21:09 -0000	1.1.2.37
+++ squid/port/win32/include/autoconf.h	8 Dec 2004 19:52:13 -0000	1.1.2.38
@@ -22,7 +22,7 @@
  *
  */
 
-/* $Id: autoconf.h,v 1.1.2.37 2004/10/03 15:21:09 serassio Exp $ */
+/* $Id: autoconf.h,v 1.1.2.38 2004/12/08 19:52:13 serassio Exp $ */
 
 /*
  * configure command line used to configure Squid
@@ -133,6 +133,7 @@
  * functions found in 4.4 BSD derviations (e.g. FreeBSD, ?).
  */
 #undef USE_ARP_ACL 
+#define USE_ARP_ACL 1
 
 /*
  * Define this to include code for the Hypertext Cache Protocol (HTCP)
@@ -149,7 +150,7 @@
 /*
  * Cache Array Routing Protocol
  */
-#undef USE_CARP 
+#undef USE_CARP
 
 /* Define if NTLM is allowed to fail gracefully when a helper has problems */
 #undef NTLM_FAIL_OPEN 
@@ -557,7 +558,6 @@
 
 /* Define if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
-#define HAVE_MALLOC_H 1
 
 /* Define if you have the `mallopt' function. */
 #undef HAVE_MALLOPT
@@ -967,6 +967,16 @@
 #else
 #define STR_USE_SSL ""
 #endif
+#if USE_CARP
+#define STR_USE_CARP "--enable-carp "
+#else
+#define STR_USE_CARP ""
+#endif
+#if USE_ARP_ACL
+#define STR_USE_ARP_ACL "--enable-arp-acl "
+#else
+#define STR_USE_ARP_ACL ""
+#endif
 
 #define SQUID_CONFIGURE_OPTIONS "--enable-win32-service --enable-underscores --enable-storeio='ufs awin32 null' " \
     "--enable-removal-policies='heap lru' --enable-snmp --enable-htcp --disable-wccp --enable-useragent-log " \
@@ -976,4 +986,6 @@
     STR_USE_ICMP \
     STR_USE_DNSSERVERS \
     STR_USE_SSL \
+    STR_USE_CARP \
+    STR_USE_ARP_ACL \
     "--prefix=c:/squid"
Index: squid/port/win32/include/squid-mswin.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/squid-mswin.h,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- squid/port/win32/include/squid-mswin.h	22 Jun 2004 19:22:28 -0000	1.1.2.23
+++ squid/port/win32/include/squid-mswin.h	8 Dec 2004 19:52:13 -0000	1.1.2.24
@@ -1,5 +1,5 @@
 /*
- * $Id: squid-mswin.h,v 1.1.2.23 2004/06/22 19:22:28 serassio Exp $
+ * $Id: squid-mswin.h,v 1.1.2.24 2004/12/08 19:52:13 serassio Exp $
  *
  * AUTHOR: Guido Serassio & Andrey Shorin
  *
@@ -386,3 +386,9 @@
 	long ru_nvcsw;			/* voluntary context switches */
 	long ru_nivcsw;			/* involuntary context switches */
 };
+
+struct arpreq {
+    struct sockaddr arp_pa;   /* protocol address */
+    struct sockaddr arp_ha;   /* hardware address */
+    int arp_flags;            /* flags */
+};
Index: squid/port/win32/squid/squid.dsp
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.dsp,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- squid/port/win32/squid/squid.dsp	18 Apr 2004 08:09:20 -0000	1.1.2.11
+++ squid/port/win32/squid/squid.dsp	8 Dec 2004 19:52:14 -0000	1.1.2.12
@@ -50,7 +50,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib Iphlpapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "squid - Win32 Debug"
 
@@ -74,7 +74,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib Iphlpapi.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF