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
This commit is contained in:
committed by
Michael Koch
parent
bb6ed2ac99
commit
c3f322d803
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user