yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

natServerSocketChannelImpl.cc: Removed.

Browse Source 
2003-02-14  Michael Koch  <konqueror@gmx.de>

	* gnu/java/nio/natServerSocketChannelImpl.cc: Removed.
	* gnu/java/nio/ServerSocketChannelImpl.java
	(SocketAccept): Removed.
	(accept): Commented out use of SocketAccept.

From-SVN: r62898
This commit is contained in:
Michael Koch
2003-02-14 12:07:31 +00:00
committed by Michael Koch
parent 6e8647d54a
commit b97991522d
3 changed files with 8 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/gnu/java/nio/ServerSocketChannelImpl.java
+1 -4
View File
@@ -54,9 +54,6 @@ class ServerSocketChannelImpl extends ServerSocketChannel
boolean connected = false;
// InetSocketAddress sa;
private static native int SocketAccept (ServerSocketChannelImpl server,
SocketChannelImpl s);
protected ServerSocketChannelImpl (SelectorProvider provider)
throws IOException
{
@@ -103,7 +100,7 @@ class ServerSocketChannelImpl extends ServerSocketChannel
{
SocketChannelImpl result = new SocketChannelImpl (provider ());
result.sa = new InetSocketAddress (0);
int res = SocketAccept (this,result);
//int res = SocketAccept (this,result);
return result;
}
libjava/gnu/java/nio/natServerSocketChannelImpl.cc
-77
View File
@@ -1,77 +0,0 @@
// natSelectorImpl.cc
/* Copyright (C) 2002 Free Software Foundation
This file is part of libgcj.
This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
#include <config.h>
#include <platform.h>
#include <errno.h>
#include <netinet/in.h>
#include <gcj/cni.h>
#include <gnu/java/nio/ServerSocketChannelImpl.h>
#include <gnu/java/nio/SocketChannelImpl.h>
#include <java/io/IOException.h>
#include <java/net/InetSocketAddress.h>
#include <java/net/SocketException.h>
union SockAddr
{
struct sockaddr_in address;
#ifdef HAVE_INET6
struct sockaddr_in6 address6;
#endif
};
jint
gnu::java::nio::ServerSocketChannelImpl::SocketAccept (
ServerSocketChannelImpl* socket,
SocketChannelImpl* s)
{
union SockAddr u;
struct sockaddr *ptr = (struct sockaddr *) &u.address;
socklen_t addrlen = sizeof(struct sockaddr);
/*
jbyteArray haddress = socket->sa->getAddress ()->addr;
jbyte *bytes = elements (haddress);
int len = haddress->length;
if (len == 4)
{
u.address.sin_family = AF_INET;
memcpy (&u.address.sin_addr, bytes, len);
len = sizeof (struct sockaddr_in);
u.address.sin_port = htons ( socket->sa->getPort ());
}
#ifdef HAVE_INET6
else if (len == 16)
{
u.address6.sin6_family = AF_INET6;
memcpy (&u.address6.sin6_addr, bytes, len);
len = sizeof (struct sockaddr_in6);
u.address6.sin6_port = htons (socket->sa->getPort ());
}
#endif
else
throw new ::java::net::SocketException (JvNewStringUTF ("invalid length"));
*/
int sock = _Jv_accept (socket->fd, ptr, &addrlen);
// FIXME: write address/port in ptr into java variables
if (sock < 0)
{
char* strerr = strerror (errno);
throw new ::java::io::IOException (JvNewStringUTF (strerr));
}
s->fd = sock;
return sock;
}