archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8241336: Some java.net tests failed with NoRouteToHostException on MacOS with special network configuration

Browse source 
NetworkConfiguration updated to skip interfaces that have only IPv6 link local addresses.

Reviewed-by: alanb, chegar
This commit is contained in:
Daniel Fuchs 2020-03-27 12:42:03 +00:00
parent bb7a8f643f
commit 5ddbcb7a51
5 changed files with 114 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/jdk/ProblemList.txt
View file

@ -620,11 +620,6 @@ javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java 8042215
# jdk_net
java/net/InetAddress/CheckJNI.java 8241336 macosx-all
java/net/Socket/LinkLocal.java 8241336 macosx-all
java/net/MulticastSocket/SetOutgoingIf.java 8241336 macosx-all
java/net/MulticastSocket/Promiscuous.java 8241336 macosx-all
java/net/MulticastSocket/NoLoopbackPackets.java 7122846 macosx-all
java/net/MulticastSocket/SetLoopbackMode.java 7122846 macosx-all
@ -643,9 +638,6 @@ java/net/ServerSocket/AcceptInheritHandle.java 8211854 aix-ppc6
java/nio/Buffer/EqualsCompareTest.java 8193917 solaris-all
java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java 8241336 macosx-all
java/nio/channels/DatagramChannel/AdaptorMulticasting.java 8241336 macosx-all
java/nio/channels/DatagramChannel/ChangingAddress.java 7141822 macosx-all
java/nio/channels/DatagramChannel/Unref.java 8233519 generic-all

51
test/jdk/java/net/MulticastSocket/Promiscuous.java
View file

@ -32,7 +32,11 @@
import java.io.IOException;
import static java.lang.System.out;
import java.io.UncheckedIOException;
import java.net.*;
import jdk.test.lib.NetworkConfiguration;
import jdk.test.lib.net.IPSupport;
public class Promiscuous {
@ -69,7 +73,8 @@ public class Promiscuous {
}
} catch (SocketTimeoutException e) {
if (datagramExpected)
throw new RuntimeException("Expected message not received, "
throw new RuntimeException(mc.getLocalSocketAddress()
+ ": Expected message not received, "
+ e.getMessage());
else
out.printf("Message not received, as expected\n");
@ -90,6 +95,10 @@ public class Promiscuous {
UUID = "<" + s1 + s2 + ">";
}
static SocketAddress toSocketAddress(InetAddress group) {
return new InetSocketAddress(group, 0);
}
static void test(InetAddress group1, InetAddress group2)
throws IOException
{
@ -107,10 +116,21 @@ public class Promiscuous {
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);
// join groups on all network interfaces
NetworkConfiguration.probe()
.multicastInterfaces(false)
.forEach((nic) -> {
try {
mc1.joinGroup(toSocketAddress(group1), nic);
out.printf("mc1 joined the MC group on %s: %s\n",
nic.getDisplayName(), group1);
mc2.joinGroup(toSocketAddress(group2), nic);
out.printf("mc2 joined the MC group on %s: %s\n",
nic.getDisplayName(), group2);
} catch (IOException io) {
throw new UncheckedIOException(io);
}
});
out.printf("Sending datagram to: %s/%d\n", group1, port);
ds.send(p);
@ -132,8 +152,21 @@ public class Promiscuous {
receive(mc2, true, nextId);
receive(mc1, false, 0);
mc1.leaveGroup(group1);
mc2.leaveGroup(group2);
// leave groups on all network interfaces
NetworkConfiguration.probe()
.multicastInterfaces(false)
.forEach((nic) -> {
try {
mc1.leaveGroup(toSocketAddress(group1), nic);
out.printf("mc1 left the MC group on %s: %s\n",
nic.getDisplayName(), group1);
mc2.leaveGroup(toSocketAddress(group2), nic);
out.printf("mc2 left the MC group on %s: %s\n",
nic.getDisplayName(), group2);
} catch (IOException io) {
throw new UncheckedIOException(io);
}
});
}
}
@ -155,8 +188,8 @@ public class Promiscuous {
}
// multicast groups used for the test
InetAddress ip4Group1 = InetAddress.getByName("224.0.0.120");
InetAddress ip4Group2 = InetAddress.getByName("224.0.0.121");
InetAddress ip4Group1 = InetAddress.getByName("224.1.1.120");
InetAddress ip4Group2 = InetAddress.getByName("224.1.1.121");
test(ip4Group1, ip4Group2);
}

54
test/jdk/java/net/MulticastSocket/SetOutgoingIf.java
View file

@ -24,15 +24,27 @@
/*
* @test
* @bug 4742177
* @library /test/lib
* @summary Re-test IPv6 (and specifically MulticastSocket) with latest Linux & USAGI code
*/
import java.io.IOException;
import java.net.*;
import java.util.*;
import jdk.test.lib.NetworkConfiguration;
public class SetOutgoingIf {
private static int PORT = 9001;
public class SetOutgoingIf implements AutoCloseable {
private static String osname;
private final MulticastSocket SOCKET;
private final int PORT;
private SetOutgoingIf() {
try {
SOCKET = new MulticastSocket();
PORT = SOCKET.getLocalPort();
} catch (IOException io) {
throw new ExceptionInInitializerError(io);
}
}
static boolean isWindows() {
if (osname == null)
@ -45,20 +57,24 @@ public class SetOutgoingIf {
}
private static boolean hasIPv6() throws Exception {
List<NetworkInterface> nics = Collections.list(
NetworkInterface.getNetworkInterfaces());
for (NetworkInterface nic : nics) {
List<InetAddress> addrs = Collections.list(nic.getInetAddresses());
for (InetAddress addr : addrs) {
if (addr instanceof Inet6Address)
return true;
}
}
return false;
return NetworkConfiguration.probe()
.ip6Addresses()
.findAny()
.isPresent();
}
public static void main(String[] args) throws Exception {
try (var test = new SetOutgoingIf()) {
test.run();
}
}
@Override
public void close() {
SOCKET.close();
}
public void run() throws Exception {
if (isWindows()) {
System.out.println("The test only run on non-Windows OS. Bye.");
return;
@ -99,11 +115,14 @@ public class SetOutgoingIf {
System.out.println("Ignore NetworkInterface nic == " + nic);
}
}
Collections.reverse(netIfs);
if (netIfs.size() <= 1) {
System.out.println("Need 2 or more network interfaces to run. Bye.");
return;
}
System.out.println("Using PORT: " + PORT);
// We will send packets to one ipv4, and one ipv6
// multicast group using each network interface :-
// 224.1.1.1 --|
@ -177,12 +196,8 @@ public class SetOutgoingIf {
}
private static boolean isTestExcludedInterface(NetworkInterface nif) {
if (isMacOS() && nif.getName().contains("awdl"))
return true;
String dName = nif.getDisplayName();
if (isWindows() && dName != null && dName.contains("Teredo"))
return true;
return false;
return !NetworkConfiguration.isTestable(nif)
|| isMacOS() && nif.getName().startsWith("utun");
}
private static boolean debug = true;
@ -281,4 +296,3 @@ class NetIf {
this.groups = groups;
}
}

17
test/jdk/java/nio/channels/DatagramChannel/AdaptorMulticasting.java
View file

@ -43,6 +43,7 @@ import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.net.SocketOption;
import java.nio.channels.DatagramChannel;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import static java.net.StandardSocketOptions.*;
@ -427,7 +428,9 @@ public class AdaptorMulticasting {
assertTrue(s.getOption(IP_MULTICAST_IF) != null);
SocketAddress target = new InetSocketAddress(group, s.getLocalPort());
byte[] message = "hello".getBytes("UTF-8");
long nano = System.nanoTime();
String text = nano + ": hello";
byte[] message = text.getBytes("UTF-8");
// send datagram to multicast group
DatagramPacket p = new DatagramPacket(message, message.length);
@ -437,10 +440,18 @@ public class AdaptorMulticasting {
// datagram should not be received
s.setSoTimeout(500);
p = new DatagramPacket(new byte[1024], 100);
while (true) {
try {
s.receive(p);
assertTrue(false);
} catch (SocketTimeoutException expected) { }
if (Arrays.equals(p.getData(), p.getOffset(), p.getLength(), message, 0, message.length)) {
throw new RuntimeException("message shouldn't have been received");
} else {
System.out.println("Received unexpected message from " + p.getSocketAddress());
}
} catch (SocketTimeoutException expected) {
break;
}
}
}

30
test/lib/jdk/test/lib/NetworkConfiguration.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2020, 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
@ -31,10 +31,11 @@ import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.security.AccessController;
@ -87,9 +88,20 @@ public class NetworkConfiguration {
});
}
private static boolean isNotExcludedInterface(NetworkInterface nif) {
if (Platform.isOSX() && nif.getName().contains("awdl")) {
return false;
private static boolean isIPv6LinkLocal(InetAddress a) {
return Inet6Address.class.isInstance(a) && a.isLinkLocalAddress();
}
public static boolean isTestable(NetworkInterface nif) {
if (Platform.isOSX()) {
if (nif.getName().contains("awdl")) {
return false; // exclude awdl
}
// filter out interfaces that only have link-local addresses
return nif.inetAddresses()
.filter(Predicate.not(NetworkConfiguration::isIPv6LinkLocal))
.findAny()
.isPresent();
}
if (Platform.isWindows()) {
String dName = nif.getDisplayName();
@ -201,7 +213,7 @@ public class NetworkConfiguration {
public Stream<NetworkInterface> ip4Interfaces() {
return ip4Interfaces.keySet()
.stream()
.filter(NetworkConfiguration::isNotExcludedInterface)
.filter(NetworkConfiguration::isTestable)
.filter(this::hasIp4Addresses);
}
@ -211,7 +223,7 @@ public class NetworkConfiguration {
public Stream<NetworkInterface> ip6Interfaces() {
return ip6Interfaces.keySet()
.stream()
.filter(NetworkConfiguration::isNotExcludedInterface)
.filter(NetworkConfiguration::isTestable)
.filter(this::hasIp6Addresses);
}
@ -309,8 +321,8 @@ public class NetworkConfiguration {
* Return a NetworkConfiguration instance.
*/
public static NetworkConfiguration probe() throws IOException {
Map<NetworkInterface, List<Inet4Address>> ip4Interfaces = new HashMap<>();
Map<NetworkInterface, List<Inet6Address>> ip6Interfaces = new HashMap<>();
Map<NetworkInterface, List<Inet4Address>> ip4Interfaces = new LinkedHashMap<>();
Map<NetworkInterface, List<Inet6Address>> ip6Interfaces = new LinkedHashMap<>();
List<NetworkInterface> nifs = list(getNetworkInterfaces());
for (NetworkInterface nif : nifs) {