diff options
| author | Gary Benson <gbenson@redhat.com> | 2006-08-24 14:28:49 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2006-08-24 14:28:49 +0000 |
| commit | 9f858b070337c086dd46278bdb9ab9b1764f875d (patch) | |
| tree | 1309878e77e80d6cf06466b4c8431a49943faac5 /libjava | |
| parent | a418679d8d389c0960a17eded96bb9ddb7e33cb6 (diff) | |
| download | gcc-9f858b070337c086dd46278bdb9ab9b1764f875d.zip gcc-9f858b070337c086dd46278bdb9ab9b1764f875d.tar.gz gcc-9f858b070337c086dd46278bdb9ab9b1764f875d.tar.bz2 | |
NetworkInterface.java (getInetAddresses): Bracket IPv6 addresses.
2006-08-24 Gary Benson <gbenson@redhat.com>
* java/net/NetworkInterface.java (getInetAddresses): Bracket IPv6
addresses.
From-SVN: r116375
Diffstat (limited to 'libjava')
| -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 2988f36..fda8d79 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 47b1c67..f6db01b 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) |