/hg/icedtea6: D560056: Avoid failure when net.ipv6.bindv6only is...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Aug 5 08:58:41 PDT 2010
changeset 6530d2aa9076 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6530d2aa9076
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Aug 05 16:58:30 2010 +0100
D560056: Avoid failure when net.ipv6.bindv6only is set to 1.
2010-08-05 Andrew John Hughes <ahughes at redhat.com>
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056
* Makefile.am: Add new patch.
* NEWS: Add bug fix and key for bug URLs.
* patches/ipv4-mapped-ipv6-addresses.patch: New patch and test
case from Torsten Werner <mail.twerner at googlemail.com>.
* THANKYOU: Updated.
diffstat:
5 files changed, 195 insertions(+), 1 deletion(-)
ChangeLog | 10 +
Makefile.am | 3
NEWS | 11 +
THANKYOU | 1
patches/ipv4-mapped-ipv6-addresses.patch | 171 ++++++++++++++++++++++++++++++
diffs (239 lines):
diff -r 87f0c2edefcf -r 6530d2aa9076 ChangeLog
--- a/ChangeLog Thu Aug 05 13:45:36 2010 +0200
+++ b/ChangeLog Thu Aug 05 16:58:30 2010 +0100
@@ -1,3 +1,13 @@ 2010-08-05 Gary Benson <gbenson at redhat
+2010-08-05 Andrew John Hughes <ahughes at redhat.com>
+
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056
+ * Makefile.am: Add new patch.
+ * NEWS: Add bug fix and key for bug URLs.
+ * patches/ipv4-mapped-ipv6-addresses.patch:
+ New patch and test case from Torsten Werner
+ <mail.twerner at googlemail.com>.
+ * THANKYOU: Updated.
+
2010-08-05 Gary Benson <gbenson at redhat.com>
* NEWS: Updated with LLVM 2.7 non-product fixes.
diff -r 87f0c2edefcf -r 6530d2aa9076 Makefile.am
--- a/Makefile.am Thu Aug 05 13:45:36 2010 +0200
+++ b/Makefile.am Thu Aug 05 16:58:30 2010 +0100
@@ -287,7 +287,8 @@ ICEDTEA_PATCHES = \
patches/openjdk/6668231-ssl_cert.patch \
patches/openjdk/6967533-pre_epoch.patch \
patches/fonts-rhel.patch \
- patches/fonts-gentoo.patch
+ patches/fonts-gentoo.patch \
+ patches/ipv4-mapped-ipv6-addresses.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r 87f0c2edefcf -r 6530d2aa9076 NEWS
--- a/NEWS Thu Aug 05 13:45:36 2010 +0200
+++ b/NEWS Thu Aug 05 16:58:30 2010 +0100
@@ -1,3 +1,13 @@ New in release 1.9 (2010-XX-XX):
+Key:
+
+SX - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6969395
+PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X
+RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X
+DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X
+GX - http://bugs.gentoo.org/show_bug.cgi?id=X
+
+CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+
New in release 1.9 (2010-XX-XX):
* Updated to OpenJDK6 b20 with HotSpot 17.
@@ -693,6 +703,7 @@ New in release 1.9 (2010-XX-XX):
* Fixes:
- Provide font configuration for RHEL 6.
- G266295: Provide font configuration for Gentoo.
+ - D560056: Avoid failure when net.ipv6.bindv6only is set to 1.
* Zero/Shark
- Update Shark for LLVM 2.8 API change r100304
- Shark calling static jni methods jclass argument fix.
diff -r 87f0c2edefcf -r 6530d2aa9076 THANKYOU
--- a/THANKYOU Thu Aug 05 13:45:36 2010 +0200
+++ b/THANKYOU Thu Aug 05 16:58:30 2010 +0100
@@ -6,3 +6,4 @@ us know. Please keep this list in alphab
Alon Bar-Lev (alon.barlev at gmail.com)
C. K. Jester-Young (cky944 at gmail.com)
+Torsten Werner (mail.twerner at googlemail.com)
\ No newline at end of file
diff -r 87f0c2edefcf -r 6530d2aa9076 patches/ipv4-mapped-ipv6-addresses.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ipv4-mapped-ipv6-addresses.patch Thu Aug 05 16:58:30 2010 +0100
@@ -0,0 +1,171 @@
+diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2010-02-17 04:14:47.000000000 +0100
++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2010-03-27 20:24:26.000000000 +0100
+@@ -37,6 +37,8 @@
+
+ #include <sys/poll.h>
+
++#include "net_util.h"
++
+ /*
+ * Stack allocated by thread when doing blocking operation
+ */
+@@ -301,9 +303,16 @@
+ BLOCKING_IO_RETURN_INT( s, accept(s, addr, addrlen) );
+ }
+
+-int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
++static int NET_Connect_final(int s, struct sockaddr *addr, int addrlen) {
+ BLOCKING_IO_RETURN_INT( s, connect(s, addr, addrlen) );
+ }
++int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
++ int rv = check_ipv4mapped_address(s, addr);
++ if (rv < 0) {
++ return rv;
++ }
++ return NET_Connect_final(s, addr, addrlen);
++}
+
+ #ifndef USE_SELECT
+ int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout) {
+diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c openjdk/jdk/src/solaris/native/java/net/net_util_md.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c 2010-02-17 04:14:47.000000000 +0100
++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c 2010-03-27 19:44:32.000000000 +0100
+@@ -1215,6 +1215,39 @@
+ return setsockopt(fd, level, opt, arg, len);
+ }
+
++/*
++ * Check for IPv4 mapped or unspecified IPv6 addresses and disable
++ * IPV6_V6ONLY in such cases. This function is called from NET_Bind and
++ * NET_Connect and fixes
++ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 .
++ */
++int
++check_ipv4mapped_address(int fd, struct sockaddr *him)
++{
++#if defined(AF_INET6)
++ if (ipv6_available()) {
++ struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him;
++ /* switch off IPV6_V6ONLY if needed */
++ if (IN6_IS_ADDR_V4MAPPED(& him6->sin6_addr) ||
++ IN6_IS_ADDR_UNSPECIFIED(& him6->sin6_addr)) {
++ int value = 42;
++ int len = sizeof(value);
++ int rv = getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
++ &value, &len);
++ if (rv < 0) {
++ return rv;
++ }
++ if (value > 0) {
++ value = 0;
++ return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
++ &value, sizeof(value));
++ }
++ }
++ }
++#endif
++ return 0;
++}
++
+ /*
+ * Wrapper for bind system call - performs any necessary pre/post
+ * processing to deal with OS specific issues :-
+@@ -1251,6 +1284,11 @@
+ }
+ #endif
+
++ rv = check_ipv4mapped_address(fd, him);
++ if (rv < 0) {
++ return rv;
++ }
++
+ #if defined(__solaris__) && defined(AF_INET6)
+ /*
+ * Solaris 8/9 have seperate IPv4 and IPv6 port spaces so we
+diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h openjdk/jdk/src/solaris/native/java/net/net_util_md.h
+--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h 2010-02-17 04:14:47.000000000 +0100
++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.h 2010-03-27 20:24:26.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include <sys/poll.h>
+ #endif
+
++extern int check_ipv4mapped_address(int fd, struct sockaddr *him);
+
+ #ifdef __linux__
+ extern int NET_Timeout(int s, long timeout);
+diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-27 20:23:58.000000000 +0100
++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-27 20:24:26.000000000 +0100
+@@ -401,8 +401,9 @@
+ */
+ SET_NONBLOCKING(fd);
+
+- /* no need to use NET_Connect as non-blocking */
+- connect_rv = connect(fd, (struct sockaddr *)&him, len);
++ /* no need to use NET_Connect as non-blocking; BUT! We want to
++ * support IPv4 mapped IPv6 adresses. */
++ connect_rv = NET_Connect(fd, (struct sockaddr *)&him, len);
+
+ /* connection not established immediately */
+ if (connect_rv != 0) {
+--- /dev/null 2010-08-03 19:26:41.444667773 +0100
++++ openjdk/jdk/test/java/net/Socket/Bindv6Only.java 2010-08-05 15:41:55.000000000 +0100
+@@ -0,0 +1,57 @@
++// test for IPv6 related issues in Sun's JDK for Linux
++
++// before running the test you need to execute
++// sudo sysctl -w net.ipv6.bindv6only=1
++
++// Author: Torsten Werner
++// public domain
++
++// Adapted for JTreg by Andrew John Hughes
++
++/*
++ * @test
++ * @bug 6342561
++ * @summary Socket doesn't work with net.ipv6.bindv6only turned on
++ * @library ../../..
++ */
++
++import java.io.*;
++import java.net.*;
++
++public class Bindv6Only {
++
++ public static void main(String [] args) throws IOException {
++ InetAddress localAddress = null;
++ InetAddress remoteAddress = null;
++ localAddress = InetAddress.getByName(InetAddress.getLocalHost().getHostName());
++ remoteAddress = InetAddress.getByName(TestEnv.getProperty("host"));
++
++ int remotePort = 7;
++ Socket testSocket = null;
++
++ System.out.print("Test #1... ");
++ try {
++ testSocket = new Socket(remoteAddress, remotePort, localAddress, 0);
++ System.out.println("passed.");
++ } catch (IOException e) {
++ throw new
++ RuntimeException("Failed to connect from specified local address", e);
++ }
++
++ System.out.print("Test #2... ");
++ try {
++ testSocket = new Socket(remoteAddress, remotePort, null, 0);
++ System.out.println("passed.");
++ } catch (IOException e) {
++ throw new RuntimeException("Failed to connect from localhost", e);
++ }
++
++ System.out.print("Test #3... ");
++ try {
++ testSocket = new Socket(remoteAddress, remotePort);
++ System.out.println("passed.");
++ } catch (IOException e) {
++ throw new RuntimeException("Failed to connect from default local address and port.");
++ }
++ }
++}
More information about the distro-pkg-dev
mailing list