diff --git a/src/share/classes/sun/nio/ch/DatagramChannelImpl.java b/src/share/classes/sun/nio/ch/DatagramChannelImpl.java index 4bf870856a494e046f23ec4d8b9abaaa8ed54b65..24da9e3638720c5254e98f668816a5228af1b2fd 100644 --- a/src/share/classes/sun/nio/ch/DatagramChannelImpl.java +++ b/src/share/classes/sun/nio/ch/DatagramChannelImpl.java @@ -661,7 +661,12 @@ class DatagramChannelImpl throw new AlreadyBoundException(); InetSocketAddress isa; if (local == null) { - isa = new InetSocketAddress(0); + // only Inet4Address allowed with IPv4 socket + if (family == StandardProtocolFamily.INET) { + isa = new InetSocketAddress(InetAddress.getByName("0.0.0.0"), 0); + } else { + isa = new InetSocketAddress(0); + } } else { isa = Net.checkAddress(local); diff --git a/test/java/nio/channels/DatagramChannel/BindNull.java b/test/java/nio/channels/DatagramChannel/BindNull.java new file mode 100644 index 0000000000000000000000000000000000000000..5126d41a2e8ec79170e2d94a8a200b119b91d96c --- /dev/null +++ b/test/java/nio/channels/DatagramChannel/BindNull.java @@ -0,0 +1,50 @@ +/* + * 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 7161881 + * @run main/othervm -Djava.net.preferIPv6Addresses=true BindNull + * @summary Make sure the bind method uses an ipv4 address for the null case + * when the DatagramChannel is connected to an IPv4 socket and + * -Djava.net.preferIPv6Addresses=true. + */ + +import java.io.*; +import java.net.*; +import java.nio.channels.*; + +public class BindNull { + public static void main(String[] args) throws IOException { + try (DatagramChannel dc = DatagramChannel.open()) { + dc.bind(null); + } + try (DatagramChannel dc = DatagramChannel.open(StandardProtocolFamily.INET)) { + dc.bind(null); + } + try (DatagramChannel dc = DatagramChannel.open(StandardProtocolFamily.INET6)) { + dc.bind(null); + } catch (UnsupportedOperationException uoe) { + // IPv6 not available + } + } +}