yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

natInetAddress.cc (lookup): Preserve caller-supplied hostname in returned InetAddress objects.

Browse Source 
* java/net/natInetAddress.cc (lookup): Preserve caller-supplied
        hostname in returned InetAddress objects.
        (getLocalHostname): Fix typo.
        * java/net/InetAddress.java (getByName): Set hostname on return
        object.
        (getLocalHost): Call lookup directly to ensure that a fully-qualified
        name is returned.

From-SVN: r27587
This commit is contained in:
Bryce McKinlay
1999-06-18 01:17:28 +00:00
committed by Bryce McKinlay
parent 9ddab891df
commit e0cb3930ca
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/net/natInetAddress.cc
+5 -4
View File
@@ -199,8 +199,8 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
#endif /* HAVE_GETHOSTBYADDR_R */
}
if (hptr != NULL)
{
if (host == NULL)
{
if (!all)
host = JvNewStringUTF (hptr->h_name);
java::lang::SecurityException *ex = checkConnect (host);
if (ex != NULL)
@@ -246,7 +246,8 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
{
if (iaddrs[i] == NULL)
iaddrs[i] = new java::net::InetAddress (NULL, NULL);
iaddrs[i]->hostname = host;
if (iaddrs[i]->hostname == NULL)
iaddrs[i]->hostname = host;
if (iaddrs[i]->address == NULL)
{
char *bytes = hptr->h_addr_list[i];
@@ -269,7 +270,7 @@ java::net::InetAddress::getLocalHostname ()
#elif HAVE_UNAME
struct utsname stuff;
if (uname (&stuff) != 0)
return NULL:
return NULL;
chars = stuff.nodename;
#else
return NULL;