From 879245b6b2b2305dda94c05009b431a007be5021 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 17 Nov 2004 07:09:57 +0000 Subject: [PATCH] InetAddress.java (getCanonicalHostName): Support IPv6 addresses. 2004-11-17 Michael Koch * java/net/InetAddress.java (getCanonicalHostName): Support IPv6 addresses. From-SVN: r90793 --- libjava/ChangeLog | 5 +++++ libjava/java/net/InetAddress.java | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index dace13d9a53..b8653ab3a38 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Michael Koch + + * java/net/InetAddress.java (getCanonicalHostName): + Support IPv6 addresses. + 2004-11-16 Michael Koch * java/lang/Object.java: Added javadocs all over (merged from GNU diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index 24743cc1acc..33068031884 100644 --- a/libjava/java/net/InetAddress.java +++ b/libjava/java/net/InetAddress.java @@ -322,8 +322,14 @@ public class InetAddress implements Serializable } // Try to find the FDQN now - // FIXME: This does not work with IPv6. - InetAddress address = new Inet4Address(getAddress(), null); + InetAddress address; + byte[] ipaddr = getAddress(); + + if (ipaddr.length == 16) + address = new Inet6Address(getAddress(), null); + else + address = new Inet4Address(getAddress(), null); + return address.getHostName(); } -- 2.30.2