From 4fcf6efaf8d3a1cf0cc4e90e12be48a4f07a9c28 Mon Sep 17 00:00:00 2001 From: mkoch Date: Sun, 30 Nov 2003 21:02:56 +0000 Subject: [PATCH] 2003-11-30 Jeff Sturm * java/net/InetAddress.java: (static): Don'f force DNS request for ANY_IF address. 2003-11-30 Michael Koch * java/net/InetAddress.java, java/net/natInetAddressNoNet.cc, java/net/natInetAddressPosix.cc, java/net/natInetAddressWin32.cc: Reverted my last patch. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74074 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 13 +++++++++++++ libjava/java/net/InetAddress.java | 21 +++------------------ libjava/java/net/natInetAddressNoNet.cc | 2 +- libjava/java/net/natInetAddressPosix.cc | 5 ++--- libjava/java/net/natInetAddressWin32.cc | 5 ++--- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index faf77cdf9e3..f38bd03a23f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,16 @@ +2003-11-30 Jeff Sturm + + * java/net/InetAddress.java: + (static): Don'f force DNS request for ANY_IF address. + +2003-11-30 Michael Koch + + * java/net/InetAddress.java, + java/net/natInetAddressNoNet.cc, + java/net/natInetAddressPosix.cc, + java/net/natInetAddressWin32.cc: + Reverted my last patch. + 2003-11-28 Michael Koch * java/net/InetAddress.java diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index f2c14f8380e..0a69c1aab07 100644 --- a/libjava/java/net/InetAddress.java +++ b/libjava/java/net/InetAddress.java @@ -82,7 +82,7 @@ public class InetAddress implements Serializable } byte[] zeros = { 0, 0, 0, 0 }; - ANY_IF = new InetAddress (zeros, null); + ANY_IF = new InetAddress (zeros, "0.0.0.0"); } /** @@ -564,23 +564,8 @@ public class InetAddress implements Serializable */ private static native byte[] aton (String host); - private static native InetAddress[] implLookup(String hostname, - InetAddress addr, - boolean all); - - private static InetAddress[] lookup (String hostname, - InetAddress addr, boolean all) - { - if (addr.equals(ANY_IF)) - { - byte[] zeros = { 0, 0, 0, 0 }; - InetAddress[] result = new InetAddress[1]; - result[0] = new InetAddress(zeros, "0.0.0.0"); - return result; - } - - return implLookup(hostname, addr, all); - } + private static native InetAddress[] lookup (String hostname, + InetAddress addr, boolean all); private static native int getFamily (byte[] address); diff --git a/libjava/java/net/natInetAddressNoNet.cc b/libjava/java/net/natInetAddressNoNet.cc index 266fb604dda..0374af18f88 100644 --- a/libjava/java/net/natInetAddressNoNet.cc +++ b/libjava/java/net/natInetAddressNoNet.cc @@ -24,7 +24,7 @@ java::net::InetAddress::getFamily (jbyteArray bytes) } JArray * -java::net::InetAddress::implLookup (jstring, java::net::InetAddress *, jboolean) +java::net::InetAddress::lookup (jstring, java::net::InetAddress *, jboolean) { return NULL; } diff --git a/libjava/java/net/natInetAddressPosix.cc b/libjava/java/net/natInetAddressPosix.cc index f760b3677ba..b97502e19b0 100644 --- a/libjava/java/net/natInetAddressPosix.cc +++ b/libjava/java/net/natInetAddressPosix.cc @@ -106,9 +106,8 @@ java::net::InetAddress::getFamily (jbyteArray bytes) JArray * -java::net::InetAddress::implLookup (jstring host, - java::net::InetAddress* iaddr, - jboolean all) +java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr, + jboolean all) { struct hostent *hptr = NULL; #if defined (HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYADDR_R) diff --git a/libjava/java/net/natInetAddressWin32.cc b/libjava/java/net/natInetAddressWin32.cc index d32f45c3c6d..42c7d7db9e8 100644 --- a/libjava/java/net/natInetAddressWin32.cc +++ b/libjava/java/net/natInetAddressWin32.cc @@ -50,9 +50,8 @@ java::net::InetAddress::getFamily (jbyteArray bytes) JArray * -java::net::InetAddress::implLookup (jstring host, - java::net::InetAddress* iaddr, - jboolean all) +java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr, + jboolean all) { struct hostent *hptr = NULL; if (host != NULL) -- 2.11.4.GIT