From a6fe19f76c9dbd6309aa85d2cfcca5610682e318 Mon Sep 17 00:00:00 2001 From: gary Date: Thu, 24 Aug 2006 14:28:49 +0000 Subject: [PATCH] 2006-08-24 Gary Benson * java/net/NetworkInterface.java (getInetAddresses): Bracket IPv6 addresses. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116375 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/ChangeLog.gcj | 5 +++++ libjava/classpath/java/net/NetworkInterface.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 2988f368176..fda8d79d45f 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2006-08-24 Gary Benson + + * java/net/NetworkInterface.java (getInetAddresses): Bracket IPv6 + addresses. + 2006-08-18 Roger Sayle * scripts/check_jni_methods.sh: Don't use the "set -C" command diff --git a/libjava/classpath/java/net/NetworkInterface.java b/libjava/classpath/java/net/NetworkInterface.java index 47b1c67cae7..f6db01b7182 100644 --- a/libjava/classpath/java/net/NetworkInterface.java +++ b/libjava/classpath/java/net/NetworkInterface.java @@ -112,7 +112,10 @@ public final class NetworkInterface InetAddress addr = (InetAddress) addresses.nextElement(); try { - s.checkConnect(addr.getHostAddress(), 58000); + String hostAddress = addr.getHostAddress(); + if (addr instanceof Inet6Address) + hostAddress = "[" + hostAddress + "]"; + s.checkConnect(hostAddress, 58000); tmpInetAddresses.add(addr); } catch (SecurityException e) -- 2.11.0