8215292: Back out changes for node- and link- local ipv6 multicast address
Reviewed-by: chegar, alanb
--- a/src/java.base/unix/native/libnet/net_util_md.c Wed Nov 28 16:22:03 2018 +0800
+++ b/src/java.base/unix/native/libnet/net_util_md.c Fri Dec 14 19:49:03 2018 +0000
@@ -803,12 +803,8 @@
#ifdef __linux__
/*
- * On Linux if we are connecting to a
- *
- * - link-local address
- * - multicast interface-local or link-local address
- *
- * we need to specify the interface in the scope_id.
+ * On Linux if we are connecting to a link-local address
+ * we need to specify the interface in the scope_id (2.4 kernel only)
*
* If the scope was cached then we use the cached value. If not cached but
* specified in the Inet6Address we use that, but we first check if the
@@ -818,9 +814,7 @@
* we try to determine a value from the routing table. In all these
* cases the used value is cached for further use.
*/
- if (IN6_IS_ADDR_LINKLOCAL(&sa->sa6.sin6_addr)
- || IN6_IS_ADDR_MC_NODELOCAL(&sa->sa6.sin6_addr)
- || IN6_IS_ADDR_MC_LINKLOCAL(&sa->sa6.sin6_addr)) {
+ if (IN6_IS_ADDR_LINKLOCAL(&sa->sa6.sin6_addr)) {
unsigned int cached_scope_id = 0, scope_id = 0;
if (ia6_cachedscopeidID) {
--- a/test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java Wed Nov 28 16:22:03 2018 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2018, 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 8210493
- * @requires os.family == "linux"
- * @library /test/lib
- * @build jdk.test.lib.NetworkConfiguration
- * PromiscuousIPv6
- * @run main PromiscuousIPv6
- */
-import jdk.test.lib.NetworkConfiguration;
-import jtreg.SkippedException;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.MulticastSocket;
-import java.net.SocketTimeoutException;
-
-import static java.lang.System.out;
-
-/*
- * This test was created as a copy of the Promiscuous test and adapted for
- * IPv6 node-local and link-local multicast addresses on Linux.
- */
-public class PromiscuousIPv6 {
-
- static final int TIMEOUT = 5 * 1000; // 5 secs
- static int id = 1000;
-
- static void receive(DatagramSocket mc, boolean datagramExpected, int id)
- throws IOException
- {
- byte[] ba = new byte[100];
- DatagramPacket p = new DatagramPacket(ba, ba.length);
- try {
- mc.receive(p);
- int recvId = Integer.parseInt(
- new String(p.getData(), 0, p.getLength(), "UTF-8"));
- if (datagramExpected) {
- if (recvId != id)
- throw new RuntimeException("Unexpected id, got " + recvId
- + ", expected: " + id);
- out.printf("Received message as expected, %s\n", p.getAddress());
- } else {
- throw new RuntimeException("Unexpected message received, "
- + p.getAddress());
- }
- } catch (SocketTimeoutException e) {
- if (datagramExpected)
- throw new RuntimeException("Expected message not received, "
- + e.getMessage());
- else
- out.printf("Message not received, as expected\n");
- }
- }
-
- static void test(InetAddress group1, InetAddress group2)
- throws IOException
- {
- try (MulticastSocket mc1 = new MulticastSocket(new InetSocketAddress(group1, 0));
- MulticastSocket mc2 = new MulticastSocket(new InetSocketAddress(group2, mc1.getLocalPort()));
- DatagramSocket ds = new DatagramSocket()) {
-
- final int port = mc1.getLocalPort();
- out.printf("Using port: %d\n", port);
-
- mc1.setSoTimeout(TIMEOUT);
- mc2.setSoTimeout(TIMEOUT);
- int nextId = id;
- byte[] msg = Integer.toString(nextId).getBytes("UTF-8");
- DatagramPacket p = new DatagramPacket(msg, msg.length);
- p.setAddress(group1);
- p.setPort(port);
-
- mc1.joinGroup(group1);
- out.printf("mc1 joined the MC group: %s\n", group1);
- mc2.joinGroup(group2);
- out.printf("mc2 joined the MC group: %s\n", group2);
-
- out.printf("Sending datagram to: %s/%d\n", group1, port);
- ds.send(p);
-
- // the packet should be received by mc1 only
- receive(mc1, true, nextId);
- receive(mc2, false, 0);
-
- nextId = ++id;
- msg = Integer.toString(nextId).getBytes("UTF-8");
- p = new DatagramPacket(msg, msg.length);
- p.setAddress(group2);
- p.setPort(port);
-
- out.printf("Sending datagram to: %s/%d\n", group2, port);
- ds.send(p);
-
- // the packet should be received by mc2 only
- receive(mc2, true, nextId);
- receive(mc1, false, 0);
-
- mc1.leaveGroup(group1);
- mc2.leaveGroup(group2);
- }
- }
-
- public static void main(String args[]) throws IOException {
- String os = System.getProperty("os.name");
-
- if (!os.equals("Linux")) {
- throw new SkippedException("This test should be run only on Linux");
- } else {
- String osVersion = System.getProperty("os.version");
- String prefix = "3.10.0";
- if (osVersion.startsWith(prefix)) {
- throw new SkippedException(
- String.format("The behavior under test is known NOT to work on '%s' kernels", prefix));
- }
- }
-
- NetworkConfiguration.printSystemConfiguration(System.out);
-
- if (NetworkConfiguration.probe()
- .ip6MulticastInterfaces()
- .findAny()
- .isEmpty()) {
- throw new SkippedException(
- "No IPv6 interfaces that support multicast found");
- }
-
- InetAddress interfaceLocal1 = InetAddress.getByName("ff11::2.3.4.5");
- InetAddress interfaceLocal2 = InetAddress.getByName("ff11::6.7.8.9");
- test(interfaceLocal1, interfaceLocal2);
-
- InetAddress linkLocal1 = InetAddress.getByName("ff12::2.3.4.5");
- InetAddress linkLocal2 = InetAddress.getByName("ff12::6.7.8.9");
- test(linkLocal1, linkLocal2);
- }
-}
--- a/test/jdk/java/nio/channels/DatagramChannel/PromiscuousIPv6.java Wed Nov 28 16:22:03 2018 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2018, 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 8210493
- * @requires os.family == "linux"
- * @library /test/lib
- * @build jdk.test.lib.NetworkConfiguration
- * PromiscuousIPv6
- * @run main PromiscuousIPv6
- * @key randomness
- */
-
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.net.*;
-import static java.net.StandardProtocolFamily.*;
-import java.util.*;
-import java.io.IOException;
-import java.util.stream.Collectors;
-
-import jdk.test.lib.NetworkConfiguration;
-import jtreg.SkippedException;
-
-/*
- * This test was created as a copy of the Promiscuous test and adapted for
- * IPv6 node-local and link-local multicast addresses on Linux.
- */
-public class PromiscuousIPv6 {
-
- static final Random rand = new Random();
-
- static final ProtocolFamily UNSPEC = () -> "UNSPEC";
-
- /**
- * Sends a datagram to the given multicast group
- */
- static int sendDatagram(NetworkInterface nif,
- InetAddress group,
- int port)
- throws IOException
- {
- ProtocolFamily family = (group instanceof Inet6Address) ?
- StandardProtocolFamily.INET6 : StandardProtocolFamily.INET;
- DatagramChannel dc = DatagramChannel.open(family)
- .setOption(StandardSocketOptions.IP_MULTICAST_IF, nif);
- int id = rand.nextInt();
- byte[] msg = Integer.toString(id).getBytes("UTF-8");
- ByteBuffer buf = ByteBuffer.wrap(msg);
- System.out.format("Send message -> group %s (id=0x%x)\n",
- group.getHostAddress(), id);
- dc.send(buf, new InetSocketAddress(group, port));
- dc.close();
- return id;
- }
-
- /**
- * Wait (with timeout) for datagram. The {@code datagramExpected}
- * parameter indicates whether a datagram is expected, and if
- * {@code true} then {@code id} is the identifier in the payload.
- */
- static void receiveDatagram(DatagramChannel dc,
- String name,
- boolean datagramExpected,
- int id)
- throws IOException
- {
- System.out.println("Checking if received by " + name);
-
- Selector sel = Selector.open();
- dc.configureBlocking(false);
- dc.register(sel, SelectionKey.OP_READ);
- ByteBuffer buf = ByteBuffer.allocateDirect(100);
-
- try {
- for (;;) {
- System.out.println("Waiting to receive message");
- sel.select(5*1000);
- SocketAddress sa = dc.receive(buf);
-
- // no datagram received
- if (sa == null) {
- if (datagramExpected) {
- throw new RuntimeException("Expected message not received");
- }
- System.out.println("No message received (correct)");
- return;
- }
-
- // datagram received
-
- InetAddress sender = ((InetSocketAddress)sa).getAddress();
- buf.flip();
- byte[] bytes = new byte[buf.remaining()];
- buf.get(bytes);
- String s = new String(bytes, "UTF-8");
- int receivedId = -1;
- try {
- receivedId = Integer.parseInt(s);
- System.out.format("Received message from %s (id=0x%x)\n",
- sender, receivedId);
- } catch (NumberFormatException x) {
- System.out.format("Received message from %s (msg=%s)\n", sender, s);
- }
-
- if (!datagramExpected) {
- if (receivedId == id)
- throw new RuntimeException("Message not expected");
- System.out.println("Message ignored (has wrong id)");
- } else {
- if (receivedId == id) {
- System.out.println("Message expected");
- return;
- }
- System.out.println("Message ignored (wrong sender)");
- }
-
- sel.selectedKeys().clear();
- buf.rewind();
- }
- } finally {
- sel.close();
- }
- }
-
- static void test(ProtocolFamily family,
- NetworkInterface nif,
- InetAddress group1,
- InetAddress group2)
- throws IOException
- {
-
- System.out.format("%nTest family=%s%n", family.name());
-
- DatagramChannel dc1 = (family == UNSPEC) ?
- DatagramChannel.open() : DatagramChannel.open(family);
- DatagramChannel dc2 = (family == UNSPEC) ?
- DatagramChannel.open() : DatagramChannel.open(family);
-
- try {
- dc1.setOption(StandardSocketOptions.SO_REUSEADDR, true);
- dc2.setOption(StandardSocketOptions.SO_REUSEADDR, true);
-
- dc1.bind(new InetSocketAddress(group1, 0));
- int port = dc1.socket().getLocalPort();
- dc2.bind(new InetSocketAddress(group2, port));
-
- System.out.format("dc1 joining [%s]:%d @ %s\n",
- group1.getHostAddress(), port, nif.getName());
- System.out.format("dc2 joining [%s]:%d @ %s\n",
- group2.getHostAddress(), port, nif.getName());
-
- dc1.join(group1, nif);
- dc2.join(group2, nif);
-
- int id = sendDatagram(nif, group1, port);
-
- receiveDatagram(dc1, "dc1", true, id);
- receiveDatagram(dc2, "dc2", false, id);
-
- id = sendDatagram(nif, group2, port);
-
- receiveDatagram(dc1, "dc1", false, id);
- receiveDatagram(dc2, "dc2", true, id);
-
- } finally {
- dc1.close();
- dc2.close();
- }
- }
-
- public static void main(String[] args) throws IOException {
-
- String os = System.getProperty("os.name");
-
- if (!os.equals("Linux")) {
- throw new SkippedException("This test should be run only on Linux");
- } else {
- String osVersion = System.getProperty("os.version");
- String prefix = "3.10.0";
- if (osVersion.startsWith(prefix)) {
- throw new SkippedException(
- String.format("The behavior under test is known NOT to work on '%s' kernels", prefix));
- }
- }
-
- NetworkConfiguration.printSystemConfiguration(System.out);
-
- InetAddress interfaceLocal1 = InetAddress.getByName("ff11::2.3.4.5");
- InetAddress interfaceLocal2 = InetAddress.getByName("ff11::6.7.8.9");
-
- InetAddress linkLocal1 = InetAddress.getByName("ff12::2.3.4.5");
- InetAddress linkLocal2 = InetAddress.getByName("ff12::6.7.8.9");
-
- // get local network configuration to use
- NetworkConfiguration config = NetworkConfiguration.probe();
- boolean foundAtLeastOne = false;
- for (NetworkInterface nif: config.ip6MulticastInterfaces()
- .collect(Collectors.toList())) {
- foundAtLeastOne = true;
- test(INET6, nif, interfaceLocal1, interfaceLocal2);
- test(INET6, nif, linkLocal1, linkLocal2);
- }
- if (!foundAtLeastOne) {
- throw new SkippedException(
- "No IPv6 interfaces that support multicast found");
- }
- }
-}