diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-20 07:55:26 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-09-20 07:55:26 +0000 |
| commit | 977e78d2078f4099a00a4e53e705ec4c13cdf4ba (patch) | |
| tree | 0aef003fb0421fe80a9834590b2afda0c57aa5e3 /libjava/java/net/natVMNetworkInterfacePosix.cc | |
| parent | 1d54198afa5d2fa2ea419ce7649a61289064c340 (diff) | |
| download | gcc-977e78d2078f4099a00a4e53e705ec4c13cdf4ba.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117075 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/natVMNetworkInterfacePosix.cc')
| -rw-r--r-- | libjava/java/net/natVMNetworkInterfacePosix.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/java/net/natVMNetworkInterfacePosix.cc b/libjava/java/net/natVMNetworkInterfacePosix.cc index 8238d9c1fa6..bfb11d21ce7 100644 --- a/libjava/java/net/natVMNetworkInterfacePosix.cc +++ b/libjava/java/net/natVMNetworkInterfacePosix.cc @@ -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++; } |