From 681409f2baa8c13f6be3243d1a91152aa2806596 Mon Sep 17 00:00:00 2001 From: alanb Date: Sun, 22 Apr 2012 21:22:17 +0100 Subject: [PATCH] 7132924: (dc) DatagramChannel.disconnect throws SocketException with IPv4 socket and IPv6 enabled [macosx] Reviewed-by: chegar --- .../sun/nio/ch/DatagramChannelImpl.java | 5 +- .../native/sun/nio/ch/DatagramChannelImpl.c | 4 +- .../native/sun/nio/ch/DatagramChannelImpl.c | 2 +- .../channels/DatagramChannel/Disconnect.java | 77 +++++++++++++++++++ 4 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 test/java/nio/channels/DatagramChannel/Disconnect.java diff --git a/src/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/share/classes/sun/nio/ch/DatagramChannelImpl.java index 638689350..4bf870856 100644 --- a/src/share/classes/sun/nio/ch/DatagramChannelImpl.java +++ b/src/share/classes/sun/nio/ch/DatagramChannelImpl.java @@ -744,7 +744,8 @@ class DatagramChannelImpl if (sm != null) sm.checkConnect(isa.getAddress().getHostAddress(), isa.getPort()); - disconnect0(fd); + boolean isIPv6 = (family == StandardProtocolFamily.INET6); + disconnect0(fd, isIPv6); remoteAddress = null; state = ST_UNCONNECTED; @@ -1079,7 +1080,7 @@ class DatagramChannelImpl private static native void initIDs(); - private static native void disconnect0(FileDescriptor fd) + private static native void disconnect0(FileDescriptor fd, boolean isIPv6) throws IOException; private native int receive0(FileDescriptor fd, long address, int len, diff --git a/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c b/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c index 7d42d1404..3bccd5748 100644 --- a/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c +++ b/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c @@ -77,7 +77,7 @@ Java_sun_nio_ch_DatagramChannelImpl_initIDs(JNIEnv *env, jclass clazz) JNIEXPORT void JNICALL Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this, - jobject fdo) + jobject fdo, jboolean isIPv6) { jint fd = fdval(env, fdo); int rv; @@ -94,7 +94,7 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this, memset(&sa, 0, sizeof(sa)); #ifdef AF_INET6 - if (ipv6_available()) { + if (isIPv6) { struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa; #if defined(_ALLBSD_SOURCE) him6->sin6_family = AF_INET6; diff --git a/src/windows/native/sun/nio/ch/DatagramChannelImpl.c b/src/windows/native/sun/nio/ch/DatagramChannelImpl.c index 8df4b94a3..555ca9fbb 100644 --- a/src/windows/native/sun/nio/ch/DatagramChannelImpl.c +++ b/src/windows/native/sun/nio/ch/DatagramChannelImpl.c @@ -108,7 +108,7 @@ jboolean purgeOutstandingICMP(JNIEnv *env, jclass clazz, jint fd) JNIEXPORT void JNICALL Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this, - jobject fdo) + jobject fdo, jboolean isIPv6) { jint fd = fdval(env, fdo); int rv = 0; diff --git a/test/java/nio/channels/DatagramChannel/Disconnect.java b/test/java/nio/channels/DatagramChannel/Disconnect.java new file mode 100644 index 000000000..e5a1d3a81 --- /dev/null +++ b/test/java/nio/channels/DatagramChannel/Disconnect.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + * @bug 7132924 + * @summary Test DatagramChannel.disconnect when DatagramChannel is connected to an IPv4 socket + * @run main Disconnect + * @run main/othervm -Djava.net.preferIPv4Stack=true Disconnect + */ + +import java.net.*; +import java.nio.*; +import java.nio.channels.*; +import java.io.IOException; + +public class Disconnect { + public static void main(String[] args) throws IOException { + // test with default protocol family + try (DatagramChannel dc = DatagramChannel.open()) { + test(dc); + test(dc); + } + + // test with IPv4 only + try (DatagramChannel dc = DatagramChannel.open(StandardProtocolFamily.INET)) { + test(dc); + test(dc); + } + } + + /** + * Connect DatagramChannel to a server, write a datagram and disconnect. Invoke + * a second or subsequent time with the same DatagramChannel instance to check + * that disconnect works as expected. + */ + static void test(DatagramChannel dc) throws IOException { + try (DatagramChannel server = DatagramChannel.open()) { + server.bind(new InetSocketAddress(0)); + + InetAddress lh = InetAddress.getLocalHost(); + dc.connect(new InetSocketAddress(lh, server.socket().getLocalPort())); + + dc.write(ByteBuffer.wrap("hello".getBytes())); + + ByteBuffer bb = ByteBuffer.allocate(100); + server.receive(bb); + + dc.disconnect(); + + try { + dc.write(ByteBuffer.wrap("another message".getBytes())); + throw new RuntimeException("write should fail, not connected"); + } catch (NotYetConnectedException expected) { + } + } + } +} -- GitLab