FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

InetAddress.java: Removed.

Browse source 
2006-11-03  Gary Benson  <gbenson@redhat.com>

	* java/net/InetAddress.java: Removed.
	* java/net/natInetAddressNoNet.cc: Likewise.
	* java/net/natInetAddressPosix.cc: Likewise.
	* java/net/natInetAddressWin32.cc: Likewise.
	* java/net/VMInetAddress.java (getLocalHostname,
	lookupInaddrAny, getHostByAddr, getHostByName,
	aton): Replace glue methods with native ones.
	* java/net/natVMInetAddressNoNet.cc: New file.
	* java/net/natVMInetAddressPosix.cc: Likewise.
	* java/net/natVMInetAddressWin32.cc: Likewise.
	* Makefile.am, configure.ac: Reflect the above.
	* sources.am, Makefile.in, configure: Rebuilt.

	* java/net/natVMNetworkInterfaceWin32.cc
	(winsock2GetRealNetworkInterfaces): Create InetAddress
	objects using InetAddress.getByAddress.
	* gnu/java/net/natPlainSocketImplWin32.cc
	(accept, getOption): Likewise.
	* gnu/java/net/natPlainDatagramSocketImplWin32.cc
	(peekData, receive, getOption): Likewise.

From-SVN: r118451
This commit is contained in:
Gary Benson 2006-11-03 10:16:04 +00:00 • committed by Gary Benson
parent 5d7de335d7
commit adefdaca2d
17 changed files with 506 additions and 1380 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation
/* Copyright (C) 2003, 2006 Free Software Foundation
This file is part of libgcj.
@ -238,7 +238,7 @@ gnu::java::net::PlainDatagramSocketImpl::peekData(::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 rport;
@ -360,7 +360,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;
@ -656,7 +656,7 @@ gnu::java::net::PlainDatagramSocketImpl::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;
break;

6
libjava/gnu/java/net/natPlainSocketImplWin32.cc
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2003, 2004, 2005 Free Software Foundation
/* Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation
This file is part of libgcj.
@ -328,7 +328,7 @@ gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s)
s->native_fd = (jint) hSocket;
s->localport = localport;
s->address = new ::java::net::InetAddress (raddr, NULL);
s->address = ::java::net::InetAddress::getByAddress (raddr);
s->port = rport;
return;
@ -735,7 +735,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;