diff options
| author | Gary Benson <gbenson@redhat.com> | 2006-08-24 23:08:58 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-08-24 23:08:58 +0000 |
| commit | 1d586a4f0a74af72e2e6f69d0fd9f63ff21f1bd2 (patch) | |
| tree | 94592d0c098dd6a7d1049cfdc7f452fb60008959 | |
| parent | 68dbbc7ff521a142be56872f529e397b9fc52236 (diff) | |
2006-08-24 Gary Benson <gbenson@redhat.com>redhat/gcc-4_1-branch-java-merge-20060823
* java/net/NetworkInterface.java (getInetAddresses): Bracket IPv6
addresses.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_1-branch-java-merge-20060823@116386 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
| -rw-r--r-- | libjava/classpath/java/net/NetworkInterface.java | 5 |
2 files changed, 9 insertions, 1 deletions
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 <gbenson@redhat.com> + + * java/net/NetworkInterface.java (getInetAddresses): Bracket IPv6 + addresses. + 2006-08-18 Roger Sayle <roger@eyesopen.com> * 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) |