--------------------- PatchSet 5482 Date: 2007/08/23 08:35:25 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Fix inconsistent use of configuration macros. - now IPV6_SPECIAL_SPLITSTACK same format as other IPv6 --with-* macros. Members: configure.in:1.63.2.41->1.63.2.42 src/ACLIP.cc:1.8.2.41->1.8.2.42 src/comm.cc:1.47.2.47->1.47.2.48 src/external_acl.cc:1.37.6.15->1.37.6.16 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.63.2.41 retrieving revision 1.63.2.42 diff -u -r1.63.2.41 -r1.63.2.42 --- squid3/configure.in 19 Aug 2007 11:03:05 -0000 1.63.2.41 +++ squid3/configure.in 23 Aug 2007 08:35:25 -0000 1.63.2.42 @@ -1,7 +1,7 @@ dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.63.2.41 2007/08/19 11:03:05 amosjeffries Exp $ +dnl $Id: configure.in,v 1.63.2.42 2007/08/23 08:35:25 amosjeffries Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) AM_INIT_AUTOMAKE([tar-ustar]) -AC_REVISION($Revision: 1.63.2.41 $)dnl +AC_REVISION($Revision: 1.63.2.42 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1817,8 +1817,8 @@ AC_MSG_CHECKING([for IPv6 split-stack requirement]) AC_ARG_WITH(ipv6-split-stack, [ --with-ipv6-split-stack Require IPv6 split-stack support (Requires IPv6 Support)], - AC_DEFINE(USE_IPV6_SPLITSTACK, 1, [ 1 == Enable support for IPv6 on split-stack implementations]) , - AC_DEFINE(USE_IPV6_SPLITSTACK, 0, [ 0 == Disable support for split-stack IPv6 implementations]) + AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 1, [ 1 == Enable support for IPv6 on split-stack implementations]) , + AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 0, [ 0 == Disable support for split-stack IPv6 implementations]) ) dnl Check for IPv6 Windows Vista option @@ -1860,8 +1860,8 @@ [ AC_DEFINE(USE_IPV6,1,[Enable support for IPv6 ]) AC_MSG_RESULT(yes) ], - [ AC_DEFINE(USE_IPV6,0,[ 0 == Disable support for IPv6]) - AC_DEFINE(USE_IPV6_SPLITSTACK,0,[ 0 == Disable support for Split-Stack IPv6 Implementations]) + [ AC_DEFINE(USE_IPV6,0,[0 == Disable support for IPv6]) + AC_DEFINE(IPV6_SPECIAL_SPLITSTACK,0,[0 == Disable support for Split-Stack IPv6 Implementations]) AC_DEFINE(IPV6_SPECIAL_LOCALHOST,0,[0 == Keep IPv4 and IPv6 Localhosts seperate.]) AC_DEFINE(IPV6_SPECIAL_V4MAPPING,0,[0 == Leave all v4-mapping to OS Implementation]) AC_MSG_RESULT(no) @@ -1869,7 +1869,7 @@ ) ], [ AC_DEFINE(USE_IPV6,0,[Disable support for IPv6]) - AC_DEFINE(USE_IPV6_SPLITSTACK,0,[ 0 == Disable support for Split-Stack IPv6 Implementations]) + AC_DEFINE(IPV6_SPECIAL_SPLITSTACK,0,[ 0 == Disable support for Split-Stack IPv6 Implementations]) AC_DEFINE(IPV6_SPECIAL_LOCALHOST,0,[ 0 == Keep IPv4 and IPv6 Localhosts seperate.]) AC_DEFINE(IPV6_SPECIAL_V4MAPPING,0,[ 0 == Leave v4-mapping to OS Implementation]) AC_MSG_RESULT(no) Index: squid3/src/ACLIP.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ACLIP.cc,v retrieving revision 1.8.2.41 retrieving revision 1.8.2.42 diff -u -r1.8.2.41 -r1.8.2.42 --- squid3/src/ACLIP.cc 19 Aug 2007 12:45:56 -0000 1.8.2.41 +++ squid3/src/ACLIP.cc 23 Aug 2007 08:35:25 -0000 1.8.2.42 @@ -1,5 +1,5 @@ /* - * $Id: ACLIP.cc,v 1.8.2.41 2007/08/19 12:45:56 amosjeffries Exp $ + * $Id: ACLIP.cc,v 1.8.2.42 2007/08/23 08:35:25 amosjeffries Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -313,7 +313,7 @@ if( iptype != AF_UNSPEC ) hints.ai_flags |= AI_NUMERICHOST; -#if 0 && USE_IPV6 && !USE_IPV6_SPLIT_STACK +#if 0 && USE_IPV6 && !IPV6_SPECIAL_SPLITSTACK hints.ai_flags |= AI_V4MAPPED | AI_ALL; #endif Index: squid3/src/comm.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/comm.cc,v retrieving revision 1.47.2.47 retrieving revision 1.47.2.48 diff -u -r1.47.2.47 -r1.47.2.48 --- squid3/src/comm.cc 21 Aug 2007 11:51:25 -0000 1.47.2.47 +++ squid3/src/comm.cc 23 Aug 2007 08:35:25 -0000 1.47.2.48 @@ -1,6 +1,6 @@ /* - * $Id: comm.cc,v 1.47.2.47 2007/08/21 11:51:25 amosjeffries Exp $ + * $Id: comm.cc,v 1.47.2.48 2007/08/23 08:35:25 amosjeffries Exp $ * * DEBUG: section 5 Socket Functions * AUTHOR: Harvest Derived @@ -919,14 +919,14 @@ tos = TOS; } -#if USE_IPV6_SPLITSTACK +#if IPV6_SPECIAL_SPLITSTACK if( addr.IsIPv6() ) comm_set_v6only(new_socket, tos); #endif -#if USE_IPV6_SPECIAL_V4MAPPED && defined(_SQUID_MSWIN_) +#if IPV6_SPECIAL_V4MAPPED && defined(_SQUID_MSWIN_) /* Windows Vista supports Dual-Sockets. BUT defaults them to V6ONLY. Turn it OFF. */ if( addr.IsIPv6() ) @@ -1185,7 +1185,7 @@ if (F->tos) comm_set_tos(fd, F->tos); -#if USE_IPV6_SPLITSTACK +#if IPV6_SPECIAL_SPLITSTACK if( F->local_addr.IsIPv6() ) comm_set_v6only(fd, F->tos); Index: squid3/src/external_acl.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/external_acl.cc,v retrieving revision 1.37.6.15 retrieving revision 1.37.6.16 diff -u -r1.37.6.15 -r1.37.6.16 --- squid3/src/external_acl.cc 23 Aug 2007 04:27:06 -0000 1.37.6.15 +++ squid3/src/external_acl.cc 23 Aug 2007 08:35:25 -0000 1.37.6.16 @@ -1,6 +1,6 @@ /* - * $Id: external_acl.cc,v 1.37.6.15 2007/08/23 04:27:06 amosjeffries Exp $ + * $Id: external_acl.cc,v 1.37.6.16 2007/08/23 08:35:25 amosjeffries Exp $ * * DEBUG: section 82 External ACL * AUTHOR: Henrik Nordstrom, MARA Systems AB @@ -266,7 +266,7 @@ bind to IPv4/v6 localhost port. */ } else if (strcmp(token, "ipv4") == 0) { if( !a->local_addr.SetIPv4() ) { -#if USE_IPV6_SPECIAL_LOCALHOST +#if IPV6_SPECIAL_LOCALHOST debugs(3, 0, "WARNING: --with-localhost-ipv6 conflicts with external ACL helper to using IPv4: " << a->name ); #else (void)0;