diff options
| author | Michael Koch <mkoch@gcc.gnu.org> | 2003-11-30 21:02:56 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-11-30 21:02:56 +0000 |
| commit | d7f16c2b3b0a501d2b9527570c8c14103feaa38f (patch) | |
| tree | 0ceebd43e8c91a4b8505ccbe74ec164516fb1e27 /libjava | |
| parent | b97366d9b363fd591fb7caa31ffb46a5c106c241 (diff) | |
| download | gcc-d7f16c2b3b0a501d2b9527570c8c14103feaa38f.zip gcc-d7f16c2b3b0a501d2b9527570c8c14103feaa38f.tar.gz gcc-d7f16c2b3b0a501d2b9527570c8c14103feaa38f.tar.bz2 | |
2003-11-30 Jeff Sturm <jsturm@one-point.com>
* java/net/InetAddress.java:
(static): Don'f force DNS request for ANY_IF address.
2003-11-30 Michael Koch <konqueror@gmx.de>
* java/net/InetAddress.java,
java/net/natInetAddressNoNet.cc,
java/net/natInetAddressPosix.cc,
java/net/natInetAddressWin32.cc:
Reverted my last patch.
From-SVN: r74074
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 13 | ||||
| -rw-r--r-- | libjava/java/net/InetAddress.java | 21 | ||||
| -rw-r--r-- | libjava/java/net/natInetAddressNoNet.cc | 2 | ||||
| -rw-r--r-- | libjava/java/net/natInetAddressPosix.cc | 5 | ||||
| -rw-r--r-- | libjava/java/net/natInetAddressWin32.cc | 5 |
5 files changed, 21 insertions, 25 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index faf77cd..f38bd03 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,16 @@ +2003-11-30 Jeff Sturm <jsturm@one-point.com> + + * java/net/InetAddress.java: + (static): Don'f force DNS request for ANY_IF address. + +2003-11-30 Michael Koch <konqueror@gmx.de> + + * 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 <konqueror@gmx.de> * java/net/InetAddress.java diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java index f2c14f8..0a69c1a 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 266fb60..0374af1 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*> * -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 f760b36..b97502e 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*> * -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 d32f45c..42c7d7d 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*> * -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) |