2006-09-16 Casey Marshall <csm@gnu.org>

	* NEWS: updated.
	* configure.ac (AC_CHECK_HEADERS): check for `sys/event.h'.
	(AC_CHECK_FUNCS): add checks for readv, writev, getifaddrs,
	kqueue, and kevent.
	(HAVE_INET6): define if IPv6 is supported.
	* gnu/java/net/PlainDatagramSocketImpl.java (channel): new field.
	(native_fd): removed.
	(impl): new field.
	(<init>): throw IOException; initialize fields.
	(finalize): removed.
	(getNativeFD): removed.
	(bind): use `PlainSocketImpl.bind.'
	(create): use `PlainSocketImpl.initSocket.'
	(disconnect): use `PlainSocketImpl.disconnect.'
	(getLocalPort): new method.
	(send): use `VMChannel.send.'
	(receive): use `VMChannel.receive.'
	(setOption): use `PlainSocketImpl.setOption.'
	(getOption): use `PlainSocketImpl.getOption.'
	(close): use `VMChannel.State.close.'
	(join): use `PlainSocketImpl.join.'
	(leave): use `PlainSocketImpl.leave.'
	(joinGroup, leaveGroup): implemented.
	* gnu/java/net/PlainSocketImpl.java: make non-final.
	(native_fd): removed.
	(impl): new field.
	(channel): new field.
	(<init>): initialize `impl.'
	(finalize, getNativeFD): removed.
	(setOption): use `PlainSocketImpl.setOption.'
	(getOption): use `PlainSocketImpl.getOption.'
	(shutdownInput): use `PlainSocketImpl.shutdownInput.'
	(shutdownOutput): use `PlainSocketImpl.shutdownOutput.'
	(create): create `channel,' initialize `impl's native state.
	(connect): use `connect(SocketAddress, int).'
	(connect): use `SocketChannelImpl.connect;' initialize `address'
	and `port.'
	(bind): use `VMPlainSocketImpl.bind.'
	(listen): use `VMPlainSocketImpl.listen.'
	(accept): use `SocketChannelImpl.accept.'
	(available): use `VMChannel.available.'
	(close): use `PlainSocketImpl.close.'
	(sendUrgentData): use `PlainSocketImpl.sendUrgentData.'
	(getVMChannel, getInetAddress, getLocalPort, getLocalAddress,
	getPort): new methods.
	(SocketInputStream.read): use `VMChannel.read.'
	(SocketInputStream.read): use `SocketChannel.read.'
	(SocketOutputStream.write): use `VMChannel.write.'
	(SocketOutputStream.write): use `SocketChannel.write.'
	* gnu/java/nio/DatagramChannelImpl.java: implement VMChannel.
	(channel): new field.
	(<init>): initialize `channel.'
	(implCloseSelectableChannel): use `VMChannel.close.'
	(implConfigureBlocking): use `VMChannel.setBlocking.'
	(connect): use `VMChannel.connect.'
	(disconnect): use `VMChannel.disconnect.'
	(isConnected): use `VMChannel.getPeerAddress.'
	(write): use `VMChannel.write.'
	(write): use `VMChannel.writeGathering.'
	(read): use `VMChannel.read.'
	(read): use `VMChannel.readScattering.'
	(receive): use `VMChannel.receive.'
	(send): use `VMChannel.send.'
	(getVMChannel): new method.
	* gnu/java/nio/DatagramChannelSelectionKey.java (getNativeFD):
	access native FD through VMChannel.State.
	* gnu/java/nio/FileChannelImpl.java: moved from
	gnu/java/nio/channels/FileChannelImpl.java.
	* gnu/java/nio/FileLockImpl.java: fix imports.
	* gnu/java/nio/KqueueSelectionKeyImpl.java: new file.
	* gnu/java/nio/KqueueSelectorImpl.java: new file.
	* gnu/java/nio/NIOSocket.java (impl): removed.
	(channel): new field.
	(<init>): init superclass with a `NIOSocketImpl;' init `channel.'
	(getPlainSocketImpl, setChannel): removed.
	(isConnected): new method.
	* gnu/java/nio/NIOSocketImpl.java: new file.
	* gnu/java/nio/PipeImpl.java (SourceChannelImpl): implement
	`VMChannelOwner.'
	(SourceChannelImpl.native_fd): removed.
	(SourceChannelImpl.<init>): init with a `VMChannel.'
	(SourceChannelImpl.getNativeFD): removed.
	(SourceChannelImpl.getVMChannel): new method.
	(SourceChannelImpl.implCloseSelectableChannel): implement.
	(SinkChannelImpl): implement `VMChannelOwner.'
	(SinkChannelImpl.native_fd): removed.
	(SinkChannelImpl.<init>): init with a `VMChannel.'
	(SinkChannelImpl.implCloseSelectableChannel): implement.
	(SinkChannelImpl.getNativeFD): removed.
	(SinkChannelImpl.getVMChannel): new method.
	* gnu/java/nio/SelectionKeyImpl.java (getNativeFD): mark
	deprecated.
	* gnu/java/nio/SelectorProviderImpl.java (SELECTOR_IMPL_KQUEUE,
	SELECTOR_IMPL_EPOLL, SELECTOR_IMPL): new constants.
	(openSelector): return kqueue selector if available.
	* gnu/java/nio/ServerSocketChannelImpl.java: implement
	`VMChannelOwner.'
	(channel): new field.
	(<init>): init `channel.'
	(finalizer): check if the `VMChannel.State' is valid.
	(implCloseSelectableChannel): use `VMChannel.close.'
	(implConfigureBlocking): use `VMChannel.setBlocking.'
	(accept): use `VMChannel.accept.'
	(getVMChannel): new method.
	* gnu/java/nio/ServerSocketChannelSelectionKey.java (getNativeFD):
	access native FD through `VMChannel.State.'
	* gnu/java/nio/SocketChannelImpl.java: implement `VMChannelOwner.'
	(impl): removed.
	(channel, connected, connectAddress): new field.
	(<init>): new constructors.
	(getPlainSocketImpl): removed.
	(implCloseSelectableChannel): use `VMChannel.close.'
	(implConfigureBlocking): use `VMChannel.setBlocking.'
	(connect): use `connect(SocketAddress,int).'
	(connect): use `VMChannel.connect.'
	(finishConnect): don't use a selector.
	(isConnected): use `VMChannel.getPeerAddress.'
	(read): use `VMChannel.read.'
	(read): use `VMChannel.readScattering.'
	(write): use `VMChannel.write.'
	(write): use `VMChannel.writeGathering.'
	(getVMChannel): new method.
	* gnu/java/nio/SocketChannelSelectionKey.java (getNativeFD): get
	native FD from `VMChannel.State.'
	* gnu/java/nio/SocketChannelSelectionKeyImpl.java (getNativeFD):
	get native FD from `VMChannel.State.'
	* gnu/java/nio/VMChannelOwner.java: new file.
	* gnu/java/nio/channels/FileChannelImpl.java: removed.
	* include/Makefile.am: generate `gnu_java_nio_FileChannelImpl.h'
	and `gnu_java_nio_KqueueSelectorImpl.h;' don't generate
	`gnu_java_nio_channels_FileChannelImpl.h.'
	* include/gnu_java_net_VMPlainSocketImpl.h: regenerated.
	* include/gnu_java_nio_FileChannelImpl.h: new file.
	* include/gnu_java_nio_KqueueSelectorImpl.h: new file.
	* include/gnu_java_nio_VMChannel.h: regenerated.
	* include/gnu_java_nio_VMPipe.h: regenerated.
	* include/java_net_VMNetworkInterface.h: regenerated.
	* java/io/FileDescriptor.java: fix imports.
	* java/io/FileInputStream.java (<init>): handle exceptions.
	(read): wrap the destination arary.
	* java/io/FileOutputStream.java (<init>): handle exceptions.
	(write): wrap the source array.
	* java/io/RandomAccessFile.java (<init>): handle exceptions.
	* java/net/DatagramSocket.java (<init>): handle exceptions.
	(receive): handle length/port setting.
	(connect): bind to any address/port if the argument is null.
	* java/net/NetworkInterface.java (name, inetAddress): removed.
	(netif): new field.
	(<init>): make private.
	(getName): return `netif.name.'
	(getInetAddresses): access `netif.addresses.'
	(getDisplayName): return `netif.name.'
	(getByName, getByAddress): handle changes to `VMNetworkInterface.'
	(condense): removed.
	(getNetworkInterfaces): handle changes to `VMNetworkInterface.'
	(equals): compare `netif' fields.
	(hashCode): get hash codes from `netif.'
	(toString): use a StringBuffer.
	* java/net/ServerSocket.java (close): don't set `impl' to null.
	(isClosed): use `VMChannel.State.isClosed.'
	* java/net/Socket.java (getLocalAddress): don't use `getOption' if
	the `SocketImpl' is a `PlainSocketImpl.'
	(close): just close the `impl.'
	(toString): use `super.toString' in the value we return.
	(isConnected): just access `impl,' not `getImpl.'
	(isBound): use `PlainSocketImpl' methods if we can.
	(isClosed): look at `VMChannel.State.'
	* native/jni/classpath/jcl.c (JNI_OnLoad): new function.
	(JCL_NewRawDataObject): don't initialize cached fields here; throw
	an exception if they were not.
	(JCL_GetRawData): throw an exception if cached fields weren't
	created.
	* native/jni/java-lang/java_lang_VMProcess.c: handle
	FileChannelImpl move.
	* native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
	(IO_EXCEPTION, SOCKET_EXCEPTION, BIND_EXCEPTION,
	THROW_NO_NETWORK): new macros.
	(Java_gnu_java_net_VMPlainSocketImpl_bind): reipmlemented.
	(Java_gnu_java_net_VMPlainSocketImpl_bind6): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_listen): reimplemented.
	(java_sockopt): new enum.
	(Java_gnu_java_net_VMPlainSocketImpl_setOption): reimplemented.
	(Java_gnu_java_net_VMPlainSocketImpl_getOption): reimplemented.
	(Java_gnu_java_net_VMPlainSocketImpl_shutdownInput):
	reimplemented.
	(Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput):
	reimplemented.
	(Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData): new
	function.
	(Java_gnu_java_net_VMPlainSocketImpl_join): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_join6): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_read): removed.
	(Java_gnu_java_net_VMPlainSocketImpl_leave): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_leave6): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_joinGroup): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_write): removed.
	(Java_gnu_java_net_VMPlainSocketImpl_joinGroup6): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_leaveGroup): new function.
	(Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6): new function.
	(getif_address): new function.
	(getif_index): new function.
	* native/jni/java-net/java_net_VMNetworkInterface.c
	(java_net_VMNetworkInterface_init,
	java_net_VMNetworkInterface_addAddress): new file-scope globals.
	(Java_java_net_VMNetworkInterface_initIds): new function.
	(struct netif_entry): new struct.
	(free_netif_list): new function.
	(Java_java_net_VMNetworkInterface_getInterfaces): removed.
	(Java_java_net_VMNetworkInterface_getVMInterfaces): new function.
	* native/jni/java-nio/Makefile.am (libjavanio_la_SOURCES): remove
	gnu_java_nio_channels_FileChannelImpl.c, add
	gnu_java_nio_KqueueSelectorImpl.c.
	* native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c: new file.
	* native/jni/java-nio/gnu_java_nio_VMChannel.c
	(INTERRUPTED_IO_EXCEPTION, SOCKET_TIMEOUT_EXCEPTION, ALIGN_UP,
	ALIGN_DOWN): new macros.
	(JCL_init_buffer): get the address through GetDirectBufferAddress
	if possible.
	(Java_gnu_java_nio_VMChannel_stdin_1fd,
	Java_gnu_java_nio_VMChannel_stdout_1fd,
	Java_gnu_java_nio_VMChannel_stderr_1fd): new functions.
	(Java_gnu_java_nio_VMChannel_setBlocking): fix setting blocking
	value.
	(Java_gnu_java_nio_VMChannel_read): renamed...
	(Java_gnu_java_nio_VMChannel_read__ILjava_nio_ByteBuffer_2): to
	this; handle interrupted IO; add HAVE_READ check.
	(Java_gnu_java_nio_VMChannel_write): renamed...
	(Java_gnu_java_nio_VMChannel_write__ILjava_nio_ByteBuffer_2): to
	this; handle zero-length write; add HAVE_WRITE check.
	(Java_gnu_java_nio_VMChannel_receive): new function.
	(Java_gnu_java_nio_VMChannel_send): new function.
	(Java_gnu_java_nio_VMChannel_send6): new function.
	(Java_gnu_java_nio_VMChannel_read__I): new function.
	(Java_gnu_java_nio_VMChannel_write__II): new function.
	(Java_gnu_java_nio_VMChannel_socket): new function.
	(Java_gnu_java_nio_VMChannel_connect): new function.
	(Java_gnu_java_nio_VMChannel_connect6): new function.
	(Java_gnu_java_nio_VMChannel_getsockname): new function.
	(Java_gnu_java_nio_VMChannel_getpeername): new function.
	(Java_gnu_java_nio_VMChannel_accept): new function.
	(Java_gnu_java_nio_VMChannel_disconnect): new function.
	(Java_gnu_java_nio_VMChannel_close): new function.
	(Java_gnu_java_nio_VMChannel_available): new function.
	(FileChannel_mode): new enum.
	(Java_gnu_java_nio_VMChannel_open): new function.
	(Java_gnu_java_nio_VMChannel_position): new function.
	(Java_gnu_java_nio_VMChannel_seek): new function.
	(Java_gnu_java_nio_VMChannel_truncate): new funciton.
	(Java_gnu_java_nio_VMChannel_lock): new function.
	(Java_gnu_java_nio_VMChannel_unlock): new function.
	(Java_gnu_java_nio_VMChannel_size): new function.
	(Java_gnu_java_nio_VMChannel_map): new function.
	(Java_gnu_java_nio_VMChannel_flush): new function.
	* native/jni/java-nio/gnu_java_nio_VMPipe.c
	(Java_gnu_java_nio_VMPipe_init): removed.
	(Java_gnu_java_nio_VMPipe_pipe0): new function.
	* native/jni/java-nio/javanio.c: new file.
	* native/jni/java-nio/javanio.h: new file.
	* native/jni/native-lib/cpnet.c (cpnet_getHostByName): fix for
	systems without `gethostbyname_r.'
	* vm/reference/gnu/java/net/VMPlainSocketImpl.java (nfd): new
	field.
	(<init>, <init>): new constructors.
	(setOption, getOption): make instance methods; defer to native
	implementation.
	(connect): removed.
	(bind): make an instance method; defer to native methods.
	(accept): removed.
	(available): removed.
	(listen): make an instance method; defer to native method.
	(read): removed.
	(join, leave): new methods.
	(write): removed.
	(joinGroup, leaveGroup): new methods.
	(shutdownInput, shutdownOutput): make instance methods.
	(sendUrgentData): removed.
	(State): new class.
	* vm/reference/gnu/java/nio/VMChannel.java: make final.
	(fd): removed.
	(nfd): new field.
	(<init>): new, public constructors.
	(getVMChannel): methods removed.
	(getState, getStdin, getStdout, getStderr, stdin_fd, stdout_fd,
	stderr_fd): new methods.
	(setBlocking): make an instance method.
	(available): new method.
	(read): get native fd from `nfd.'
	(read): new single-byte read method.
	(readScattering): get native fd from `nfd.'
	(receive): new method.
	(write, writeGathering): get native fd from `nfd.'
	(send): new method.
	(write): new single-byte write method.
	(initSocket): new method.
	(connect): new method.
	(disconnect): new method.
	(getLocalAddress): new method.
	(getPeerAddress): new method.
	(accept): new method.
	(openFile): new method.
	(position): new method.
	(seek): new method.
	(truncate): new method.
	(lock): new method.
	(unlock): new method.
	(size): new method.
	(map): new method.
	(flush): new method.
	(close): new method.
	(State): new class.
	(Kind): new class.
	* vm/reference/gnu/java/nio/VMPipe.java (init): removed.
	(pipe, pipe0): new method.
	* vm/reference/java/net/VMNetworkInterface.java (name, addresses):
	new fields.
	(<clinit>): call `initIds.'
	(initIds): new method.
	(getInterfaces): removed.
	(getVMInterfaces): new method.
	(addAddress): new method.
	* vm/reference/java/nio/channels/VMChannels.java: fix imports.

11 files changed, 3154 insertions, 303 deletions

diff --git a/native/jni/classpath/jcl.c b/native/jni/classpath/jcl.c
index e28c6631b..5fa656cc0 100644
--- a/native/jni/classpath/jcl.c
+++ b/native/jni/classpath/jcl.c
@@ -48,6 +48,65 @@ exception statement from your version. */
   #endif
 #endif
 
+/*
+ * Cached Pointer class info.
+ */
+static jclass rawDataClass;
+static jfieldID rawData_fid;
+static jmethodID rawData_mid;
+
+/*
+ * JNI OnLoad constructor.
+ */
+jint
+JNI_OnLoad (JavaVM *vm, void *reserved)
+{
+  JNIEnv *env;
+  void *envp;
+
+  if ((*vm)->GetEnv (vm, &envp, JNI_VERSION_1_4) != JNI_OK)
+    {
+      return JNI_VERSION_1_4;
+    }
+  env = (JNIEnv *) envp;
+#if SIZEOF_VOID_P == 8
+  rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer64");
+  if (rawDataClass != NULL)
+    {
+      jclass tmp = rawDataClass;
+      rawDataClass = (*env)->NewGlobalRef (env, rawDataClass);
+      (*env)->DeleteGlobalRef (env, tmp);
+    }
+
+  if (rawDataClass != NULL)
+    {
+      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "J");
+      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(J)V");
+    }
+#else
+#if SIZEOF_VOID_P == 4
+  rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer32");
+  if (rawDataClass != NULL)
+    {
+      jclass tmp = rawDataClass;
+      rawDataClass = (*env)->NewGlobalRef (env, rawDataClass);
+      (*env)->DeleteGlobalRef (env, tmp);
+    }
+
+  if (rawDataClass != NULL)
+    {
+      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "I");
+      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(I)V");
+    }
+#else
+#error "Pointer size is not supported."
+#endif /* SIZEOF_VOID_P == 4 */
+#endif /* SIZEOF_VOID_P == 8 */
+
+  return JNI_VERSION_1_4;
+}
+
+
 JNIEXPORT void JNICALL
 JCL_ThrowException (JNIEnv * env, const char *className, const char *errMsg)
 {
@@ -183,78 +242,17 @@ JCL_FindClass (JNIEnv * env, const char *className)
 
 
 /*
- * Build a Pointer object. The function caches the class type 
+ * Build a Pointer object.
  */
 
-static jclass rawDataClass;
-static jfieldID rawData_fid;
-static jmethodID rawData_mid;
-
 JNIEXPORT jobject JNICALL
 JCL_NewRawDataObject (JNIEnv * env, void *data)
 {
-  if (rawDataClass == NULL)
+  if (rawDataClass == NULL || rawData_mid == NULL)
     {
-      jclass tmp;
-#if SIZEOF_VOID_P == 8
-      rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer64");
-      if (rawDataClass == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal class");
-	  return NULL;
-	}
-
-      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(J)V");
-      if (rawData_mid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal constructor");
-	  return NULL;
-	}
-
-      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "J");
-      if (rawData_fid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal field");
-	  return NULL;
-	}
-#else
-      rawDataClass = (*env)->FindClass (env, "gnu/classpath/Pointer32");
-      if (rawDataClass == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal class");
-	  return NULL;
-	}
-
-      rawData_mid = (*env)->GetMethodID (env, rawDataClass, "<init>", "(I)V");
-      if (rawData_mid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal constructor");
-	  return NULL;
-	}
-
-      rawData_fid = (*env)->GetFieldID (env, rawDataClass, "data", "I");
-      if (rawData_fid == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to find internal field");
-	  return NULL;
-	}
-
-#endif
-      tmp = (*env)->NewGlobalRef (env, rawDataClass);
-      if (tmp == NULL)
-	{
-	  JCL_ThrowException (env, "java/lang/InternalError",
-			      "unable to create an internal global ref");
-	  return NULL;
-	}
-      (*env)->DeleteLocalRef(env, rawDataClass);
-      rawDataClass = tmp;
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "Pointer class was not properly initialized");
+      return NULL;
     }
 
 #if SIZEOF_VOID_P == 8
@@ -267,6 +265,13 @@ JCL_NewRawDataObject (JNIEnv * env, void *data)
 JNIEXPORT void * JNICALL
 JCL_GetRawData (JNIEnv * env, jobject rawdata)
 {
+  if (rawData_fid == NULL)
+    {
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "Pointer class was not properly initialized");
+      return NULL;
+    }
+
 #if SIZEOF_VOID_P == 8
   return (void *) (*env)->GetLongField (env, rawdata, rawData_fid);
 #else
diff --git a/native/jni/java-lang/java_lang_VMProcess.c b/native/jni/java-lang/java_lang_VMProcess.c
index e9d85fa65..a6076f2ae 100644
--- a/native/jni/java-lang/java_lang_VMProcess.c
+++ b/native/jni/java-lang/java_lang_VMProcess.c
@@ -38,7 +38,7 @@ exception statement from your version. */
 #include <config.h>
 
 #include "java_lang_VMProcess.h"
-#include "gnu_java_nio_channels_FileChannelImpl.h"
+#include "gnu_java_nio_FileChannelImpl.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -137,8 +137,8 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
   char *dir = NULL;
   pid_t pid = -1;
   char errbuf[64];
-  jmethodID method;
-  jclass clazz;
+  jmethodID method, vmmethod;
+  jclass clazz, vmclazz;
   int i;
   int pipe_count = redirect ? 2 : 3;
   int err;
@@ -214,10 +214,12 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
     }
 
   /* Create Input/OutputStream objects around parent file descriptors */
-  clazz = (*env)->FindClass (env, "gnu/java/nio/channels/FileChannelImpl");
+  vmclazz = (*env)->FindClass (env, "gnu/java/nio/VMChannel");
+  clazz = (*env)->FindClass (env, "gnu/java/nio/FileChannelImpl");
   if ((*env)->ExceptionOccurred (env))
     goto done;
-  method = (*env)->GetMethodID (env, clazz, "<init>", "(II)V");
+  vmmethod = (*env)->GetMethodID (env, vmclazz, "<init>", "(I)V");
+  method = (*env)->GetMethodID (env, clazz, "<init>", "(Lgnu/java/nio/VMChannel;I)V");
   if ((*env)->ExceptionOccurred (env))
     goto done;
   for (i = 0; i < pipe_count; i++)
@@ -228,11 +230,16 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
       jclass sclazz;
       jmethodID smethod;
 
-      jobject channel = (*env)->NewObject (env, clazz, method, fd, mode);
+      jobject vmchannel;
+      jobject channel;
+      vmchannel = (*env)->NewObject (env, vmclazz, vmmethod, fd);
+      if ((*env)->ExceptionOccurred (env))
+	goto done;
+      channel = (*env)->NewObject (env, clazz, method, vmchannel, mode);
       if ((*env)->ExceptionOccurred (env))
 	goto done;
 
-      if (mode == gnu_java_nio_channels_FileChannelImpl_WRITE)
+      if (mode == gnu_java_nio_FileChannelImpl_WRITE)
 	sclazz = (*env)->FindClass (env, "java/io/FileOutputStream");
       else
 	sclazz = (*env)->FindClass (env, "java/io/FileInputStream");
@@ -240,7 +247,7 @@ Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
 	goto done;
 
       smethod = (*env)->GetMethodID (env, sclazz, "<init>",
-				     "(Lgnu/java/nio/channels/FileChannelImpl;)V");
+				     "(Lgnu/java/nio/FileChannelImpl;)V");
       if ((*env)->ExceptionOccurred (env))
 	goto done;
 
diff --git a/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c b/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
index fb9855908..989ed3146 100644
--- a/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
+++ b/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c
@@ -35,265 +35,801 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-/* do not move; needed here because of some macro definitions */
-#include <config.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <ifaddrs.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
  
 #include <jni.h>
 #include <jcl.h>
 
-#include <cpnative.h>
-#include <cpnet.h>
-#include "javanet.h"
+/* #include "javanet.h" */
 
 #include "gnu_java_net_VMPlainSocketImpl.h"
 
-/*
- * Note that the functions in this module simply redirect to another
- * internal function.  Why?  Because many of these functions are shared
- * with PlainDatagramSocketImpl.  The unshared ones were done the same
- * way for consistency.
- */
+#define IO_EXCEPTION "java/io/IOException"
+#define SOCKET_EXCEPTION "java/net/SocketException"
+#define BIND_EXCEPTION "java/net/BindException"
+
+#define THROW_NO_NETWORK(env) JCL_ThrowException (env, "java/lang/InternalError", "this platform not configured for network support") 
 
-/*************************************************************************/
 
 /*
- * Creates a new stream or datagram socket
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    bind
+ * Signature: (I[BI)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_create(JNIEnv *env,
-					   jclass klass __attribute__ ((__unused__)),
-					   jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_bind (JNIEnv *env,
+                                          jclass clazz __attribute__((unused)),
+                                          jint fd, jbyteArray addr, jint port)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_create(env, obj, JNI_TRUE);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  struct sockaddr_in sockaddr;
+  jbyte *elems = NULL;
+  int ret;
+
+  if (addr != NULL)
+    elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset(&sockaddr, 0, sizeof (struct sockaddr_in));
+  sockaddr.sin_family = AF_INET;
+  sockaddr.sin_port = htons (port);
+  /* addr is already in network byte order. */
+  if (elems != NULL)
+    sockaddr.sin_addr.s_addr = *((uint32_t *) elems);
+  else
+    sockaddr.sin_addr.s_addr = INADDR_ANY;
+
+  /* bind(2) from BSD says bind will never return EINTR */
+  /* bind is not a blocking system call */
+  ret = bind (fd, (struct sockaddr *) &sockaddr, sizeof (struct sockaddr_in));
+
+  if (elems != NULL)
+    (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, BIND_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
 /*
- * Close the socket.  Any underlying streams will be closed by this
- * action as well.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    bind6
+ * Signature: (I[BI)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_close(JNIEnv *env,
-					  jclass klass __attribute__ ((__unused__)),
-					  jobject obj)
+Java_gnu_java_net_VMPlainSocketImpl_bind6 (JNIEnv *env,
+                                           jclass c __attribute__((unused)),
+                                           jint fd, jbyteArray addr, jint port)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_close(env, obj, 1);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  /* FIXME! Add check if we have IPv6! */
+  struct sockaddr_in6 sockaddr;
+  jbyte *elems;
+  int ret;
+
+  elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset (&sockaddr, 0, sizeof (struct sockaddr_in6));
+  sockaddr.sin6_family = AF_INET6;
+  sockaddr.sin6_port = htons (port);
+  memcpy (&sockaddr.sin6_addr.s6_addr, elems, 16);
+
+  /* bind(2) from BSD says bind will never return EINTR */
+  /* bind is not a blocking system call */
+  ret = bind (fd, (struct sockaddr *) &sockaddr,
+              sizeof (struct sockaddr_in6));
+
+  (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
 /*
- * Connects to the specified destination.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    listen
+ * Signature: (II)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_connect(JNIEnv *env,
-					    jclass klass __attribute__ ((__unused__)),
-					    jobject obj, 
-					    jobject addr, jint port)
+Java_gnu_java_net_VMPlainSocketImpl_listen (JNIEnv *env,
+                                            jclass c __attribute__((unused)),
+                                            jint fd, jint backlog)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_connect(env, obj, addr, port, 1);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  int ret;
+
+  /* listen(2) says that this call will never return EINTR */
+  /* listen is not a blocking system call */
+  if ((ret = listen (fd, backlog)) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+  printf("listen returns %d\n", ret);
 }
 
-/*************************************************************************/
+
+/* These constants are also defined in java/net/SocketOptions.java */
+enum java_sockopt {
+  CPNET_SO_KEEPALIVE = 0x8,
+  CPNET_SO_LINGER = 0x80,
+  CPNET_SO_TIMEOUT = 0x1006,
+  CPNET_SO_BINDADDR = 0x0F,
+  CPNET_SO_SNDBUF = 0x1001,
+  CPNET_SO_RCVBUF = 0x1002,
+  CPNET_SO_REUSEADDR = 0x04,
+  CPNET_SO_BROADCAST = 0x20,
+  CPNET_SO_OOBINLINE = 0x1003,
+  CPNET_TCP_NODELAY = 0x01,
+  CPNET_IP_MULTICAST_IF = 0x10,
+  CPNET_IP_MULTICAST_IF2 = 0x1F,
+  CPNET_IP_MULTICAST_LOOP = 0x12,
+  CPNET_IP_TOS = 0x03
+};
+
 
 /*
- * This method binds the specified address to the specified local port.
- * Note that we have to set the local address and local port public instance 
- * variables. 
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    setOption
+ * Signature: (III)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_bind(JNIEnv *env,
-					 jclass klass __attribute__ ((__unused__)),
-					 jobject obj, jobject addr,
-					 jint port)
+Java_gnu_java_net_VMPlainSocketImpl_setOption (JNIEnv *env,
+                                               jclass c __attribute__((unused)),
+                                               jint fd, jint option, jint value)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_bind(env, obj, addr, port, 1);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  enum java_sockopt joption = (enum java_sockopt) option;
+  int optname = -1;
+  int level = SOL_SOCKET;
+  const int _value = value;
+  struct linger _linger;
+  struct timeval _timeo;
+  void *optval = (void *) &_value;
+  socklen_t optlen = sizeof (int);
+
+  switch (joption)
+    {
+    case CPNET_IP_MULTICAST_LOOP:
+      level = IPPROTO_IP;
+      optname = IP_MULTICAST_LOOP;
+      break;
+
+    case CPNET_SO_KEEPALIVE:
+      optname = SO_KEEPALIVE;
+      break;
+
+    case CPNET_SO_LINGER:
+      optname = SO_LINGER;
+      if (_value == 0)
+        _linger.l_onoff = 0;
+      else
+        _linger.l_onoff = 1;
+      _linger.l_linger = _value;
+      optval = &_linger;
+      optlen = sizeof (struct linger);
+      break;
+
+    case CPNET_SO_TIMEOUT:
+      optname = SO_RCVTIMEO;
+      _timeo.tv_sec = value / 1000;
+      _timeo.tv_usec = (value % 1000) * 1000;
+      optval = &_timeo;
+      optlen = sizeof (struct timeval);
+      break;
+
+    case CPNET_SO_SNDBUF:
+      optname = SO_SNDBUF;
+      break;
+
+    case CPNET_SO_RCVBUF:
+      optname = SO_RCVBUF;
+      break;
+
+    case CPNET_SO_REUSEADDR:
+      optname = SO_REUSEADDR;
+      break;
+
+    case CPNET_SO_BROADCAST:
+      optname = SO_BROADCAST;
+      break;
+
+    case CPNET_SO_OOBINLINE:
+      optname = SO_OOBINLINE;
+      break;
+
+    case CPNET_TCP_NODELAY:
+      level = IPPROTO_TCP;
+      optname = TCP_NODELAY;
+      break;
+
+    case CPNET_IP_TOS:
+      level = IPPROTO_IP;
+      optname = IP_TOS;
+      break;
+
+    case CPNET_SO_BINDADDR:
+    case CPNET_IP_MULTICAST_IF:
+    case CPNET_IP_MULTICAST_IF2:
+      JCL_ThrowException (env, IO_EXCEPTION, "argument not a boolean or integer option");
+      return;
+    }
+
+  if (setsockopt (fd, level, optname, (const void *) optval, optlen) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+}
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    getOption
+ * Signature: (II)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_getOption (JNIEnv *env,
+                                               jclass c __attribute__((unused)),
+                                               jint fd, jint option)
+{
+  enum java_sockopt joption = (enum java_sockopt) option;
+  int optname = -1;
+  int level = SOL_SOCKET;
+  int value;
+  struct linger linger;
+  struct timeval timeo;
+  void *optval = &value;
+  socklen_t optlen = sizeof (int);
+
+  switch (joption)
+    {
+    case CPNET_IP_MULTICAST_LOOP:
+      level = IPPROTO_IP;
+      optname = IP_MULTICAST_LOOP;
+      break;
+
+    case CPNET_SO_KEEPALIVE:
+      optname = SO_KEEPALIVE;
+      break;
+
+    case CPNET_SO_LINGER:
+      optname = SO_LINGER;
+      optval = &linger;
+      optlen = sizeof (struct linger);
+      break;
+
+    case CPNET_SO_TIMEOUT:
+      optname = SO_RCVTIMEO;
+      optval = &timeo;
+      optlen = sizeof (struct timeval);
+      break;
+
+    case CPNET_SO_SNDBUF:
+      optname = SO_SNDBUF;
+      break;
+
+    case CPNET_SO_RCVBUF:
+      optname = SO_RCVBUF;
+      break;
+
+    case CPNET_SO_REUSEADDR:
+      optname = SO_REUSEADDR;
+      break;
+
+    case CPNET_SO_BROADCAST:
+      optname = SO_BROADCAST;
+      break;
+
+    case CPNET_SO_OOBINLINE:
+      optname = SO_OOBINLINE;
+      break;
+
+    case CPNET_TCP_NODELAY:
+      level = IPPROTO_TCP;
+      optname = TCP_NODELAY;
+      break;
+
+    case CPNET_IP_TOS:
+      level = IPPROTO_IP;
+      optname = IP_TOS;
+      break;
+
+    case CPNET_SO_BINDADDR:
+    case CPNET_IP_MULTICAST_IF:
+    case CPNET_IP_MULTICAST_IF2:
+      JCL_ThrowException (env, IO_EXCEPTION, "argument not a boolean or integer option");
+      return -1;
+    }
+
+  if (getsockopt (fd, level, optname, optval, &optlen) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  if (joption == CPNET_SO_LINGER)
+    return linger.l_linger;
+  if (joption == CPNET_SO_TIMEOUT)
+    return (timeo.tv_sec * 1000) + (timeo.tv_usec / 1000);
+
+  return value;
 }
 
-/*************************************************************************/
 
 /*
- * Starts listening on a socket with the specified number of pending 
- * connections allowed.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    shutdownInput
+ * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_listen(JNIEnv *env,
-					   jclass klass __attribute__ ((__unused__)),
-					   jobject obj, jint queuelen)
+Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv *env,
+                                                   jclass c __attribute__((unused)),
+                                                   jint fd)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_listen(env, obj, queuelen);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  if (shutdown (fd, SHUT_RD) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
-
 /*
- * Accepts a new connection and assigns it to the passed in SocketImpl
- * object. Note that we assume this is a PlainSocketImpl just like us.
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    shutdownOutput
+ * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_accept(JNIEnv *env,
-					   jclass klass __attribute__ ((__unused__)),
-					   jobject obj, jobject impl)
+Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv *env,
+                                                    jclass c __attribute__((unused)),
+                                                    jint fd)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_accept(env, obj, impl);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+  if (shutdown (fd, SHUT_WR) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
-JNIEXPORT jint JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_available(JNIEnv *env,
-					      jclass klass __attribute__ ((__unused__)),
-					      jobject obj)
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    sendUrgentData
+ * Signature: (II)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData (JNIEnv *env,
+                                                    jclass c __attribute__((unused)),
+                                                    jint fd, jint data)
 {
-#ifndef WITHOUT_NETWORK
-  jclass   cls;
-  jfieldID fid;
-  int      fd;
-  int      bytesAvailable;
-  int      result;
-  
-  cls = (*env)->GetObjectClass(env, obj);
-  if (cls == 0)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, "internal error");
-      return 0;
-    }
-  
-  fid = (*env)->GetFieldID(env, cls, "native_fd", "I"); 
-  if (fid == 0)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, "internal error");
-      return 0;
-    }
+  const char x = (char) data;
 
-  fd = (*env)->GetIntField(env, obj, fid);
-  
-  result = cpnet_getAvailableBytes (env, fd, &bytesAvailable);
-  if (result != CPNATIVE_OK)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION, cpnative_getErrorString (result));
-      return 0;
-    }
-
-  return bytesAvailable;
-#else /* not WITHOUT_NETWORK */
-  return 0;
-#endif /* not WITHOUT_NETWORK */
+  if (send (fd, &x, 1, MSG_OOB) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
 }
 
-/*************************************************************************/
 
 /*
- * This method sets the specified option for a socket
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    join
+ * Signature: (I[B)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_setOption(JNIEnv *env,
-					      jclass klass __attribute__ ((__unused__)),
-					      jobject obj, 
-					      jint option_id, jobject val)
+Java_gnu_java_net_VMPlainSocketImpl_join (JNIEnv *env,
+                                          jclass clazz __attribute__((unused)),
+                                          jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_set_option(env, obj, option_id, val);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+  maddr.imr_interface.s_addr = INADDR_ANY;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
-/*************************************************************************/
 
 /*
- * This method gets the specified option for a socket
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    join6
+ * Signature: (I[B)V
  */
-JNIEXPORT jobject JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_getOption(JNIEnv *env,
-					      jclass klass __attribute__ ((__unused__)),
-					      jobject obj, 
-					      jint option_id)
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_join6 (JNIEnv *env,
+                                           jclass clazz __attribute__((unused)),
+                                           jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  return(_javanet_get_option(env, obj, option_id));
-#else /* not WITHOUT_NETWORK */
-  return NULL;
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+  maddr.ipv6mr_interface = 0;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
-/*************************************************************************/
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leave
+ * Signature: (I[B)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_leave (JNIEnv *env,
+                                           jclass c __attribute__((unused)),
+                                           jint fd, jbyteArray addr)
+{
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+  maddr.imr_interface.s_addr = INADDR_ANY;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
 
 /*
- * Reads a buffer from a remote host
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leave6
+ * Signature: (I[B)V
  */
-JNIEXPORT jint JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_read(JNIEnv *env,
-					 jclass klass __attribute__ ((__unused__)),
-					 jobject obj, jarray buf,
-					 jint offset, jint len)
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_leave6 (JNIEnv *env,
+                                            jclass c __attribute__((unused)),
+                                            jint fd, jbyteArray addr)
 {
-#ifndef WITHOUT_NETWORK
-  return(_javanet_recvfrom(env, obj, buf, offset, len, 0));
-#else /* not WITHOUT_NETWORK */
-  return 0;
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+  maddr.ipv6mr_interface = 0;
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
-/*************************************************************************/
+static uint32_t getif_address (JNIEnv *env, char *ifname);
+static int getif_index (JNIEnv *env, char *ifname);
 
 /*
- * Writes a buffer to the remote host
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    joinGroup
+ * Signature: (I[BILjava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_write(JNIEnv *env,
-					  jclass klass __attribute__ ((__unused__)),
-					  jobject obj, jarray buf,
-					  jint offset, jint len)
+Java_gnu_java_net_VMPlainSocketImpl_joinGroup (JNIEnv *env,
+                                               jclass c __attribute__((unused)),
+                                               jint fd, jbyteArray addr,
+                                               jstring ifname)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_sendto(env, obj, buf, offset, len, 0);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+
+  if (ifname != NULL)
+    {
+      maddr.imr_interface.s_addr = getif_address (env, ifname);
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.imr_interface.s_addr = INADDR_ANY;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    joinGroup6
+ * Signature: (I[BILjava/lang/String;)V
+ */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv * env,
-						   jclass klass __attribute__ ((__unused__)),
-						   jobject this)
+Java_gnu_java_net_VMPlainSocketImpl_joinGroup6 (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint fd, jbyteArray addr,
+                                                jstring ifname)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_shutdownInput (env, this);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+
+  if (ifname == NULL)
+    {
+      maddr.ipv6mr_interface = getif_index (env, ifname);
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.ipv6mr_interface = 0;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leaveGroup
+ * Signature: (I[BILjava/lang/String;)V
+ */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv * env,
-						    jclass klass __attribute__ ((__unused__)),
-						    jobject this)
+Java_gnu_java_net_VMPlainSocketImpl_leaveGroup (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint fd, jbyteArray addr,
+                                                jstring ifname)
 {
-#ifndef WITHOUT_NETWORK
-  _javanet_shutdownOutput (env, this);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
+#ifdef HAVE_SETSOCKOPT
+  struct ip_mreq maddr;
+  jbyte *addr_elems;
+
+  if (ifname != NULL)
+    {
+      maddr.imr_interface.s_addr = getif_address (env, ifname);
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.imr_interface.s_addr = INADDR_ANY;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  maddr.imr_multiaddr.s_addr = * ((uint32_t *) addr_elems);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IP, IP_DROP_MEMBERSHIP,
+                        &maddr, sizeof (struct ip_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
+}
+
+/*
+ * Class:     gnu_java_net_VMPlainSocketImpl
+ * Method:    leaveGroup6
+ * Signature: (I[BILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6 (JNIEnv *env,
+                                                jclass c __attribute__((unused)),
+                                                jint fd, jbyteArray addr,
+                                                jstring ifname)
+{
+#ifdef HAVE_SETSOCKOPT
+#ifdef HAVE_INET6
+  struct ipv6_mreq maddr;
+  jbyte *addr_elems;
+
+  if (ifname == NULL)
+    {
+      maddr.ipv6mr_interface = getif_index (env, ifname);
+      if ((*env)->ExceptionCheck (env))
+        return;
+    }
+  else
+    maddr.ipv6mr_interface = 0;
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+  if (addr_elems == NULL)
+    return;
+
+  memcpy (&(maddr.ipv6mr_multiaddr.s6_addr), addr_elems, 16);
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  if (-1 == setsockopt (fd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
+                        &maddr, sizeof (struct ipv6_mreq)))
+    JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "IPv6 support not available");
+#endif /* HAVE_INET6 */
+#else
+  (void) fd;
+  (void) addr;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "socket options not supported");
+#endif /* HAVE_SETSOCKOPT */
 }
 
-/* end of file */
+static uint32_t
+getif_address (JNIEnv *env, char *ifname)
+{
+#ifdef HAVE_GETIFADDRS
+  struct ifaddrs *ifaddrs, *i;
+  uint32_t addr = 0;
+  int foundaddr = 0;
+
+  if (getifaddrs (&ifaddrs) == -1)
+    {
+      JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+      return 0;
+    }
+
+  for (i = ifaddrs; i != NULL; i = i->ifa_next)
+    {
+      if (strcmp (ifname, i->ifa_name) == 0)
+        {
+          /* Matched the name; see if there is an IPv4 address. */
+          if (i->ifa_addr->sa_family == AF_INET)
+            {
+              foundaddr = 1;
+              addr = ((struct sockaddr_in *) i->ifa_addr)->sin_addr.s_addr;
+              break;
+            }
+        }
+    }
+
+  if (!foundaddr)
+    JCL_ThrowException (env, SOCKET_EXCEPTION, "interface has no IPv4 address");
+
+  freeifaddrs (ifaddrs);
+
+  return addr;
+#else
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "getifaddrs not available");
+  return 0;
+#endif /* HAVE_GETIFADDRS */
+}
+
+static int
+getif_index (JNIEnv *env, char *ifname)
+{
+#ifdef HAVE_GETIFADDRS
+  struct ifaddrs *ifaddrs, *i;
+  char *lastname = NULL;
+  int index = 1;
+  int foundname = 0;
+
+  if (getifaddrs (&ifaddrs) == -1)
+    {
+      JCL_ThrowException (env, SOCKET_EXCEPTION, strerror (errno));
+      return -1;
+    }
+
+  lastname = ifaddrs->ifa_name;
+  for (i = ifaddrs; i != NULL; i = i->ifa_next)
+    {
+      if (strcmp (lastname, ifaddrs->ifa_name) != 0)
+        {
+          lastname = ifaddrs->ifa_name;
+          index++;
+        }
+      if (strcmp (ifname, ifaddrs->ifa_name) == 0)
+        {
+          foundname = 1;
+          break;
+        }
+    }
+
+  if (!foundname)
+    JCL_ThrowException (env, SOCKET_EXCEPTION,
+                        "no interface with that name");
+
+  freeifaddrs (ifaddrs);
+
+  return index;
+#else
+  (void) ifname;
+  JCL_ThrowException (env, "java/lang/InternalError",
+                      "getifaddrs not available");
+  return -1;
+#endif /* HAVE_GETIFADDRS */
+}
diff --git a/native/jni/java-net/java_net_VMNetworkInterface.c b/native/jni/java-net/java_net_VMNetworkInterface.c
index f05e9fcc5..203f6acd0 100644
--- a/native/jni/java-net/java_net_VMNetworkInterface.c
+++ b/native/jni/java-net/java_net_VMNetworkInterface.c
@@ -35,9 +35,15 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-/* do not move; needed here because of some macro definitions */
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif /* HAVE_CONFIG_H */
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <netinet/in.h>
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -47,19 +53,197 @@ exception statement from your version. */
 
 #include "java_net_VMNetworkInterface.h"
 
-#include "javanet.h"
+
+static jmethodID java_net_VMNetworkInterface_init;
+static jmethodID java_net_VMNetworkInterface_addAddress;
 
 /*
- * Returns all local network interfaces as vector
+ * Initialize our static method ID's.
+ *
+ * Class:     java_net_VMNetworkInterface
+ * Method:    initIds
+ * Signature: ()V
  */
-JNIEXPORT jobject JNICALL
-Java_java_net_VMNetworkInterface_getInterfaces (JNIEnv * env,
-						jclass class
-						__attribute__ ((__unused__)))
+JNIEXPORT void JNICALL
+Java_java_net_VMNetworkInterface_initIds (JNIEnv *env, jclass clazz)
+{
+  java_net_VMNetworkInterface_init =
+    (*env)->GetMethodID (env, clazz, "<init>", "(Ljava/lang/String;)V");
+  if (java_net_VMNetworkInterface_init == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, "java/lang/NoSuchMethodError",
+                            "VMNetworkinterface.addAddress");
+      return;
+    }
+  java_net_VMNetworkInterface_addAddress =
+    (*env)->GetMethodID (env, clazz, "addAddress", "(Ljava/nio/ByteBuffer;)V");
+  if (java_net_VMNetworkInterface_addAddress == NULL)
+    {
+      if (!(*env)->ExceptionCheck (env))
+        JCL_ThrowException (env, "java/lang/NoSuchMethodError",
+                            "VMNetworkinterface.addAddress");
+    }
+}
+
+struct netif_entry
+{
+  char *name;
+  jobject netif;
+  int numaddrs;
+  struct netif_entry *next;
+};
+
+static void
+free_netif_list (JNIEnv *env, struct netif_entry *list)
 {
-  JCL_ThrowException (env, IO_EXCEPTION,
-		      "java.net.VMNetworkInterface.getInterfaces(): not implemented");
-  return 0;
+  while (list != NULL)
+    {
+      struct netif_entry *e = list->next;
+      JCL_free (env, list);
+      list = e;
+    }
+}
+
+/*
+ * Returns all local network interfaces as an array.
+ */
+JNIEXPORT jobjectArray JNICALL
+Java_java_net_VMNetworkInterface_getVMInterfaces (JNIEnv * env, jclass clazz)
+{
+#ifdef HAVE_GETIFADDRS
+  struct ifaddrs *ifaddrs, *i;
+  struct netif_entry *iflist = NULL, *e;
+  jobjectArray netifs;
+  int numifs = 0;
+  int k;
+
+  if (getifaddrs (&ifaddrs) == -1)
+    {
+      JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+      return NULL;
+    }
+
+  for (i = ifaddrs; i != NULL; i = i->ifa_next)
+    {
+      if (iflist == NULL)
+        {
+          iflist = JCL_malloc (env, sizeof (struct netif_entry));
+          if (iflist == NULL)
+            {
+              freeifaddrs (ifaddrs);
+              return NULL;
+            }
+          iflist->name = i->ifa_name;
+          iflist->numaddrs = 0;
+          iflist->next = NULL;
+          iflist->netif = (*env)->NewObject (env, clazz, java_net_VMNetworkInterface_init,
+                                             (*env)->NewStringUTF (env, i->ifa_name));
+          if (iflist->netif == NULL)
+            {
+              freeifaddrs (ifaddrs);
+              JCL_free (env, iflist);
+              return NULL;
+            }
+          e = iflist;
+        }
+      else
+        {
+          struct netif_entry *p = NULL;
+          for (e = iflist; e != NULL; e = e->next)
+            {
+              if (strcmp (e->name, i->ifa_name) == 0)
+                break;
+              p = e;
+            }
+
+          if (e == NULL)
+            {
+              p->next = (struct netif_entry *) JCL_malloc (env, sizeof (struct netif_entry));
+              if (p->next == NULL)
+                {
+                  free_netif_list (env, iflist);
+                  freeifaddrs (ifaddrs);
+                  return NULL;
+                }
+              e = p->next;
+              e->name = i->ifa_name;
+              e->numaddrs = 0;
+              e->next = NULL;
+              e->netif = (*env)->NewObject (env, clazz, java_net_VMNetworkInterface_init,
+                                            (*env)->NewStringUTF (env, i->ifa_name));
+              if (e->netif == NULL)
+                {
+                  free_netif_list (env, iflist);
+                  freeifaddrs (ifaddrs);
+                  return NULL;
+                }
+            }
+        }
+
+      if (i->ifa_addr == NULL)
+        continue;
+
+      if (i->ifa_addr->sa_family == AF_INET)
+        {
+          struct sockaddr_in *sin = (struct sockaddr_in *) i->ifa_addr;
+          jobject buffer = (*env)->NewDirectByteBuffer (env, &(sin->sin_addr.s_addr), 4);
+          (*env)->CallVoidMethod (env, e->netif, java_net_VMNetworkInterface_addAddress,
+                                  buffer);
+          if ((*env)->ExceptionCheck (env))
+            {
+              free_netif_list (env, iflist);
+              freeifaddrs (ifaddrs);
+              return NULL;
+            }
+          (*env)->DeleteLocalRef (env, buffer);
+          e->numaddrs++;
+        }
+#ifdef HAVE_INET6
+      else if (i->ifa_addr->sa_family == AF_INET6)
+        {
+          struct sockaddr_in6 *sin = (struct sockaddr_in6 *) i->ifa_addr;
+          jobject buffer = (*env)->NewDirectByteBuffer (env, &(sin->sin6_addr.s6_addr), 16);
+          (*env)->CallVoidMethod (env, e->netif, java_net_VMNetworkInterface_addAddress,
+                                  buffer);
+          if ((*env)->ExceptionCheck (env))
+            {
+              free_netif_list (env, iflist);
+              freeifaddrs (ifaddrs);
+              return NULL;
+            }
+          (*env)->DeleteLocalRef (env, buffer);
+          e->numaddrs++;
+        }
+#endif /* HAVE_INET6 */
+    }
+
+  /* Count how many interfaces we have that have addresses. */
+  for (e = iflist; e != NULL; e = e->next)
+    {
+      if (e->numaddrs != 0)
+        numifs++;
+    }
+
+  netifs = (*env)->NewObjectArray (env, numifs, clazz, NULL);
+  k = 0;
+  for (e = iflist; e != NULL && k < numifs; e = e->next)
+    {
+      if (e->numaddrs != 0)
+        {
+          (*env)->SetObjectArrayElement (env, netifs, k, e->netif);
+          (*env)->DeleteLocalRef (env, e->netif);
+          k++;
+        }
+    }
+
+  free_netif_list (env, iflist);
+  freeifaddrs (ifaddrs);
+  return netifs;
+#else
+  JCL_ThrowException (env, "java/net/SocketException", "getifaddrs not supported");
+  return NULL;
+#endif /* HAVE_GETIFADDRS */
 }
 
 /* end of file */
diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am
index 800d25be6..c297c08c1 100644
--- a/native/jni/java-nio/Makefile.am
+++ b/native/jni/java-nio/Makefile.am
@@ -3,11 +3,11 @@ nativeexeclib_LTLIBRARIES = libjavanio.la
 libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
 			gnu_java_nio_VMChannel.c \
 			gnu_java_nio_VMSelector.c \
-			gnu_java_nio_channels_FileChannelImpl.c \
 			gnu_java_nio_charset_iconv_IconvDecoder.c \
 			gnu_java_nio_charset_iconv_IconvEncoder.c \
 			java_nio_MappedByteBufferImpl.c \
-			java_nio_VMDirectByteBuffer.c
+			java_nio_VMDirectByteBuffer.c \
+			gnu_java_nio_KqueueSelectorImpl.c
 
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
 		       $(top_builddir)/native/jni/native-lib/libclasspathnative.la \
diff --git a/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c b/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c
new file mode 100644
index 000000000..4f065433a
--- /dev/null
+++ b/native/jni/java-nio/gnu_java_nio_KqueueSelectorImpl.c
@@ -0,0 +1,361 @@
+/* gnu_java_nio_channel_KqueueSelectorImpl.c -- 
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <sys/types.h>
+#if HAVE_SYS_EVENT_H
+#include <sys/event.h>
+#endif /* HAVE_SYS_EVENT_H */
+#include <sys/time.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <jni.h>
+#include <gnu_java_nio_KqueueSelectorImpl.h>
+
+#include <jcl.h>
+
+#define KEY_OP_ACCEPT  16
+#define KEY_OP_CONNECT  8
+#define KEY_OP_READ     1
+#define KEY_OP_WRITE    4
+
+/* XXX this requires -std=gnu99 or c99 */
+/* #ifdef TRACE_KQUEUE */
+/* #define TRACE(fmt, ...) fprintf (stderr, "%s: " fmt "\n", __FUNCTION__, __VA_ARGS__); */
+/* #else */
+/* #define TRACE(fmt, ...) */
+/* #endif */
+
+
+#define throw_not_supported(env) JCL_ThrowException (env, "java/lang/UnsupportedOperationException", "kqueue/kevent support not available")
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    kqueue_supported
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_kqueue_1supported (JNIEnv *env __attribute__((unused)),
+                                                        jclass clazz __attribute__((unused)))
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  return JNI_TRUE;
+#else
+  return JNI_FALSE;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    sizeof_struct_kevent
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_sizeof_1struct_1kevent
+(JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+/*   TRACE("return sizeof %lu", sizeof (struct kevent)); */
+  return sizeof (struct kevent);
+#else
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    implOpen
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_implOpen
+(JNIEnv *env, jclass clazz __attribute__((unused)))
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  int kq = kqueue ();
+/*   TRACE("kqueue returns %d", kq); */
+  if (kq == -1)
+    JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+  return kq;
+#else
+  throw_not_supported (env);
+  return -1;
+#endif
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    implClose
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_implClose (JNIEnv *env,
+                                                jclass clazz __attribute__((unused)),
+                                                jint kq)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+/*   TRACE("closing %d", kq); */
+  if (close (kq) != 0)
+    JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+#else
+  (void) kq;
+  throw_not_supported (env);
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    kevent_set
+ * Signature: (Ljava/nio/ByteBuffer;IIIZ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_kevent_1set (JNIEnv *env,
+                                                  jclass clazz __attribute__((unused)),
+                                                  jobject nstate, jint fd,
+                                                  jint ops, jint key, jboolean delete)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  short ident = kev->ident;
+
+  if (fd != 0)
+    ident = fd;
+
+  if ((ops & KEY_OP_READ) || (ops & KEY_OP_ACCEPT))
+    {
+      /* Add the event if we never added it before. */
+      if (kev[0].flags == 0 && JNI_FALSE == delete)
+        EV_SET(&kev[0], ident, EVFILT_READ, EV_ADD, 0, 0, (void *) key);
+      /* Otherwise, delete or reenable it. */
+      else if (kev[0].flags != 0)
+        EV_SET(&kev[0], ident, EVFILT_READ, (JNI_TRUE == delete) ? EV_DELETE : EV_ENABLE,
+               0, 0, (void *) key);
+    }
+  else
+    {
+      /* Means we've added this event before, and need to disable it. */
+      if (kev[0].flags != 0)
+        EV_SET(&kev[0], ident, EVFILT_READ, EV_DISABLE, 0, 0, (void *) key);
+    }
+
+  /* Do the same thing for the write filter. */
+  if ((ops & KEY_OP_WRITE) || (ops & KEY_OP_CONNECT))
+    {
+      if (kev[1].flags == 0 && JNI_FALSE == delete)
+        EV_SET(&kev[1], ident, EVFILT_WRITE, EV_ADD, 0, 0, (void *) key);
+      else if (kev[1].flags != 0)
+        EV_SET(&kev[1], ident, EVFILT_WRITE, (JNI_TRUE == delete) ? EV_DELETE : EV_ENABLE,
+               0, 0, (void *) key);
+    }
+  else
+    {
+      if (kev[1].flags != 0)
+        EV_SET(&kev[1], ident, EVFILT_WRITE, EV_DISABLE, 0, 0, (void *) key);
+    }
+#else
+  (void) nstate;
+  (void) fd;
+  (void) ops;
+  (void) key;
+  (void) delete;
+  throw_not_supported (env);
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    kevent
+ * Signature: (ILjava/nio/ByteBuffer;IJ)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_kevent (JNIEnv *env,
+                                             jobject this __attribute__((unused)),
+                                             jint kq, jobject nstate, jint nevents,
+                                             jlong timeout)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct timespec tv;
+  struct timespec *t = NULL;
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  int ret;
+
+#ifdef TRACE_KQUEUE
+  int i;
+  for (i = 0; i < nevents; i++)
+    {
+      printf ("kevent [%d]: ident:%u filter:%x flags:%o fflags:%o data:%p udata:%p\n",
+              i, (unsigned) kev[i].ident, kev[i].filter, kev[i].flags, kev[i].fflags,
+              (void *) kev[i].data, kev[i].udata);
+    }
+#endif
+
+/*   TRACE("events: %p; nevents: %d; timeout: %lld", (void *) kev, nevents, timeout); */
+
+  if (timeout != -1)
+    {
+      tv.tv_sec = timeout / 1000;
+      tv.tv_nsec = (timeout % 1000) * 1000;
+      t = &tv;
+    }
+
+  ret = kevent (kq, (const struct kevent *) kev, nevents, kev, nevents, t);
+
+  if (ret == -1)
+    {
+      if (errno == EINTR)
+        ret = 0;
+      else
+        JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+    }
+
+#ifdef TRACE_KQUEUE
+  for (i = 0; i < ret; i++)
+    {
+      printf ("kevent [%d]: ident:%u filter:%x flags:%o fflags:%o data:%p udata:%p\n",
+              i, (unsigned) kev[i].ident, kev[i].filter, kev[i].flags, kev[i].fflags,
+              (void *) kev[i].data, kev[i].udata);
+    }
+#endif
+
+  return ret;
+#else
+  (void) kq;
+  (void) nstate;
+  (void) nevents;
+  (void) timeout;
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    fetch_key
+ * Signature: (Ljava/nio/ByteBuffer;)I;
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_fetch_1key (JNIEnv *env,
+                                                 jclass clazz __attribute__((unused)),
+                                                 jobject nstate)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+/*   TRACE("return key %p\n", kev->udata); */
+  return (jint) kev->udata;
+#else
+  (void) nstate;
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    ready_ops
+ * Signature: (Ljava/nio/ByteBuffer;I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_ready_1ops (JNIEnv *env,
+                                                 jclass clazz __attribute__((unused)),
+                                                 jobject nstate, jint interest)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  jint ready = 0;
+
+  /* We poll for READ for OP_READ and OP_ACCEPT. */
+  if (kev->filter == EVFILT_READ)
+    {
+      ready = (interest & KEY_OP_READ) | (interest & KEY_OP_ACCEPT);
+/*       TRACE("filter EVFILT_READ. Ready ops set to %x", ready); */
+    }
+
+  /* Poll for WRITE for OP_WRITE and OP_CONNECT; I guess we *should*
+     get a WRITE event if we are connected, but I don't know if we do
+     for real. FIXME */
+  if (kev->filter == EVFILT_WRITE)
+    {
+      ready = (interest & KEY_OP_WRITE) | (interest & KEY_OP_CONNECT);
+/*       TRACE("filter EVFILT_WRITE. Ready ops set to %x", ready); */
+    }
+
+  return ready;
+#else
+  (void) nstate;
+  (void) interest;
+  throw_not_supported (env);
+  return -1;
+#endif /* HAVE_KQUEUE && HAVE_KEVENT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_KqueueSelectorImpl
+ * Method:    check_eof
+ * Signature: (Ljava/nio/ByteBuffer;)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_KqueueSelectorImpl_check_1eof (JNIEnv *env,
+                                                 jclass clazz __attribute__((unused)),
+                                                 jobject nstate)
+{
+#if defined(HAVE_KQUEUE) && defined(HAVE_KEVENT)
+  struct kevent *kev = (struct kevent *) (*env)->GetDirectBufferAddress (env, nstate);
+  if ((kev->flags & EV_EOF) == EV_EOF)
+    return JNI_TRUE;
+  return JNI_FALSE;
+#else
+  (void) nstate;
+  throw_not_supported (env);
+  return JNI_FALSE;
+#endif
+}
diff --git a/native/jni/java-nio/gnu_java_nio_VMChannel.c b/native/jni/java-nio/gnu_java_nio_VMChannel.c
index 5571bed27..5aabf566b 100644
--- a/native/jni/java-nio/gnu_java_nio_VMChannel.c
+++ b/native/jni/java-nio/gnu_java_nio_VMChannel.c
@@ -36,25 +36,43 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+
+#include <netinet/in.h>
+
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/uio.h>
 #include <string.h>
 
 #include <jni.h>
 #include <jcl.h>
 
 #include "gnu_java_nio_VMChannel.h"
+#include "javanio.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
 
 #define IO_EXCEPTION "java/io/IOException"
+#define INTERRUPTED_IO_EXCEPTION "java/io/InterruptedIOException"
 #define NON_READABLE_CHANNEL_EXCEPTION "java/nio/channels/NonReadableChannelException"
 #define NON_WRITABLE_CHANNEL_EXCEPTION "java/nio/channels/NonWritableChannelException"
+#define SOCKET_TIMEOUT_EXCEPTION "java/net/SocketTimeoutException"
+
+/* Align a value up or down to a multiple of the pagesize. */
+#define ALIGN_DOWN(p,s) ((p) - ((p) % (s)))
+#define ALIGN_UP(p,s) ((p) + ((s) - ((p) % (s))))
 
 /*
  * Limit to maximum of 16 buffers
@@ -66,7 +84,7 @@ extern "C"
 {
 #endif
 
-enum JCL_buffer_type { DIRECT, ARRAY, UNKNOWN };
+enum JCL_buffer_type { DIRECT, HEAP, ARRAY, UNKNOWN };
 
 struct JCL_buffer
 {
@@ -98,6 +116,7 @@ get_method_id(JNIEnv *env,  jclass clazz, const char *name,
 	          const char *sig)
 {
   jmethodID mid = (*env)->GetMethodID(env, clazz, name, sig);
+/*   NIODBG("name: %s; sig: %s", name, sig); */
   if (mid == NULL)
     {
   	  JCL_ThrowException(env, "java/lang/InternalError", name);
@@ -107,18 +126,19 @@ get_method_id(JNIEnv *env,  jclass clazz, const char *name,
   return mid;
 }
 
-void
+inline void
 JCL_print_buffer(JNIEnv *env __attribute__((__unused__)), struct JCL_buffer *buf)
 {
-  fprintf(stdout, "Buffer - type: %d, ptr: %p\n", buf->type, buf->ptr);
-  fflush(stdout);
+  fprintf (stderr, "Buffer - type: %d, ptr: %p\n", buf->type, buf->ptr);
 }
 
 
 int
 JCL_init_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf)
 {
-  jobject address = (*env)->GetObjectField(env, bbuf, address_fid);
+  void *addr = (*env)->GetDirectBufferAddress (env, bbuf);
+
+/*   NIODBG("buf: %p; bbuf: %p; addr: %p", (void *) buf, bbuf, addr); */
   
   buf->position = (*env)->CallIntMethod(env, bbuf, get_position_mid);
   buf->limit = (*env)->CallIntMethod(env, bbuf, get_limit_mid);
@@ -126,11 +146,10 @@ JCL_init_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf)
   buf->count = 0;
   buf->type = UNKNOWN;
     
-  if (address != NULL)
+  if (addr != NULL)
     {
-      buf->ptr = (jbyte *) JCL_GetRawData(env, address);
+      buf->ptr = (jbyte *) addr;
       buf->type = DIRECT;
-      (*env)->DeleteLocalRef(env, address);
     }
   else
     {
@@ -148,7 +167,12 @@ JCL_init_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf)
         }
       else
         {
-          return -1;
+          jobject address = (*env)->GetObjectField (env, bbuf, address_fid);
+          if (address == NULL)
+            return -1; /* XXX handle non-array, non-native buffers? */
+          buf->ptr = (jbyte *) JCL_GetRawData(env, address);
+          buf->type = HEAP;
+          (*env)->DeleteLocalRef(env, address);
         }
     }
       
@@ -160,6 +184,8 @@ JCL_release_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf,
     jint action)
 {
   jbyteArray arr;
+
+/*   NIODBG("buf: %p; bbuf: %p; action: %x", (void *) buf, bbuf, action); */
   
   /* Set the position to the appropriate value */
   if (buf->count > 0)
@@ -173,6 +199,7 @@ JCL_release_buffer(JNIEnv *env, struct JCL_buffer *buf, jobject bbuf,
   switch (buf->type)
     {
     case DIRECT:
+    case HEAP:
       break;
     case ARRAY:
       arr = (*env)->CallObjectMethod(env, bbuf, array_mid);
@@ -194,6 +221,9 @@ JCL_cleanup_buffers(JNIEnv *env,
                     jlong num_bytes)
 {
   jint i;
+
+/*   NIODBG("bi_list: %p; vec_len: %d; bbufs: %p; offset: %d; num_bytes: %lld", */
+/*       (void *) bi_list, vec_len, bbufs, offset, num_bytes); */
   
   /* Update all of the bbufs with the approriate information */
   for (i = 0; i < vec_len; i++)
@@ -217,13 +247,57 @@ JCL_cleanup_buffers(JNIEnv *env,
 }
 
 
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    stdin_fd
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_stdin_1fd (JNIEnv *env __attribute__((unused)),
+                                       jclass c __attribute__((unused)))
+{
+/*   NIODBG("%d", fileno (stdin)); */
+  return fileno (stdin);
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    stdout_fd
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_stdout_1fd (JNIEnv *env __attribute__((unused)),
+                                       jclass c __attribute__((unused)))
+{
+/*   NIODBG("%d", fileno (stdout)); */
+  return fileno (stdout);
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    stderr_fd
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_stderr_1fd (JNIEnv *env __attribute__((unused)),
+                                       jclass c __attribute__((unused)))
+{
+/*   NIODBG("%d", fileno (stderr)); */
+  return fileno (stderr);
+}
+
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_nio_VMChannel_initIDs  (JNIEnv *env, 
 	jclass clazz __attribute__ ((__unused__)))
 {
   jclass bufferClass = JCL_FindClass(env, "java/nio/Buffer");
   jclass byteBufferClass = JCL_FindClass(env, "java/nio/ByteBuffer");
-  
+
+/*   NIODBG("%s", "..."); */
+
   address_fid = (*env)->GetFieldID(env, bufferClass, "address", 
                                    "Lgnu/classpath/Pointer;");
   if (address_fid == NULL)
@@ -252,6 +326,8 @@ Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env,
 {
   int opts;
   
+/*   NIODBG("fd: %d; blocking: %d", fd, blocking); */
+
   opts = fcntl(fd, F_GETFL);
   if (opts < 0)
     {
@@ -260,10 +336,10 @@ Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env,
       return;
     }
   
-  if (blocking)
-    opts |= O_NONBLOCK;
-  else
+  if (blocking == JNI_TRUE)
     opts &= ~(O_NONBLOCK);
+  else
+    opts |= O_NONBLOCK;
   
   opts = fcntl(fd, F_SETFL, opts);
   
@@ -277,14 +353,17 @@ Java_gnu_java_nio_VMChannel_setBlocking (JNIEnv *env,
 
 
 JNIEXPORT jint JNICALL 
-Java_gnu_java_nio_VMChannel_read (JNIEnv *env, 
-	jobject o __attribute__ ((__unused__)), 
-	jint fd, 
-	jobject bbuf)
+Java_gnu_java_nio_VMChannel_read__ILjava_nio_ByteBuffer_2 (JNIEnv *env,
+                                                           jobject o __attribute__ ((__unused__)), 
+                                                           jint fd, 
+                                                           jobject bbuf)
 {
+#ifdef HAVE_READ
   jint len;
   ssize_t result;
   struct JCL_buffer buf;
+
+/*   NIODBG("fd: %d; bbuf: %p", fd, bbuf); */
   
   if (JCL_init_buffer(env, &buf, bbuf) < 0)
     {
@@ -292,14 +371,22 @@ Java_gnu_java_nio_VMChannel_read (JNIEnv *env,
       JCL_ThrowException (env, IO_EXCEPTION, "Buffer initialisation failed");
       return -1;
     }
-  
+
   len = buf.limit - buf.position;
+
+  if (len == 0)
+    {
+      JCL_release_buffer (env, &buf, bbuf, JNI_ABORT);
+      return 0;
+    }
   
-  result = read(fd, &(buf.ptr[buf.position + buf.offset]), len);
-  buf.count = result;
+  result = cpnio_read (fd, &(buf.ptr[buf.position + buf.offset]), len);
   
   if (result == 0)
-    result = -1; /* End Of File */
+    {
+      result = -1;
+      buf.count = 0;
+    }
   else if (result == -1)
     {
       buf.count = 0;
@@ -311,7 +398,13 @@ Java_gnu_java_nio_VMChannel_read (JNIEnv *env,
           JCL_ThrowException (env, NON_READABLE_CHANNEL_EXCEPTION, 
                               strerror(errno));
           return -1;
-        }            
+        }
+      else if (EINTR == errno) /* read interrupted */
+        {
+          JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
+          JCL_ThrowException(env, INTERRUPTED_IO_EXCEPTION, strerror (errno));
+          return -1;
+        }
       else
         {
           JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
@@ -320,21 +413,31 @@ Java_gnu_java_nio_VMChannel_read (JNIEnv *env,
         }
     }
   else 
-    
-  JCL_release_buffer(env, &buf, bbuf, JNI_COMMIT);
+    buf.count = result;
+      
+  JCL_release_buffer(env, &buf, bbuf, 0);
   
   return result;
+#else
+  (void) fd;
+  (void) bbuf;
+  JCL_ThrowException (env, IO_EXCEPTION, "read not supported");
+  return -1;
+#endif /* HAVE_READ */
 }
 
 JNIEXPORT jint JNICALL 
-Java_gnu_java_nio_VMChannel_write (JNIEnv *env, 
-	jobject o __attribute__ ((__unused__)), 
-	jint fd, 
-	jobject bbuf)
+Java_gnu_java_nio_VMChannel_write__ILjava_nio_ByteBuffer_2 (JNIEnv *env, 
+                                                            jobject o __attribute__ ((__unused__)), 
+                                                            jint fd, 
+                                                            jobject bbuf)
 {
+#ifdef HAVE_WRITE
   jint len;
   ssize_t result;
   struct JCL_buffer buf;
+
+/*   NIODBG("fd: %d; bbuf: %p", fd, bbuf); */
   
   if (JCL_init_buffer(env, &buf, bbuf) < 0)
     {
@@ -342,16 +445,24 @@ Java_gnu_java_nio_VMChannel_write (JNIEnv *env,
       JCL_ThrowException (env, IO_EXCEPTION, "Buffer initialisation failed");
       return -1;
     }
-  
+
   len = buf.limit - buf.position;
+
+  if (len == 0)
+    {
+      JCL_release_buffer (env, &buf, bbuf, JNI_ABORT);
+      return 0;
+    }
   
-  result = write(fd, &(buf.ptr[buf.position + buf.offset]), len);
+  result = cpnio_write (fd, &(buf.ptr[buf.position + buf.offset]), len);
   buf.count = result;
-  
+
   if (result == -1)
     {
       if (errno == EAGAIN) /* Non-blocking */
+        {
           result = 0;
+        }
       else
         {
           JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
@@ -362,7 +473,13 @@ Java_gnu_java_nio_VMChannel_write (JNIEnv *env,
     
   JCL_release_buffer(env, &buf, bbuf, JNI_ABORT);
   
-  return result;  
+  return result;
+#else
+  (void) fd;
+  (void) bbuf;
+  JCL_ThrowException (env, IO_EXCEPTION, "write not supported");
+  return -1;
+#endif /* HAVE_WRITE */
 }
 
 
@@ -390,7 +507,10 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
   struct JCL_buffer bi_list[JCL_IOV_MAX];
   ssize_t result;
   jint vec_len = length < JCL_IOV_MAX ? length : JCL_IOV_MAX;
-  jlong bytes_read = 0;      
+  jlong bytes_read = 0;
+
+/*   NIODBG("fd: %d; bbufs: %p; offset: %d; length: %d", */
+/*          fd, bbufs, offset, length); */
   
   /* Build the vector of buffers to read into */
   for (i = 0; i < vec_len; i++)
@@ -401,7 +521,9 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
       buf = &bi_list[i];
       bbuf = (*env)->GetObjectArrayElement(env, bbufs, offset + i);
       
-      JCL_init_buffer(env, buf, bbuf); 
+      JCL_init_buffer(env, buf, bbuf);
+
+/*       JCL_print_buffer (env, buf); */
       
       buffers[i].iov_base = &(buf->ptr[buf->position + buf->offset]);
       buffers[i].iov_len = buf->limit - buf->position;
@@ -409,7 +531,7 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
     }
     
   /* Work the scattering magic */
-  result = readv(fd, buffers, vec_len);
+  result = cpnio_readv (fd, buffers, vec_len);
   bytes_read = (jlong) result;
   
   /* Handle the response */
@@ -442,6 +564,7 @@ Java_gnu_java_nio_VMChannel_readScattering (JNIEnv *env,
   return (jlong) result;
 }
 
+
 /*
  * Implementation of a gathering write.  Will use the appropriate
  * vector based read call (currently readv on Linux).
@@ -468,6 +591,8 @@ Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env,
   jint vec_len = length < JCL_IOV_MAX ? length : JCL_IOV_MAX;
   jlong bytes_written;
   
+/*   NIODBG("fd: %d; bbufs: %p; offset: %d; length: %d", */
+/*          fd, bbufs, offset, length); */
   
   /* Build the vector of buffers to read into */
   for (i = 0; i < vec_len; i++)
@@ -480,13 +605,15 @@ Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env,
       
       JCL_init_buffer(env, buf, bbuf); 
       
+/*       JCL_print_buffer(env, buf); */
+
       buffers[i].iov_base = &(buf->ptr[buf->position + buf->offset]);
       buffers[i].iov_len = buf->limit - buf->position;
       (*env)->DeleteLocalRef(env, bbuf);
     }
     
   /* Work the gathering magic */
-  result = writev(fd, buffers, vec_len);
+  result = cpnio_writev (fd, buffers, vec_len);
   bytes_written = (jlong) result;
 
   if (result < 0)
@@ -518,6 +645,1150 @@ Java_gnu_java_nio_VMChannel_writeGathering (JNIEnv *env,
 }
 
 
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    receive
+ * Signature: (Ljava/nio/ByteBuffer;Ljava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_receive (JNIEnv *env,
+                                     jclass c __attribute__((unused)),
+                                     jint fd, jobject dst, jobject addrPort)
+{
+#ifdef HAVE_RECVFROM
+  char *addrPortPtr = (*env)->GetDirectBufferAddress (env, addrPort);
+  struct JCL_buffer buf;
+#ifdef HAVE_INET6
+  struct sockaddr_in6 sock_storage;
+  struct sockaddr_in6 *sock6;
+  socklen_t slen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in sock_storage;
+  socklen_t slen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+  struct sockaddr *sockaddr = (struct sockaddr *) &sock_storage;
+  struct sockaddr_in *sock4;
+  int ret;
+  jint result = -1;
+
+  if (JCL_init_buffer (env, &buf, dst) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, "loading buffer failed");
+
+  ret = cpnio_recvfrom (fd, &(buf.ptr[buf.position + buf.offset]),
+                        buf.limit - buf.position, MSG_WAITALL,
+                        sockaddr, &slen);
+
+  if (-1 == ret)
+    {
+      JCL_release_buffer (env, &buf, dst, JNI_ABORT);
+      if (EINTR == errno)
+        JCL_ThrowException (env, "java/io/InterruptedIOException", strerror (errno));
+      else if (EAGAIN == errno)
+        {
+          /* If the socket is in blocking mode, our timeout expired. */
+          int val = fcntl (fd, F_GETFL, 0);
+          if (val == -1)
+            JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          else if ((val & O_NONBLOCK) == 0)
+            JCL_ThrowException (env, "java/net/SocketTimeoutException",
+                                "read timed out");
+        }
+      else
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return 0;
+    }
+
+  if (sockaddr->sa_family == AF_INET)
+    {
+      sock4 = (struct sockaddr_in *) sockaddr;
+      memcpy (addrPortPtr, &(sock4->sin_addr.s_addr), 4);
+      ;memcpy (addrPortPtr + 4, &(sock4->sin_port), 2);
+      result = 4;
+    }
+#ifdef HAVE_INET6
+  else if (sockaddr->sa_family == AF_INET6)
+    {
+      sock6 = (struct sockaddr_in6 *) sockaddr;
+      memcpy (addrPortPtr, &(sock6->sin6_addr.s6_addr), 16);
+      memcpy (addrPortPtr + 16, &(sock6->sin6_port), 2);
+      result = 16;
+    }
+#endif /* HAVE_INET6 */
+  else if (ret == 0)
+    {
+      result = 0;
+    }
+  else
+    {
+      JCL_ThrowException (env, "java/net/SocketException",
+                          "unsupported address type returned");
+    }
+
+  buf.count += ret;
+  JCL_release_buffer (env, &buf, dst, 0);
+  return result;
+#else
+  (void) fd;
+  (void) dst;
+  (void) addrPort;
+  JCL_ThrowException (env, IO_EXCEPTION, "recvfrom not supported");
+#endif /* HAVE_RECVFROM */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    send
+ * Signature: (Ljava/nio/ByteBuffer;[BI)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_send (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  int fd, jobject src, jbyteArray addr, jint port)
+{
+#ifdef HAVE_SENDTO
+  struct sockaddr_in sockaddr;
+  jbyte *elems;
+  struct JCL_buffer buf;
+  int ret;
+
+/*   NIODBG("fd: %d; src: %p; addr: %p; port: %d", */
+/*          fd, src, addr, port); */
+
+  if (JCL_init_buffer (env, &buf, src) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, "loading buffer failed");
+      return -1;
+    }
+
+/*   JCL_print_buffer (env, &buf); */
+
+  elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  sockaddr.sin_family = AF_INET;
+  sockaddr.sin_addr.s_addr = *((uint32_t *) elems);
+  sockaddr.sin_port = htons (port);
+
+  do
+    {
+      ret = cpnio_sendto (fd, &(buf.ptr[buf.position + buf.offset]),
+                          buf.limit - buf.position,
+                          0, (const struct sockaddr *) &sockaddr,
+                          sizeof (struct sockaddr_in));
+    }
+  while (-1 == ret && EINTR == errno);
+
+  (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    {
+      if (errno != EAGAIN)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      JCL_release_buffer (env, &buf, src, JNI_ABORT);
+      return 0;
+    }
+
+  buf.count += ret;
+  JCL_release_buffer (env, &buf, src, JNI_ABORT);
+  return ret;
+#else
+  (void) fd;
+  (void) src;
+  (void) addr;
+  (void) port;
+#endif /* HAVE_SENDTO */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    send6
+ * Signature: (Ljava/nio/ByteBuffer;[BI)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_send6 (JNIEnv *env,
+                                   jclass c __attribute__((unused)),
+                                   int fd, jobject src, jbyteArray addr, jint port)
+{
+#if defined(HAVE_SENDTO) && defined(HAVE_INET6)
+  struct sockaddr_in6 sockaddr;
+  jbyte *elems;
+  struct JCL_buffer buf;
+  int ret;
+
+/*   NIODBG("fd: %d; src: %p; addr: %p; port: %d", */
+/*          fd, src, addr, port); */
+
+  if (JCL_init_buffer (env, &buf, src) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, "loading buffer failed");
+      return -1;
+    }
+
+/*   JCL_print_buffer (env, &buf); */
+
+  elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  sockaddr.sin6_family = AF_INET6;
+  memcpy (&sockaddr.sin6_addr.s6_addr, elems, 16);
+  sockaddr.sin6_port = htons (port);
+
+  do
+    {
+      ret = cpnio_sendto (fd, (const void *) (buf.ptr + buf.offset),
+                          buf.limit - buf.position,
+                          0, (const struct sockaddr *) &sockaddr,
+                          sizeof (struct sockaddr_in6));
+    }
+  while (-1 == ret && EINTR == errno);
+
+  (*env)->ReleaseByteArrayElements (env, addr, elems, JNI_ABORT);
+
+  if (-1 == ret)
+    {
+      if (errno != EAGAIN)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      JCL_release_buffer (env, &buf, src, JNI_ABORT);
+      return 0;
+    }
+
+  buf.count += ret;
+  JCL_release_buffer (env, &buf, src, JNI_ABORT);
+  return ret;
+#else
+  (void) fd;
+  (void) src;
+  (void) addr;
+  (void) port;
+  JCL_ThrowException (env, IO_EXCEPTION, "IPv6 sendto not supported");
+  return -1;
+#endif /* HAVE_SENDTO && HAVE_INET6 */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    read
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_read__I (JNIEnv *env,
+                                     jclass c __attribute__((unused)),
+                                     jint fd)
+{
+#ifdef HAVE_READ
+  char in;
+  int ret;
+
+/*   NIODBG("fd: %d", fd); */
+
+  ret = cpnio_read (fd, &in, 1);
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+  if (0 == ret)
+    return -1;
+
+  return (in & 0xFF);
+#else
+  (void) fd;
+  JCL_ThrowException (env, IO_EXCEPTION, "read not supported");
+#endif /* HAVE_READ */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    write
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_write__II (JNIEnv *env,
+                                       jclass c __attribute__((unused)),
+                                       jint fd, jint data)
+{
+#ifdef HAVE_WRITE
+  char out = (char) data;
+  int ret;
+
+/*   NIODBG("fd: %d; data: %d", fd, data); */
+
+  ret = cpnio_write (fd, &out, 1);
+
+  if (-1 == ret)
+    JCL_ThrowException(env, IO_EXCEPTION, strerror (errno));
+#else
+  (void) fd;
+  (void) data;
+  JCL_ThrowException (env, IO_EXCEPTION, "write not supported");
+#endif /* HAVE_WRITE */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    socket
+ * Signature: (Z)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_socket (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                    jboolean stream)
+{
+#ifdef HAVE_SOCKET
+  int ret;
+
+  do
+    {
+      ret = cpnio_socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0);
+    }
+  while (-1 == ret && EINTR == errno);
+
+  if (ret == -1)
+    JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+/*   NIODBG("created socket %d", ret); */
+
+  return ret;
+#else
+  (void) stream;
+  JCL_ThrowException (env, IO_EXCEPTION, "socket not supported");
+  return -1;
+#endif /* HAVE_SOCKET */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    connect
+ * Signature: (I[BI)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_connect (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                     jint fd, jbyteArray addr, jint port, jint timeout)
+{
+#ifdef HAVE_CONNECT
+  struct sockaddr_in sockaddr;
+  struct timeval timeo;
+  int origflags = 0, flags;
+  jbyte *addr_elems;
+  int ret;
+
+  if ((*env)->GetArrayLength (env, addr) != 4)
+    {
+      JCL_ThrowException (env, "java/io/IOException", "expecting 4-byte address");
+      return JNI_FALSE;
+    }
+
+  if (timeout > 0)
+    {
+      timeo.tv_sec = timeout / 1000;
+      timeo.tv_usec = (timeout % 1000) * 1000;
+      origflags = fcntl (fd, F_GETFL, 0);
+      if (origflags == -1)
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+      /* Set nonblocking mode, if not already set. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          flags = origflags | O_NONBLOCK;
+          if (fcntl (fd, F_SETFL, flags) == -1)
+            {
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+    }
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset (&sockaddr, 0, sizeof (struct sockaddr_in));
+  sockaddr.sin_family = AF_INET;
+  sockaddr.sin_port = htons (port);
+  sockaddr.sin_addr.s_addr = *((uint32_t *) addr_elems);
+
+
+  ret = cpnio_connect (fd, (struct sockaddr *) &sockaddr,
+                       sizeof (struct sockaddr_in));
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  /* If a timeout was specified, select on the file descriptor with
+     the timeout. */
+  if (timeout > 0 && ret == -1)
+    {
+      /* Reset the non-blocking flag, if needed. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          if (fcntl (fd, F_SETFL, origflags) == -1)
+            {
+              /* oops */
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+      if (EINPROGRESS == errno)
+        {
+          fd_set wrfds;
+          FD_SET(fd, &wrfds);
+          ret = cpnio_select (fd + 1, NULL, &wrfds, NULL, &timeo);
+          if (ret == -1)
+            {
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+          if (ret == 0) /* connect timed out */
+            {
+              JCL_ThrowException (env, SOCKET_TIMEOUT_EXCEPTION,
+                                  "connect timed out");
+              return JNI_FALSE;
+            }
+          return JNI_TRUE; /* Connected! */
+        }
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, "java/net/ConnectException",
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  if (ret == -1)
+    {
+      if (EINPROGRESS == errno)
+        return JNI_FALSE;
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, "java/net/ConnectException",
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  return JNI_TRUE;
+#else
+  (void) fd;
+  (void) addr;
+  (void) port;
+  (void) timeout;
+  JCL_ThrowException (env, IO_EXCEPTION, "connect not supported");
+  return JNI_FALSE;
+#endif /* HAVE_CONNECT */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    connect6
+ * Signature: (I[BI)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_connect6 (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                      jint fd, jbyteArray addr, jint port, int timeout)
+{
+#if defined(HAVE_CONNECT) && defined(HAVE_INET6)
+  struct sockaddr_in6 sockaddr;
+  struct timeval timeo;
+  int flags, origflags = 0;
+  jbyte *addr_elems;
+  int ret;
+
+  if (timeout > 0)
+    {
+      timeo.tv_sec = timeout / 1000;
+      timeo.tv_usec = (timeout % 1000) * 1000;
+      origflags = fcntl (fd, F_GETFL, 0);
+      if (origflags == -1)
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+      /* Set nonblocking mode, if not already set. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          flags = origflags | O_NONBLOCK;
+          if (fcntl (fd, F_SETFL, flags) == -1)
+            {
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+    }
+
+  addr_elems = (*env)->GetByteArrayElements (env, addr, NULL);
+
+  memset (&sockaddr, 0, sizeof (struct sockaddr_in6));
+  sockaddr.sin6_family = AF_INET6;
+  sockaddr.sin6_port = htons (port);
+  memcpy (&sockaddr.sin6_addr.s6_addr, addr_elems, 16);
+
+  ret = cpnio_connect (fd, (struct sockaddr *) &sockaddr,
+                       sizeof (struct sockaddr_in6));
+
+  (*env)->ReleaseByteArrayElements (env, addr, addr_elems, JNI_ABORT);
+
+  /* If a timeout was specified, select on the file descriptor with
+     the timeout. */
+  if (timeout > 0 && ret == -1)
+    {
+      /* Reset the non-blocking flag, if needed. */
+      if (!(origflags & O_NONBLOCK))
+        {
+          if (fcntl (fd, F_SETFL, origflags) == -1)
+            {
+              /* oops */
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+        }
+      if (EINPROGRESS == errno)
+        {
+          fd_set wrfds;
+          FD_SET(fd, &wrfds);
+          ret = cpnio_select (fd + 1, NULL, &wrfds, NULL, &timeo);
+          if (ret == -1)
+            {
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return JNI_FALSE;
+            }
+          if (ret == 0) /* connect timed out */
+            {
+              JCL_ThrowException (env, SOCKET_TIMEOUT_EXCEPTION,
+                                  "connect timed out");
+              return JNI_FALSE;
+            }
+          return JNI_TRUE; /* Connected! */
+        }
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, "java/net/ConnectException",
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  if (ret == -1)
+    {
+      if (EAGAIN == errno)
+        return JNI_FALSE;
+      else if (ECONNREFUSED == errno)
+        {
+          JCL_ThrowException (env, "java/net/ConnectException",
+                              strerror (errno));
+          return JNI_FALSE;
+        }
+      else
+        {
+          JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+          return JNI_FALSE;
+        }
+    }
+
+  return JNI_TRUE;
+#else
+  (void) fd;
+  (void) addr;
+  (void) port;
+  (void) timeout;
+  JCL_ThrowException (env, IO_EXCEPTION, "IPv6 connect not supported");
+  return JNI_FALSE;
+#endif /* HAVE_CONNECT && HAVE_INET6 */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    getsockname
+ * Signature: (ILjava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_getsockname (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                         jint fd, jobject name)
+{
+#ifdef HAVE_GETSOCKNAME
+#ifdef HAVE_INET6
+  struct sockaddr_in6 *addr6;
+  struct sockaddr_in6 sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+
+  struct sockaddr *sockaddr = (struct sockaddr *) &sock_storage;
+  struct sockaddr_in *addr4;
+  int ret;
+  char *nameptr = (*env)->GetDirectBufferAddress (env, name);
+
+  ret = getsockname (fd, sockaddr, &socklen);
+  if (ret == -1)
+    {
+      JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+      return 0;
+    }
+
+  if (sockaddr->sa_family == AF_INET)
+    {
+      addr4 = (struct sockaddr_in *) sockaddr;
+      memcpy (nameptr, &(addr4->sin_addr.s_addr), 4);
+      memcpy (nameptr + 4, &(addr4->sin_port), 2);
+      return 4;
+    }
+
+#ifdef HAVE_INET6
+  /* IPv6 */
+  if (sockaddr->sa_family == AF_INET6)
+    {
+      addr6 = (struct sockaddr_in6 *) sockaddr;
+      memcpy (nameptr, &(addr6->sin6_addr.s6_addr), 16);
+      memcpy (nameptr, &(addr6->sin6_port), 2);
+      return 16;
+    }
+#endif /* HAVE_INET6 */
+  JCL_ThrowException (env, IO_EXCEPTION, "unsupported address format");
+  return -1;
+#else
+  (void) fd;
+  (void) name;
+  JCL_ThrowException (env, IO_EXCEPTION, "getsockname not supported");
+  return -1;
+#endif /* HAVE_GETSOCKNAME */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    getpeername
+ * Signature: (ILjava/nio/ByteBuffer;)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_getpeername (JNIEnv *env, jclass clazz __attribute__((unused)),
+                                         jint fd, jobject name)
+{
+#ifdef HAVE_GETPEERNAME
+#ifdef HAVE_INET6
+  struct sockaddr_in6 *addr6;
+  struct sockaddr_in6 sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in sock_storage;
+  socklen_t socklen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+
+  struct sockaddr *sockaddr = (struct sockaddr *) &sock_storage;
+  struct sockaddr_in *addr4;
+  int ret;
+  char *nameptr = (*env)->GetDirectBufferAddress (env, name);
+  
+  ret = getpeername (fd, sockaddr, &socklen);
+  if (ret == -1)
+    {
+      if (ENOTCONN != errno)
+        JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+      return 0;
+    }
+
+  if (sockaddr->sa_family == AF_INET)
+    {
+      addr4 = (struct sockaddr_in *) sockaddr;
+      memcpy (nameptr, &(addr4->sin_addr.s_addr), 4);
+      memcpy (nameptr + 4, &(addr4->sin_port), 2);
+      return 4;
+    }
+#ifdef HAVE_INET6
+  else if (sockaddr->sa_family == AF_INET6)
+    {
+      addr6 = (struct sockaddr_in6 *) sockaddr;
+      memcpy (nameptr, &(addr6->sin6_addr.s6_addr), 16);
+      memcpy (nameptr, &(addr6->sin6_port), 2);
+      return 16;
+    }
+#endif /* HAVE_INET6 */
+
+  JCL_ThrowException (env, "java/net/SocketException",
+                      "unsupported address type");
+  return -1;
+#else
+  (void) fd;
+  (void) name;
+  JCL_ThrowException (env, IO_EXCEPTION, "getpeername not supported");
+  return -1;
+#endif /* HAVE_GETPEERNAME */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    accept
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_accept (JNIEnv *env,
+                                    jclass clazz __attribute__((unused)),
+                                    jint fd)
+{
+#ifdef HAVE_ACCEPT
+  int ret;
+
+#ifdef HAVE_INET6
+  struct sockaddr_in6 addr;
+  socklen_t alen = sizeof (struct sockaddr_in6);
+#else
+  struct sockaddr_in addr;
+  socklen_t alen = sizeof (struct sockaddr_in);
+#endif /* HAVE_INET6 */
+
+  do
+    {
+      ret = cpnio_accept (fd, (struct sockaddr *) &addr, &alen);
+    }
+  while (ret == -1 && EINTR == errno);
+
+  if (ret == -1)
+    {
+      if (EWOULDBLOCK != ret && EAGAIN != ret)
+        JCL_ThrowException (env, "java/net/SocketException", strerror (errno));
+    }
+
+  return ret;
+#else
+  (void) fd;
+  JCL_ThrowException (env, IO_EXCEPTION, "accept not supported");
+  return -1;
+#endif /* HAVE_ACCEPT */
+}
+
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    disconnect
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_disconnect (JNIEnv *env,
+                                        jclass c __attribute__((unused)),
+                                        jint fd)
+{
+  struct sockaddr sockaddr;
+
+  sockaddr.sa_family = AF_UNSPEC;
+  if (connect (fd, &sockaddr, sizeof (struct sockaddr)) == -1)
+    {
+      /* The expected error for a successful disconnect is EAFNOSUPPORT. */
+      if (errno != EAFNOSUPPORT)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    close
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_close (JNIEnv *env,
+                                   jclass c __attribute__((unused)),
+                                   jint fd)
+{
+  if (close (fd) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    available
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_available (JNIEnv *env,
+                                       jclass c __attribute__((unused)),
+                                       jint fd)
+{
+  jint avail = 0;
+
+/*   NIODBG("fd: %d", fd); */
+  if (ioctl (fd, FIONREAD, &avail) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+/*   NIODBG("avail: %d", avail); */
+
+  return avail;
+}
+
+
+enum FileChannel_mode {
+  CPNIO_READ   = 1,
+  CPNIO_WRITE  = 2,
+  CPNIO_APPEND = 4,
+  CPNIO_EXCL   = 8,
+  CPNIO_SYNC   = 16,
+  CPNIO_DSYNC  = 32
+};
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    open
+ * Signature: (Ljava/lang/String;I)I
+ */
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_VMChannel_open (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jstring path, jint mode)
+{
+  int nmode = 0;
+  int ret;
+  const char *npath;
+  mode_t mask = umask (0);
+  umask (mask);
+
+  if ((mode & CPNIO_READ) && (mode & CPNIO_WRITE))
+    nmode = O_RDWR;
+  else if (mode & CPNIO_WRITE)
+    nmode = O_WRONLY;
+  else
+    nmode = O_RDONLY;
+
+  nmode = (nmode
+           | ((nmode == O_RDWR || nmode == O_WRONLY) ? O_CREAT : 0)
+           | ((mode & CPNIO_APPEND) ? O_APPEND :
+              ((nmode == O_RDWR || nmode == O_WRONLY) ? O_TRUNC : 0))
+           | ((mode & CPNIO_EXCL) ? O_EXCL : 0)
+           | ((mode & CPNIO_SYNC) ? O_SYNC : 0));
+
+  npath = JCL_jstring_to_cstring (env, path);
+
+/*   NIODBG("path: %s; mode: %x", npath, nmode); */
+
+  ret = open (npath, nmode, 0777 & ~mask);
+
+/*   NIODBG("ret: %d\n", ret); */
+
+  JCL_free_cstring (env, path, npath);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  return ret;
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    position
+ * Signature: (I)J
+ */
+JNIEXPORT jlong JNICALL
+Java_gnu_java_nio_VMChannel_position (JNIEnv *env,
+                                      jclass c __attribute__((unused)),
+                                      jint fd)
+{
+#ifdef HAVE_LSEEK
+  off_t ret;
+
+  ret = lseek (fd, 0, SEEK_CUR);
+
+  if (-1 == ret)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  return (jlong) ret;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "position not supported");
+  return -1;
+#endif /* HAVE_LSEEK */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    seek
+ * Signature: (IJ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_seek (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jint fd, jlong pos)
+{
+#ifdef HAVE_LSEEK
+  if (lseek (fd, (off_t) pos, SEEK_SET) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "seek not supported");
+#endif /* HAVE_LSEEK */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    truncate
+ * Signature: (IJ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_truncate (JNIEnv *env,
+                                      jclass c __attribute__((unused)),
+                                      jint fd, jlong len)
+{
+#if defined(HAVE_FTRUNCATE) && defined(HAVE_LSEEK)
+  off_t pos = lseek (fd, 0, SEEK_CUR);
+  if (pos == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return;
+    }
+  if (ftruncate (fd, (off_t) len) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return;
+    }
+  if (pos > len)
+    {
+      if (lseek (fd, len, SEEK_SET) == -1)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "truncate not supported");
+#endif /* HAVE_FTRUNCATE && HAVE_LSEEK */
+}
+
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    lock
+ * Signature: (IJJZZ)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_lock (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jint fd, jlong pos, jlong len,
+                                  jboolean shared, jboolean wait)
+{
+#if HAVE_FCNTL
+  struct flock fl;
+
+  fl.l_start  = (off_t) pos;
+  fl.l_len    = (off_t) len;
+  fl.l_pid    = getpid ();
+  fl.l_type   = (shared ? F_RDLCK : F_WRLCK);
+  fl.l_whence = SEEK_SET;
+
+  if (cpnio_fcntl (fd, (wait ? F_SETLKW : F_SETLK), (int) &fl) == -1)
+    {
+      if (errno != EAGAIN)
+        JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return JNI_FALSE;
+    }
+
+  return JNI_TRUE;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "lock not supported");
+  return JNI_FALSE;
+#endif /* HAVE_FCNTL */
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    unlock
+ * Signature: (IJJ)V
+ */
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMChannel_unlock (JNIEnv *env,
+                                    jclass c __attribute__((unused)),
+                                    jint fd, jlong pos, jlong len)
+{
+#if HAVE_FCNTL
+  struct flock fl;
+
+  fl.l_start  = (off_t) pos;
+  fl.l_len    = (off_t) len;
+  fl.l_pid    = getpid ();
+  fl.l_type   = F_UNLCK;
+  fl.l_whence = SEEK_SET;
+
+  if (cpnio_fcntl (fd, F_SETLK, (int) &fl) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+    }
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "unlock not supported");
+#endif /* HAVE_FCNTL */
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    size
+ * Signature: (I)J
+ */
+JNIEXPORT jlong JNICALL
+Java_gnu_java_nio_VMChannel_size (JNIEnv *env,
+                                  jclass c __attribute__((unused)),
+                                  jint fd)
+{
+#ifdef HAVE_FSTAT
+  struct stat st;
+
+  if (fstat (fd, &st) == -1)
+    JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+
+  return (jlong) st.st_size;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "size not supported");
+  return 0;
+#endif
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    map
+ * Signature: (ICJI)Lgnu/classpath/Pointer;
+ */
+JNIEXPORT jobject JNICALL
+Java_gnu_java_nio_VMChannel_map (JNIEnv *env,
+                                 jclass clazz __attribute__((unused)),
+                                 jint fd, jchar mode, jlong position, jint size)
+{
+#ifdef HAVE_MMAP
+  jclass MappedByteBufferImpl_class;
+  jmethodID MappedByteBufferImpl_init = NULL;
+  jobject Pointer_instance;
+  volatile jobject buffer;
+  long pagesize;
+  int prot, flags;
+  void *p;
+  void *address;
+
+/*   NIODBG("fd: %d; mode: %x; position: %lld; size: %d", */
+/*          fd, mode, position, size); */
+
+  /* FIXME: should we just assume we're on an OS modern enough to
+     have 'sysconf'? And not check for 'getpagesize'? */
+#if defined(HAVE_GETPAGESIZE)
+  pagesize = getpagesize ();
+#elif defined(HAVE_SYSCONF)
+  pagesize = sysconf (_SC_PAGESIZE);
+#else
+  JCL_ThrowException (env, IO_EXCEPTION,
+		      "can't determine memory page size");
+  return NULL;
+#endif /* HAVE_GETPAGESIZE/HAVE_SYSCONF */
+
+  if ((*env)->ExceptionOccurred (env))
+    {
+      return NULL;
+    }
+
+  prot = PROT_READ;
+  if (mode == '+' || mode == 'c')
+    {
+      /* When writing we need to make sure the file is big enough,
+         otherwise the result of mmap is undefined. */
+      struct stat st;
+      if (fstat (fd, &st) == -1)
+        {
+          JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+          return NULL;
+        }
+      if (position + size > st.st_size)
+        {
+          if (ftruncate(fd, position + size) == -1)
+            {
+              JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+              return NULL;
+            }
+        }
+      prot |= PROT_WRITE;
+    }
+
+  flags = (mode == 'c' ? MAP_PRIVATE : MAP_SHARED);
+  p = mmap (NULL, (size_t) ALIGN_UP (size, pagesize), prot, flags,
+	    fd, ALIGN_DOWN (position, pagesize));
+  if (p == MAP_FAILED)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return NULL;
+    }
+
+  /* Unalign the mapped value back up, since we aligned offset
+     down to a multiple of the page size. */
+  address = (void *) ((char *) p + (position % pagesize));
+
+  Pointer_instance = JCL_NewRawDataObject(env, address);
+
+  MappedByteBufferImpl_class = (*env)->FindClass (env,
+						  "java/nio/MappedByteBufferImpl");
+  if (MappedByteBufferImpl_class != NULL)
+    {
+      MappedByteBufferImpl_init =
+	(*env)->GetMethodID (env, MappedByteBufferImpl_class,
+			     "<init>", "(Lgnu/classpath/Pointer;IZ)V");
+    }
+
+  if ((*env)->ExceptionOccurred (env))
+    {
+      munmap (p, ALIGN_UP (size, pagesize));
+      return NULL;
+    }
+  if (MappedByteBufferImpl_init == NULL)
+    {
+      JCL_ThrowException (env, "java/lang/InternalError",
+                          "could not get MappedByteBufferImpl constructor");
+      munmap (p, ALIGN_UP (size, pagesize));
+      return NULL;
+    }
+
+  buffer = (*env)->NewObject (env, MappedByteBufferImpl_class,
+                              MappedByteBufferImpl_init, Pointer_instance,
+                              (jint) size, mode == 'r');
+  return buffer;
+#else
+  (void) fd;
+  (void) mode;
+  (void) position;
+  (void) size;
+  JCL_ThrowException (env, IO_EXCEPTION,
+		      "memory-mapped files not implemented");
+  return 0;
+#endif /* HAVE_MMAP */
+}
+
+/*
+ * Class:     gnu_java_nio_VMChannel
+ * Method:    flush
+ * Signature: (IZ)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_gnu_java_nio_VMChannel_flush (JNIEnv *env,
+                                   jclass c __attribute__((unused)),
+                                   jint fd, jboolean metadata __attribute__((unused)))
+{
+#ifdef HAVE_FSYNC
+  /* XXX blocking? */
+  if (fsync (fd) == -1)
+    {
+      JCL_ThrowException (env, IO_EXCEPTION, strerror (errno));
+      return JNI_FALSE;
+    }
+  return JNI_TRUE;
+#else
+  JCL_ThrowException (env, IO_EXCEPTION, "flush not implemented");
+  return JNI_TRUE;
+#endif /* HAVE_FSYNC */
+}
 
 
 #ifdef __cplusplus
diff --git a/native/jni/java-nio/gnu_java_nio_VMPipe.c b/native/jni/java-nio/gnu_java_nio_VMPipe.c
index 369c5a3d6..cbaaa0834 100644
--- a/native/jni/java-nio/gnu_java_nio_VMPipe.c
+++ b/native/jni/java-nio/gnu_java_nio_VMPipe.c
@@ -35,8 +35,14 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif /* HAVE_CONFIG_H */
+
 #include <errno.h>
+#include <string.h>
+#include <unistd.h>
 
 #include <jni.h>
 #include <jcl.h>
@@ -45,12 +51,33 @@ exception statement from your version. */
 
 #define IO_EXCEPTION "java/io/IOException"
 
-JNIEXPORT void JNICALL
-Java_gnu_java_nio_VMPipe_init (JNIEnv * env,
-			       jclass cls __attribute__ ((__unused__)),
-			       jobject self __attribute__ ((__unused__)),
-			       jobject provider __attribute__ ((__unused__)))
+/*
+ * Class:     gnu_java_nio_VMPipe
+ * Method:    pipe0
+ * Signature: ()[I
+ */
+JNIEXPORT jintArray JNICALL
+Java_gnu_java_nio_VMPipe_pipe0 (JNIEnv *env,
+                                jclass c __attribute__((unused)))
 {
-  JCL_ThrowException (env, IO_EXCEPTION,
-		      "gnu.java.nio.VMPipe.init(): not implemented");
+  int fd[2];
+  jintArray array;
+  jint* elem;
+  int ret;
+
+  /* FIXME: autoconf this? */
+  ret = pipe (fd);
+
+  if (ret == -1)
+    {
+      JCL_ThrowException (env, "java/io/IOException", strerror (errno));
+      return NULL;
+    }
+
+  array = (*env)->NewIntArray (env, 2);
+  elem = (*env)->GetIntArrayElements (env, array, NULL);
+  elem[0] = fd[0];
+  elem[1] = fd[1];
+  (*env)->ReleaseIntArrayElements (env, array, elem, 0);
+  return array;
 }
diff --git a/native/jni/java-nio/javanio.c b/native/jni/java-nio/javanio.c
new file mode 100644
index 000000000..4fe6e908a
--- /dev/null
+++ b/native/jni/java-nio/javanio.c
@@ -0,0 +1,122 @@
+/* javanio.c -- implementations of functions in javanio.h.
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+/*
+ * Note, because these functions are trivial, and should be inlined,
+ * we include this file in the header, and do not compile it.
+ */
+
+#include <sys/types.h>
+#include <sys/fcntl.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <unistd.h>
+
+extern inline ssize_t
+cpnio_read (int fd, void *buf, size_t nbytes)
+{
+  return read (fd, buf, nbytes);
+}
+
+extern inline ssize_t
+cpnio_readv (int fd, const struct iovec *iov, int iovcnt)
+{
+  return readv (fd, iov, iovcnt);
+}
+
+extern inline ssize_t
+cpnio_write (int fd, const void *buf, size_t nbytes)
+{
+  return write (fd, buf, nbytes);
+}
+
+extern inline ssize_t
+cpnio_writev (int fd, const struct iovec *iov, size_t iovcnt)
+{
+  return writev (fd, iov, iovcnt);
+}
+
+extern inline int
+cpnio_socket (int domain, int type, int protocol)
+{
+  return socket (domain, type, protocol);
+}
+
+extern inline int
+cpnio_connect (int fd, const struct sockaddr *addr, socklen_t addrlen)
+{
+  return connect (fd, addr, addrlen);
+}
+
+extern inline int
+cpnio_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
+{
+  return accept (fd, addr, addrlen);
+}
+
+extern inline ssize_t
+cpnio_sendto (int fd, const void *msg, size_t len, int flags,
+              const struct sockaddr *to, socklen_t tolen)
+{
+  return sendto (fd, msg, len, flags, to, tolen);
+}
+
+extern inline ssize_t
+cpnio_recvfrom (int fd, void *buf, size_t len, int flags,
+                struct sockaddr *from, socklen_t *fromlen)
+{
+  return recvfrom (fd, buf, len, flags, from, fromlen);
+}
+
+extern inline int
+cpnio_fcntl (int fd, int cmd, int arg)
+{
+#ifdef HAVE_FCNTL
+  return fcntl (fd, cmd, arg);
+#else
+  errno = ENOSUP;
+  return -1;
+#endif /* HAVE_FCNTL */
+}
+
+extern inline int
+cpnio_select (int nfds, fd_set *readfds, fd_set *writefds,
+              fd_set *excepfds, struct timeval *timeo)
+{
+  return select (nfds, readfds, writefds, excepfds, timeo);
+}
diff --git a/native/jni/java-nio/javanio.h b/native/jni/java-nio/javanio.h
new file mode 100644
index 000000000..16929b0d0
--- /dev/null
+++ b/native/jni/java-nio/javanio.h
@@ -0,0 +1,332 @@
+/* javanio.h -- reference implementation of native functions.
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is a part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
+USA
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
+
+
+#ifndef __JAVANIO_H__
+#define __JAVANIO_H__
+
+/**
+ * This header defines functions that are called by our JNI reference
+ * implementation of java.nio.*. In our reference implementation, these
+ * functions map exactly to their counterparts in POSIX; in implementations
+ * that can't use these functions directly (such as systems that use user-land
+ * threads, and thus can't call blocking system calls directly) can provide
+ * their own implementations suitable for their system.
+ */
+
+/**
+ * This macro is used in all function prototypes below; if any additional
+ * keywords need to be added to a prototype, declare them in this macro.
+ */
+#define CPNIO_EXPORT extern inline
+
+/**
+ * Read bytes from the given file descriptor into the given memory address, which
+ * has sufficient space for NBYTES bytes.
+ *
+ * \param fd     The file descriptor to read from.
+ * \param buf    The memory address to read bytes into.
+ * \param nbytes The number of bytes available to store in BUF.
+ * \return The number of bytes read, possibly zero, on success; return -1 on failure,
+ *  and set ERRNO to an appropriate value.
+ * \see read(2)
+ *
+ * Allowed errno values:
+ *   [EBADF]   If FD is not a valid file descriptor, or is not open for reading.
+ *   [EFAULT]  If BUF points outside the process's address space.
+ *   [EIO]     An I/O error occurrs.
+ *   [EINTR]   If the read is interrupted by a signal.
+ *   [EINVAL]  If FD is negative.
+ *   [EAGAIN]  If FD was marked for non-blocking I/O, and no data were ready to
+ *             be read.
+ */
+CPNIO_EXPORT ssize_t cpnio_read (int fd, void *buf, size_t nbytes);
+
+/*
+ * Read bytes from a file descriptor into a sequence of IO buffers.
+ *
+ * The iovec structure is defined as:
+ *
+ *   struct iovec {
+ *     char   *iov_base;
+ *     size_t  iov_len;
+ *   };
+ *
+ * The call to _cp_readv should do a scattering read, where for each struct iovec
+ * in the supplied list, up to IOV_LEN bytes are read into IOV_BASE. The function
+ * returns the total number of bytes read into all supplied buffers.
+ *
+ * \param fd     The file descriptor.
+ * \param iov    A pointer to the head of a list of iovec structures.
+ * \param iovcnt The number of iovec structures pointed to by IOV.
+ * \return The total number of bytes read accross all buffers, possibly zero. On
+ *  error, -1 is returned and ERRNO is set.
+ * \see readv(2)
+ *
+ * Allowed ERRNO values include all of those listed for _cp_read, as well as the
+ * following:
+ *   [EINVAL] If IOVCNT overflows the maximum number of iovec structures
+ *            this platform supports (usually 16), if any IOV_LEN value
+ *            is negative, or if the sum of all IOV_LEN values is too
+ *            large to be stored in a ssize_t (usually a 32-bit integer).
+ *   [EFAULT] If part of IOV points outside the process's address space.
+ */
+CPNIO_EXPORT ssize_t cpnio_readv (int fd, const struct iovec *iov, int iovcnt);
+
+/*
+ * Write NBYTES bytes from BUF to the file descriptor FD, returning the number
+ * of bytes successfully written.
+ *
+ * \param fd     The file descriptor.
+ * \param buf    A pointer to the bytes to write.
+ * \param nbytes The maximum number of bytes to write.
+ * \return The number of bytes written to the file descriptor, possibly zero. -1
+ *  is returned if an error is encountered, and ERRNO will be set.
+ * \see write(2)
+ *
+ * Allowed ERRNO values:
+ *   [EBADF]   If FD is not a valid file descriptor or is not open for writing.
+ *   [EPIPE]   If FD is a pipe, when the other side is disconnected; if FD is a
+ *             socket, when the peer is not connected.
+ *   [EFBIG]   When FD is a file, and writing to it overflows the process's
+ *             or the system's maximim file size.
+ *   [EFAULT]  If the buffer to write points outside the process's address
+ *             space.
+ *   [EINVAL]  If the descriptor FD is negative.
+ *   [ENOSPC]  If FD is a file, and there is insufficient space on the
+ *             filesystem.
+ *   [EDQUOT]  If FD is a file, and the user's disk quota has been exceeded.
+ *   [EIO]     If an I/O error occurs.
+ *   [EINTR]   If the call is interrupted by a signal.
+ *   [EAGAIN]  If FD is in non-blocking mode, and no bytes could be immediately
+ *             written.
+ */
+CPNIO_EXPORT ssize_t cpnio_write (int fd, const void *buf, size_t nbytes);
+
+/*
+ * Write data from a sequence of IOVCNT buffers IOV to a file descriptor FD.
+ *
+ * \param fd     The file descriptor.
+ * \param iov    The list of buffers to write.
+ * \param iovcnt The number of iovec structures pointed to by IOV.
+ * \return The total number of bytes written from the given buffers, possibly
+ *   zero. -1 if an error occurs, and ERRNO will be set.
+ * \see writev(2)
+ *
+ * Allowed ERRNO values include those mentioned in _cp_write, as well as:
+ *  [EDESTADDRREQ]  If the descriptor is a datagram socket, and the peer is
+ *                  no longer available.
+ *  [EINVAL]        If IOVCNT is out of range, if any IOV_LEN value is
+ *                  negative, or if the sum of all IOVCNT IOV_LEN values
+ *                  will overflow a ssize_t.
+ *  [ENOBUFS]       If the mbuf pool is exhausted (???).
+ */
+CPNIO_EXPORT ssize_t cpnio_writev (int fd, const struct iovec *iov, size_t iovcnt);
+
+/**
+ * Open a new, unbound and unconnected socket.
+ *
+ * \param domain The socket domain. Implementations need only handle AF_INET.
+ * \param type   The socket type; implementations need only handle types
+ *  SOCK_STREAM (for streaming sockets) and SOCK_DGRAM (for datagram sockets).
+ * \param protocol This should always be 0. It can be ignored.
+ * \return A new file descriptor pointing to a newly created socket, or -1 on
+ *  error, and ERRNO set.
+ *
+ * Allowed ERRNO values:
+ *  [EPROTONOSUPPORT]  If TYPE is unrecognized.
+ *  [EMFILE]           If a new file descriptor cannot be allocated, because
+ *                     the process's descriptor table is full.
+ *  [ENFILE]           Likewise, but when the system table is full.
+ *  [EACCES]           If this operation is not allowed.
+ *  [ENOBUFS]          If there is not enough buffer space available for the
+ *                     new socket.
+ */
+CPNIO_EXPORT int cpnio_socket (int domain, int type, int protocol);
+
+/**
+ * Connect a socket to a remote address.
+ *
+ * \param fd      The file descriptor of the socket to connect.
+ * \param addr    The address to connect to. In practice, this should be
+ *                either a `struct sockaddr_in' or a `struct sockaddr_in6'.
+ * \param addrlen The size of the address structure passed by ADDR.
+ * \return Zero if the connect succeeds. -1 on error, and ERRNO should be set.
+ *
+ * Allowed ERRNO values:
+ *  [EBADF]         If FD is not a valid file descriptor.
+ *  [ENOTSOCK]      If FD is not a socket descriptor.
+ *  [EADDRNOTAVAIL] If ADDR is not available for use to this process.
+ *  [EAFNOSUPPORT]  If the address family of ADDR is not supported.
+ *  [EISCONN]       If the socket is already connected.
+ *  [ETIMEDOUT]     If the connection could not be made in a reasonable
+ *                  amount of time.
+ *  [ECONNREFUSED]  If the connection attempt was rejected.
+ *  [ENETUNREACH]   If the network ADDR is on is unreachable.
+ *  [EADDRINUSE]    If the address is already in use.
+ *  [EFAULT]        If ADDR points outside the addressable space.
+ *  [EINPROGRESS]   If FD is in non-blocking mode, and the connection could
+ *                  not be completed immediately.
+ *  [EALREADY]      If FD is in non-blocking mode, and a connection attempt
+ *                  is still pending.
+ *  [EACCESS]       If ADDR is the broadcast address, and the socket option
+ *                  SO_BROADCAST is not set.
+ */
+CPNIO_EXPORT int cpnio_connect (int fd, const struct sockaddr *addr, socklen_t addrlen);
+
+/**
+ * Accept an incoming connection on a socket, returning a new socket for
+ * the connection, and storing the peer address in ADDR.
+ *
+ * \param fd      The socket file descriptor.
+ * \param addr    The structure to store the peer address in.
+ * \param addrlen The size of the data available in ADDR; upon return, the
+ *                number of bytes stored in ADDR will be placed here.
+ * \return The new socket file descriptor, or -1 on error, and ERRNO set.
+ *
+ * Allowed ERRNO values:
+ *  [EBADF]         If FD is not a valid file descriptor.
+ *  [ENOTSOCK]      If FD in not a socket descriptor.
+ *  [EOPNOTSUPP]    If the socket is not a SOCK_STREAM socket.
+ *  [EFAULT]        If ADDR points outside the process's addressable space.
+ *  [EWOULDBLOCK]   If the socket is in non-blocking mode, and no connection
+ *                  attempt is currently ready.
+ *  [EMFILE]        If the process's descriptor table is full.
+ *  [ENFILE]        If the system's descriptor table is full.
+ */
+CPNIO_EXPORT int cpnio_accept (int fd, struct sockaddr *addr, socklen_t *addrlen);
+
+/**
+ * Send a datagram to the given address.
+ *
+ * \param fd    The socket file descriptor.
+ * \param msg   A pointer to the message to send.
+ * \param len   The size of the message to send.
+ * \param flags Flags for sending.
+ * \param to    The remote address to send the message to.
+ * \param tolen The size of the TO address structure.
+ * \return The number of bytes written, possibly zero, on success. Returns
+ *  -1 on failure, and sets ERRNO.
+ * \see sendto(2)
+ *
+ * Allowed ERRNO values:
+ *  [EBADF]
+ *  [ENOTSOCK]
+ *  [EFAULT]
+ *  [EMSGSIZE]
+ *  [EAGAIN]
+ *  [ENOBUFS]
+ *  [EACCES]
+ *  [EHOSTUNREACH]
+ */
+CPNIO_EXPORT ssize_t cpnio_sendto (int fd, const void *msg, size_t len, int flags,
+                                   const struct sockaddr *to, socklen_t tolen);
+
+/**
+ * Receive a message on a socket, storing the remote host's address in
+ * FROM.
+ *
+ * \param fd      The socket file descriptor.
+ * \param buf     The buffer to store received bytes in.
+ * \param flags   Flags to control the receive.
+ * \param from    Where to store the remote address.
+ * \param fromlen Pointer to the size of FROM; on return, it will contain the
+ *  size of the structure placed in FROM.
+ * \return The number of bytes received on success. -1 on error, and ERRNO will
+ *  be set.
+ * \see recvfrom(2)
+ *
+ * Allewed ERRNO values:
+ *  [EBADF]    FD is not a valid file descriptor.
+ *  [ENOTCONN] If the socket is stream-oriented, and no prior call to
+ *             connect(2) was made.
+ *  [ENOTSOCK] FD is not a socket.
+ *  [EAGAIN]   FD is in non-blocking mode, and no message was
+ *             immediately available.
+ *  [EINTR]    The system call was interrupted by a signal.
+ *  [EFAULT]   BUF, FROM, or FROMLEN lie outside the process's address
+ *             space.
+ */
+CPNIO_EXPORT ssize_t cpnio_recvfrom (int fd, void *buf, size_t len, int flags,
+                                     struct sockaddr *from, socklen_t *fromlen);
+
+
+/**
+ * Control file descriptor properties.
+ *
+ * \param fd  The file descriptor to control.
+ * \param cmd The command to execute.
+ * \param arg The command argument.
+ * \return A value other than -1, specific to CMD. On error, -1 is
+ *  returned, and ERRNO is set.
+ *
+ * Allowed ERRNO values:
+ *  FIXME
+ */
+CPNIO_EXPORT int cpnio_fcntl (int fd, int cmd, int arg);
+
+
+/**
+ * Select from one of the given file descriptor sets a descriptor that
+ * is ready for the given operation (read, write, etc.).
+ *
+ * \param nfds      A value one larger than the largest file
+ *                  descriptor.
+ * \param readfds   A set of file descriptors to select for
+ *                  readability.
+ * \param writefds  A set of file descriptors to select for
+ *                  writability.
+ * \param exceptfds A set of file descriptors to select for
+ *                  exceptional conditions.
+ * \param tm        The selection timeout.
+ * \return The number of file descriptors selected, possibly zero, or
+ *                  -1 on error (and with ERRNO set).
+ */
+CPNIO_EXPORT int cpnio_select (int nfds, fd_set *readfds, fd_set *writefds,
+                               fd_set *exceptfds, struct timeval *tm);
+
+/*
+ * We include the implementation file here, because our reference
+ * implementation is trivial, and the functions are declared extern
+ * inline.
+ *
+ * Implementations that need different implementations of these functions
+ * SHOULD remove this line, and compile javanio.c as a separate unit.
+ */
+#include "javanio.c"
+
+#endif /* __JAVANIO_H__ */
diff --git a/native/jni/native-lib/cpnet.c b/native/jni/native-lib/cpnet.c
index e8d0a5f07..85c4640e1 100644
--- a/native/jni/native-lib/cpnet.c
+++ b/native/jni/native-lib/cpnet.c
@@ -598,8 +598,8 @@ jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***ad
   struct hostent hret;
   struct hostent *result;
   jint buflen = 1024;
-  int herr;
-  int ret;
+  int herr = 0;
+  int ret = 0;
   int counter = 0;
   cpnet_address **addr_arr;
   int i;
@@ -611,7 +611,13 @@ jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***ad
 #ifdef HAVE_GETHOSTBYNAME_R
       ret = gethostbyname_r (hostname, &hret, buf, buflen, &result, &herr);
 #else
-      ret = gethostbyname (hostname);
+      hret.h_addr_list = NULL;
+      hret.h_addrtype = 0;
+
+      result = gethostbyname (hostname);
+      if (result == NULL)
+        return -errno;
+      memcpy (&hret, result, sizeof (struct hostent));
 #endif
       if (ret != 0 || result == NULL)
 	{