From 977e78d2078f4099a00a4e53e705ec4c13cdf4ba Mon Sep 17 00:00:00 2001 From: gary Date: Wed, 20 Sep 2006 07:55:26 +0000 Subject: 2006-09-20 Gary Benson * 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 --- libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc | 6 +++--- libjava/gnu/java/net/natPlainSocketImplPosix.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc index 0a744c5781e..f7ffaa895c3 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc @@ -290,7 +290,7 @@ gnu::java::net::PlainDatagramSocketImpl::peekData (::java::net::DatagramPacket * else throw new ::java::net::SocketException (JvNewStringUTF ("invalid family")); - p->setAddress (new ::java::net::InetAddress (raddr, NULL)); + p->setAddress (::java::net::InetAddress::getByAddress (raddr)); p->setPort (rport); p->length = (int) retlen; return rport; @@ -430,7 +430,7 @@ gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *p else throw new ::java::net::SocketException (JvNewStringUTF ("invalid family")); - p->setAddress (new ::java::net::InetAddress (raddr, NULL)); + p->setAddress (::java::net::InetAddress::getByAddress (raddr)); p->setPort (rport); p->length = (jint) retlen; return; @@ -564,7 +564,7 @@ getLocalAddress (int native_fd) else throw new ::java::net::SocketException (JvNewStringUTF ("invalid family")); - return new ::java::net::InetAddress (laddr, NULL); + return ::java::net::InetAddress::getByAddress (laddr); } void diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 2dfc38cda5e..e4572fa3c37 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -308,7 +308,7 @@ gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s) s->native_fd = new_socket; s->localport = localport; - s->address = new ::java::net::InetAddress (raddr, NULL); + s->address = ::java::net::InetAddress::getByAddress (raddr); s->port = rport; return; @@ -808,7 +808,7 @@ gnu::java::net::PlainSocketImpl::getOption (jint optID) else throw new ::java::net::SocketException (JvNewStringUTF ("invalid family")); - localAddress = new ::java::net::InetAddress (laddr, NULL); + localAddress = ::java::net::InetAddress::getByAddress (laddr); } return localAddress; -- cgit v1.2.3