lör 2010-05-15 klockan 22:47 +1200 skrev Amos Jeffries: > I think we should retain a test for existence of IPV6_V6ONLY though. It > can be a if-compiles and will catch the WindowsXP etc cases.
Why? If IPV6_ONLY is there then the code will always request it to be disabled. > The .cc/.h changes need some text fixes: > "caouse trobles" => "cause trouble" Right. > "Windows Vista" => "Windows Vista and later" OK, I'll fix that in both original and new copy.. > new level-0 debugs() calls also need to use DBG_CRITICAL instead of > magic number so we can find them again easily. Didn't add any, just filtered an existing one.. but can fix that. New version attached. Also fixed a trivial bug next to that debugs statement,, (warned = 0 should be 1...) Regards Henrik
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: hen...@henriknordstrom.net-20100515211950-\ # 293g337key1db4lw # target_branch: http://squid-cache.org/bzr/squid3/branches/SQUID_3_1/ # testament_sha1: d927df1c844b0a33d9d1c016a3b0955937b75600 # timestamp: 2010-05-15 23:19:57 +0200 # base_revision_id: hen...@henriknordstrom.net-20100514124035-\ # ugh17zxh8s1ze14l # # Begin patch === modified file 'configure.in' --- configure.in 2010-05-05 07:42:45 +0000 +++ configure.in 2010-05-15 09:19:58 +0000 @@ -365,10 +365,6 @@ fi ]) -dnl Nasty hack to get autoconf 2.64 on Linux to run. -dnl all other uses of RUN_IFELSE are wrapped inside CACHE_CHECK which breaks on 2.64 -AC_RUN_IFELSE([AC_LANG_SOURCE([[ int main(int argc, char **argv) { return 0; } ]])],[],[],[]) - dnl This is a developer only option.. developers know how to set defines dnl dnl AC_ARG_ENABLE(xmalloc-debug, @@ -2674,7 +2670,7 @@ ;; esac AC_CACHE_CHECK([if PF_INET6 is available], squid_cv_pf_inet6, - AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */ # include <sys/types.h> # include <sys/socket.h> int main(int argc, char **argv) { @@ -2699,56 +2695,6 @@ if test "$use_ipng" != "no" && test "$squid_cv_pf_inet6" = "yes" ; then AC_DEFINE(USE_IPV6,1,[Enable support for IPv6 ]) SET_IPV6_SETTINGS="" - use_v4mapped=yes - -dnl Check for forced split-stack mode - AC_MSG_CHECKING([for IPv6 split-stack requirement]) - AC_ARG_WITH(ipv6-split-stack, - AS_HELP_STRING([--with-ipv6-split-stack],[Force-Enable experimental split-stack support for Windows XP and *BSD. Requires IPv6.]), - [ use_v4mapped="no" - AC_MSG_RESULT(yes)], - [ AC_MSG_RESULT(no) ]) - -dnl Check for IPv6 v4-mapping availability -dnl Useful for other OS with hybrid-stack defaults turned OFF -dnl But only usable if it actually works... - if test "$use_v4mapped" = "yes" ; then - AC_MSG_CHECKING([for IPv6 v4-mapping ability]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* IPPROTO_V4MAPPED is usable check */ -# include <sys/types.h> -# include <sys/socket.h> -# include <netinet/in.h> -#if HAVE_NETINET_IN6_H -# include <netinet/in6.h> -#endif - int main(int argc, char **argv) { - int s = socket(PF_INET6, SOCK_STREAM, 0); - int tos = 0; - if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &tos, sizeof(int)) < 0) - return 1; - else - return 0; - } - ]])],[ AC_MSG_RESULT(yes) - use_v4mapped=yes - AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 1, [Enable v4-mapping through v6 sockets]) - ],[ AC_MSG_RESULT(no) - AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 0, [Enable v4-mapping through v6 sockets]) - use_v4mapped=no - ],[]) - fi - -dnl if we can't defer v4-mapping to the OS we are forced to split-stack the FD table. - AC_MSG_CHECKING([for IPv6 stack type/mode]) - if test "$use_v4mapped" = "yes"; then - AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 1, [Enable v4-mapping through v6 sockets. Requires IPv6 hybrid-stack.]) - AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 0, [Enable support for IPv6 on split-stack implementations]) - AC_MSG_RESULT(mapping hybrid) - else - AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 0, [Enable v4-mapping through v6 sockets. Requires IPv6 hybrid-stack.]) - AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 1, [Enable support for IPv6 on split-stack implementations]) - AC_MSG_RESULT(split-stack or BSD non-mapping dual-stack) - fi dnl Check whether this OS defines sin6_len as a member of sockaddr_in6 as a backup to ss_len AC_CACHE_CHECK([for sin6_len field in struct sockaddr_in6], @@ -2769,8 +2715,6 @@ else # IPv6 is not available, but is not explicitly required. Auto-Disable. AC_DEFINE(USE_IPV6,0,[Enable support for IPv6]) - AC_DEFINE(IPV6_SPECIAL_SPLITSTACK,0,[Enable support for IPv6 on split-stack implementations]) - AC_DEFINE(IPV6_SPECIAL_V4MAPPED,0,[Enable v4-mapping through v6 sockets]) SET_IPV6_SETTINGS="\#IPv6 Not Available: " fi AC_SUBST(SET_IPV6_SETTINGS) === modified file 'src/acl/Ip.cc' --- src/acl/Ip.cc 2010-01-16 04:33:11 +0000 +++ src/acl/Ip.cc 2010-05-15 09:19:58 +0000 @@ -421,10 +421,6 @@ hints.ai_flags |= AI_NUMERICHOST; } -#if 0 && USE_IPV6 && !IPV6_SPECIAL_SPLITSTACK - hints.ai_flags |= AI_V4MAPPED | AI_ALL; -#endif - int errcode = xgetaddrinfo(addr1,NULL,&hints,&hp); if (hp == NULL) { debugs(28, 0, "aclIpParseIpData: Bad host/IP: '" << addr1 << === modified file 'src/comm.cc' --- src/comm.cc 2010-05-14 12:40:35 +0000 +++ src/comm.cc 2010-05-15 21:19:50 +0000 @@ -661,7 +661,10 @@ debugs(50, 1, "comm_open: setsockopt(IPV6_V6ONLY) on FD " << fd << ": " << xstrerror()); } #else - debugs(50, 0, "WARNING: comm_open: setsockopt(IPV6_V6ONLY) not supported on this platform"); + static bool warned = 0; + if (!warned) + debugs(50, DBG_CRITICAL, "WARNING: setsockopt(IPV6_V6ONLY) not supported on this platform. May cause troble connecting to IPv4 sites."); + warned = 1; #endif /* sockopt */ } @@ -756,20 +759,11 @@ tos = TOS; } -#if IPV6_SPECIAL_SPLITSTACK - - if ( addr.IsIPv6() ) - comm_set_v6only(new_socket, tos); - -#endif - -#if IPV6_SPECIAL_V4MAPPED - - /* Windows Vista supports Dual-Sockets. BUT defaults them to V6ONLY. Turn it OFF. */ +#if USE_IPV6 + /* Windows Vista and later supports Dual-Sockets. BUT defaults V6ONLY. Turn it OFF. */ /* Other OS may have this administratively disabled for general use. Same deal. */ if ( addr.IsIPv6() ) comm_set_v6only(new_socket, 0); - #endif /* update fdstat */ @@ -1051,11 +1045,11 @@ if (F->tos) comm_set_tos(fd, F->tos); -#if IPV6_SPECIAL_SPLITSTACK - +#if USE_IPV6 + /* Windows Vista and later supports Dual-Sockets. BUT defaults V6ONLY. Turn it OFF. */ + /* Other OS may have this administratively disabled for general use. Same deal. */ if ( F->local_addr.IsIPv6() ) - comm_set_v6only(fd, F->tos); - + comm_set_v6only(fd, 0); #endif copyFDFlags(fd, F); === modified file 'src/ip/IpAddress.h' --- src/ip/IpAddress.h 2010-05-14 04:16:42 +0000 +++ src/ip/IpAddress.h 2010-05-15 09:19:58 +0000 @@ -331,11 +331,7 @@ \param ai structure to be filled out. \param force a specific sockaddr type is needed. default: don't care. */ -#if IPV6_SPECIAL_V4MAPPING - void GetAddrInfo(struct addrinfo *&ai, int force = AF_INET6) const; -#else void GetAddrInfo(struct addrinfo *&ai, int force = AF_UNSPEC) const; -#endif /** * Equivalent to the sysem call freeaddrinfo() but for IpAddress allocated data # Begin bundle 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 /4u5IpwoSBGq8x6A
