From: Michael Koch <konqueror@gmx.de>
Date: Fri, 28 Nov 2003 22:01:29 +0000 (+0000)
Subject: 2003-11-28  Michael Koch  <konqueror@gmx.de>
X-Git-Tag: releases/gcc-3.4.0~2042
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3f322d80365c65f333b4a44a01c0d8fe7df4bb1;p=thirdparty%2Fgcc.git

2003-11-28  Michael Koch  <konqueror@gmx.de>

	* java/net/InetAddress.java
	(lookup): New method that doesnt lookup "0.0.0.0".
	(ImplLookup): Renamed from lookup.
	* java/net/natInetAddressNoNet.cc
	(ImplLookup): Renamed from lookup.
	* java/net/natInetAddressPosix.cc
	(ImplLookup): Renamed from lookup.
	* java/net/natInetAddressWin32.cc
	(ImplLookup): Renamed from lookup.

From-SVN: r74026
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8ad07211bc18..faf77cdf9e3b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2003-11-28  Michael Koch  <konqueror@gmx.de>
+
+	* java/net/InetAddress.java
+	(lookup): New method that doesnt lookup "0.0.0.0".
+	(ImplLookup): Renamed from lookup.
+	* java/net/natInetAddressNoNet.cc
+	(ImplLookup): Renamed from lookup.
+	* java/net/natInetAddressPosix.cc
+	(ImplLookup): Renamed from lookup.
+	* java/net/natInetAddressWin32.cc
+	(ImplLookup): Renamed from lookup.
+
 2003-11-28  Bryce McKinlay  <bryce@mckinlay.net.nz>
 
 	* configure: Rebuilt.
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index 8d09827655d1..f2c14f8380e1 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -564,8 +564,23 @@ public class InetAddress implements Serializable
    */
   private static native byte[] aton (String host);
 
-  private static native InetAddress[] lookup (String hostname,
-		                              InetAddress addr, boolean all);
+  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 int getFamily (byte[] address);
 
diff --git a/libjava/java/net/natInetAddressNoNet.cc b/libjava/java/net/natInetAddressNoNet.cc
index 0374af18f88f..266fb604ddad 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::lookup (jstring, java::net::InetAddress *, jboolean)
+java::net::InetAddress::implLookup (jstring, java::net::InetAddress *, jboolean)
 {
   return NULL;
 }
diff --git a/libjava/java/net/natInetAddressPosix.cc b/libjava/java/net/natInetAddressPosix.cc
index b97502e19b00..f760b3677ba7 100644
--- a/libjava/java/net/natInetAddressPosix.cc
+++ b/libjava/java/net/natInetAddressPosix.cc
@@ -106,8 +106,9 @@ java::net::InetAddress::getFamily (jbyteArray bytes)
 
 
 JArray<java::net::InetAddress*> *
-java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
-				jboolean all)
+java::net::InetAddress::implLookup (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 42c7d7db9e81..d32f45c3c6d5 100644
--- a/libjava/java/net/natInetAddressWin32.cc
+++ b/libjava/java/net/natInetAddressWin32.cc
@@ -50,8 +50,9 @@ java::net::InetAddress::getFamily (jbyteArray bytes)
 
 
 JArray<java::net::InetAddress*> *
-java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
-        jboolean all)
+java::net::InetAddress::implLookup (jstring host,
+				    java::net::InetAddress* iaddr,
+				    jboolean all)
 {
   struct hostent *hptr = NULL;
   if (host != NULL)