InetAddress.java: Mostly merged with Classpath.

2006-09-20  Gary Benson  <gbenson@redhat.com>

	* java/net/InetAddress.java: Mostly merged with Classpath.
	* java/net/VMInetAddress.java: New file.
	* sources.am, Makefile.in: Rebuilt.

	* java/net/natVMNetworkInterfacePosix.cc
	(getInterfaces): Create InetAddress objects using
	InetAddress.getByAddress.
	* gnu/java/net/natPlainSocketImplPosix.cc
	(accept, getOption): Likewise.
	* gnu/java/net/natPlainDatagramSocketImplPosix.cc
	(peekData, receive, getLocalAddress): Likewise.

From-SVN: r117075
This commit is contained in:
Gary Benson 2006-09-20 07:55:26 +00:00 committed by Gary Benson
parent 884d9d372e
commit aac8697859
8 changed files with 476 additions and 305 deletions

View file

@ -40,7 +40,7 @@ details. */
#include <gcj/cni.h>
#include <jvm.h>
#include <java/net/Inet4Address.h>
#include <java/net/InetAddress.h>
#include <java/net/NetworkInterface.h>
#include <java/net/SocketException.h>
#include <java/net/VMNetworkInterface.h>
@ -148,8 +148,7 @@ java::net::VMNetworkInterface::getInterfaces ()
jbyteArray baddr = JvNewByteArray (len);
memcpy (elements (baddr), &(sa.sin_addr), len);
jstring if_name = JvNewStringLatin1 (if_record->ifr_name);
Inet4Address* address =
new java::net::Inet4Address (baddr, JvNewStringLatin1 (""));
InetAddress* address = java::net::InetAddress::getByAddress (baddr);
ht->add (new NetworkInterface (if_name, address));
if_record++;
}