--------------------- PatchSet 1111 Date: 2004/12/09 20:41:19 Author: serassio Branch: nt Tag: (none) Log: Added native Windows ARP ACL support Members: port/win32/include/autoconf.h:1.2.18.8->1.2.18.9 port/win32/libbasic/libbasic.dsp:1.2.18.1->1.2.18.2 port/win32/squid/squid.dsp:1.2.18.10->1.2.18.11 Index: squid3/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/autoconf.h,v retrieving revision 1.2.18.8 retrieving revision 1.2.18.9 diff -u -r1.2.18.8 -r1.2.18.9 --- squid3/port/win32/include/autoconf.h 3 Jan 2004 16:49:57 -0000 1.2.18.8 +++ squid3/port/win32/include/autoconf.h 9 Dec 2004 20:41:19 -0000 1.2.18.9 @@ -733,7 +733,7 @@ /* Define this to include code which lets you specify access control elements based on ethernet hardware addresses. This code uses functions found in 4.4 BSD derviations (e.g. FreeBSD, ?). */ -/* #undef USE_ARP_ACL */ +#define USE_ARP_ACL 1 /* Use Cache Digests for locating objects in neighbor caches. This code is still semi-experimental. */ Index: squid3/port/win32/libbasic/libbasic.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libbasic/Attic/libbasic.dsp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/libbasic/libbasic.dsp 25 Feb 2003 02:48:49 -0000 1.2.18.1 +++ squid3/port/win32/libbasic/libbasic.dsp 9 Dec 2004 20:41:20 -0000 1.2.18.2 @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /TP /c +# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /TP /c # ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD RSC /l 0x410 /d "NDEBUG" BSC32=bscmake.exe @@ -64,7 +64,7 @@ # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x410 /d "_DEBUG" BSC32=bscmake.exe Index: squid3/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.2.18.10 retrieving revision 1.2.18.11 diff -u -r1.2.18.10 -r1.2.18.11 --- squid3/port/win32/squid/squid.dsp 4 Sep 2004 16:08:44 -0000 1.2.18.10 +++ squid3/port/win32/squid/squid.dsp 9 Dec 2004 20:41:20 -0000 1.2.18.11 @@ -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 LIBCMT.LIB ws2_32.lib advapi32.lib psapi.lib ssleay32.lib libeay32.lib gdi32.lib libexpat.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 LIBCMT.LIB ws2_32.lib advapi32.lib psapi.lib iphlpapi.lib ssleay32.lib libeay32.lib gdi32.lib libexpat.lib /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "squid - Win32 Debug" @@ -136,6 +136,10 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\..\src\ACLARP.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\ACLASN.cc # End Source File # Begin Source File