diff options
| author | Gary Benson <gbenson@redhat.com> | 2006-09-20 07:55:26 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2006-09-20 07:55:26 +0000 |
| commit | aac8697859d550b39baf967900578ee47259c419 (patch) | |
| tree | 0aef003fb0421fe80a9834590b2afda0c57aa5e3 /libjava/gnu | |
| parent | 884d9d372eb7518d50b6bd77d1420909a0e701cf (diff) | |
| download | gcc-aac8697859d550b39baf967900578ee47259c419.zip gcc-aac8697859d550b39baf967900578ee47259c419.tar.gz gcc-aac8697859d550b39baf967900578ee47259c419.tar.bz2 | |
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
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc index 0a744c5..f7ffaa8 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 2dfc38c..e4572fa 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; |