Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: harmony-dev@incubator.apache.org
Message-ID: <20060307112925.46220.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r383845 [2/3] - in
 /incubator/harmony/enhanced/classlib/trunk:
 modules/luni/src/main/java/com/ibm/platform/
 modules/luni/src/main/java/com/ibm/platform/struct/
 modules/nio/src/main/java/com/ibm/platform/
 modules/nio/src/main/java/com/ibm/pl...
Date: Tue, 07 Mar 2006 11:29:21 -0000
To: harmony-commits@incubator.apache.org
From: tellison@apache.org

Copied: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystem.c (from r383844, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSNetworkSystem.c)
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystem.c?p2=incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystem.c&p1=incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSNetworkSystem.c&r1=383844&r2=383845&rev=383845&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/OSNetworkSystem.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/OSNetworkSystem.c Tue Mar  7 03:29:14 2006
@@ -1,2581 +1,2368 @@
-/* Copyright 1998, 2005	The Apache Software Foundation or its licensors, as applicable
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this	file except in compliance with the License.
- * You may obtain a copy of the	License	at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or	agreed to in writing, software
- * distributed under the License is distributed	on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either	express	or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "OSNetworkSystem.h"
-#include "helpers.h"
-#include "jcl.h"
-#include "nethelp.h"
-#include "jclprots.h"
-#include "portsock.h"
-#include "socket.h"
-
-
-void setSocketImplPort (JNIEnv * env, jobject socketImpl, U_16 hPort);
-void setSocketImplAddress (JNIEnv * env, jobject socketImpl,
-	 jobject anInetAddress);
-void updateSocket (JNIEnv * env, hysockaddr_t sockaddrP, hysocket_t socketNew,
-       jobject socketImpl, jobject fileDescriptorSocketImpl);
-void * getConnectContext(JNIEnv	*env,jobject longclass);
-void setConnectContext(JNIEnv *env,jobject longclass,U_8 * context);
-
-void setDatagramPacketAddress (JNIEnv *	env, jobject datagramPacket,
-	     jobject anInetAddress);
-void setDatagramPacketPort (JNIEnv * env, jobject datagramPacket, U_16 hPort);
-void updateAddress (JNIEnv * env, hysockaddr_t sockaddrP,
-	jobject	senderAddress);	
-void updatePacket (JNIEnv * env, hysockaddr_t sockaddrP,
-       jobject datagramPacket, I_32 bytesRead);	
-void setDatagramPacketLength (JNIEnv * env, jobject datagramPacket,
-	    I_32 length);
-
-/**
- * A helper method, to set the remote address into the DatagramPacket.
- *
- * @param env		pointer	to the JNI library
- * @param datagramPacket  pointer to the java DatagramPacket object to update
- * @param anInetAddress	  pointer to the java InetAddress to update the	packet with
- *
- */
-
-void
-setDatagramPacketAddress (JNIEnv * env,	jobject	datagramPacket,	
-	jobject	anInetAddress)
-{
-  /*----------------------former cache get/set ----------------------------
-  //jfieldID fid = JCL_CACHE_GET (env, FID_java_net_DatagramPacket_address);
-  */
-  jfieldID fid = getJavaNetDatagramPacketAddress(env);
-  (*env)->SetObjectField (env, datagramPacket, fid, anInetAddress);
-}
-
-/**
- * A helper method, to set the remote port into	the java DatagramPacket.
- *
- * @param env		pointer	to the JNI library
- * @param datagramPacket  pointer to the java DatagramPacket object to update
- * @param hPort		the port value to update the packet with, in host order	
- */
-
-void
-setDatagramPacketPort (JNIEnv *	env, jobject datagramPacket, U_16 hPort)
-{
-  /*----------------------former cache get/set ----------------------------
-  //jfieldID fid = JCL_CACHE_GET (env, FID_java_net_DatagramPacket_port);
-  */
-  jfieldID fid = getJavaNetDatagramPacketPort(env);
-  (*env)->SetIntField (env, datagramPacket, fid, hPort);
-}
-
-/**
- * A helper method, to set the data length into	a java DatagramPacket.
- *
- * @param env		pointer	to the JNI library
- * @param datagramPacket  pointer to the java DatagramPacket object to update
- * @param length	  the length value to update the packet	with
- */
-
-void
-setDatagramPacketLength	(JNIEnv	* env, jobject datagramPacket, I_32 length)
-{
-  /*----------------------former cache get/set ----------------------------
-  //jfieldID fid = JCL_CACHE_GET (env, FID_java_net_DatagramPacket_length);
-  */
-  jfieldID fid = getJavaNetDatagramPacketLength(env);
-  (*env)->SetIntField (env, datagramPacket, fid, length);
-}
-
-/**
- * A helper method, to update the java DatagramPacket argument.	 Used after receiving a	datagram packet, 
- * to update the DatagramPacket	with the network address and port of the sending machine.
- *
- * @param env		pointer	to the JNI library
- * @param sockaddrP	pointer	to the hysockaddr struct with the sending host address & port
- * @param datagramPacket  pointer to the java DatagramPacket object to update
- * @param bytesRead	the bytes read value to	update the packet with
- */
-
-void
-updatePacket (JNIEnv * env, hysockaddr_t sockaddrP, jobject datagramPacket,
-	I_32 bytesRead)	
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jobject anInetAddress;
-  U_16 nPort;
-  U_32 length;
-  U_32 scope_id	= 0;
-  jbyte	byte_array[HYSOCK_INADDR6_LEN];	
-  hysock_sockaddr_address6 (sockaddrP, (U_8 *) byte_array, &length,
-	  &scope_id);
-
-  nPort	= hysock_sockaddr_port (sockaddrP);
-  anInetAddress	=
-    newJavaNetInetAddressGenericB (env,	byte_array, length, scope_id);
-
-  setDatagramPacketAddress (env, datagramPacket, anInetAddress);
-  setDatagramPacketPort	(env, datagramPacket, hysock_ntohs (nPort));
-  setDatagramPacketLength (env,	datagramPacket,	bytesRead);
-}
-
-/**
- * A helper method, to set address of the java InetAddress argument.
- *
- * @param env		pointer	to the JNI library
- * @param sockaddrP	pointer	to the hysockaddr struct containing the	network	address	
- * @param senderAddress	pointer	to the java InetAddress	object to update
- */
-
-void
-updateAddress (JNIEnv *	env, hysockaddr_t sockaddrP, jobject senderAddress)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	ipv4Addr[16];
-  U_32 length;
-  U_32 scope_id	= 0;
-  hysock_sockaddr_address6 (sockaddrP, (U_8 *) ipv4Addr, &length, &scope_id);
-  /*-------------- Here is the cache get/set,remain for next change  ---------------
-  //(*env)->SetObjectField (env, senderAddress,	
-  //	  JCL_CACHE_GET	(env,
-  //	     FID_java_net_InetAddress_address),	
-  //	  newJavaByteArray (env, ipv4Addr, length));
-  */
-  (*env)->SetObjectField (env, senderAddress,
-	getJavaNetInetAddressIpaddress(env),
-	newJavaByteArray (env, ipv4Addr, length));
-  if (jcl_supports_ipv6	(env) && (scope_id != 0))
-    {
-      jclass tempClass = getJavaNetInetAddressClass(env);
-      jfieldID fid = NULL;
-
-      fid = (*env)->GetFieldID (env, tempClass,	"scope_id", "I");
-      if ((*env)->ExceptionCheck (env))	
-	{
-	  (*env)->ExceptionClear (env);	
-	}
-      else
-	{
-	  (*env)->SetIntField (env, senderAddress, fid,	scope_id);
-	}
-    }
-}
-
-/**
- * A helper method, to set the connect context to a Long object.
- *
- * @param env		pointer	to the JNI library
- * @param longclass	Java Long Object
- */
-void
-setConnectContext(JNIEnv *env,jobject longclass,U_8 * context){	
-  jclass descriptorCLS;	
-  jfieldID descriptorFID;
-  descriptorCLS	= (*env)->FindClass (env, "java/lang/Long");
-  descriptorFID	= (*env)->GetFieldID (env, descriptorCLS, "value","J");	
-  (*env)->SetLongField(env,longclass,descriptorFID,(jlong)context);
-};
-
-/**
- * A helper method, to get the connect context.	
- *
- * @param env		pointer	to the JNI library
- * @param longclass	Java Long Object
- */
-void *
-getConnectContext(JNIEnv *env,jobject longclass){
-  jclass descriptorCLS;	
-  jfieldID descriptorFID;
-  void * retConnectContext;
-  descriptorCLS	= (*env)->FindClass (env, "java/lang/Long");
-  descriptorFID	= (*env)->GetFieldID (env, descriptorCLS, "value", "J");
-  retConnectContext = (void *) ((*env)->GetLongField (env, longclass, descriptorFID));
-  return retConnectContext;
-};
-
-/**
- * A helper method, to set the remote address into the socketImpl.
- *
- * @param env		pointer	to the JNI library
- * @param socketImpl	  pointer to the java SocketImpl object	to update
- * @param anInetAddress	  pointer to the java InetAddress to update the	socket with
- */
-
-void
-setSocketImplAddress (JNIEnv * env, jobject socketImpl,	jobject	anInetAddress)
-{
-  /*-------------- Here is the cache get/set,remain for next change  ---------------
-  //jfieldID fid = JCL_CACHE_GET (env, FID_java_net_SocketImpl_address);
-  */
-  jfieldID fid = getJavaNetSocketImplAddress(env);
-  (*env)->SetObjectField (env, socketImpl, fid,	anInetAddress);	
-}
-
-/**
- * A helper method, to set the remote port into	the socketImpl.	
- *
- * @param env	      pointer to the JNI library
- * @param socketImpl	pointer	to the java SocketImpl object to update	
- * @param hPort	      the port number, in host order, to update	the socket with	
- */
-
-void
-setSocketImplPort (JNIEnv * env, jobject socketImpl, U_16 hPort)
-{
-  /*----------------------former cachecvs update -l -P -r NIOCompletion20051109 src.core/platform/linux.IA32/nio
- get/set ---------------
-  //jfieldID fid = JCL_CACHE_GET (env, FID_java_net_SocketImpl_port);
-  */
-  jfieldID fid = getJavaNetSocketImplPort( env);
-  (*env)->SetIntField (env, socketImpl,	fid, hPort);
-}
-
-/**
- * A helper method, to update the java SocketImpl argument.  Used after	connecting, to 'link' the 
- * system socket with the java socketImpl and update the address/port fields with the values
- * corresponding to the	remote machine.	
- *
- * @param env			pointer	to the JNI library
- * @param sockaddrP		pointer	to the hysockaddr struct with the remote host address &	port
- * @param socketNew		pointer	to the new hysocket
- * @param socketImpl		  pointer to the new java (connected) socket
- * @param fileDescriptorSocketImpl    pointer to the java file descriptor of the socketImpl
- */
-
-void
-updateSocket (JNIEnv * env,
-	hysockaddr_t sockaddrP,	hysocket_t socketNew,
-	jobject	socketImpl, jobject fileDescriptorSocketImpl)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  U_8 nipAddress[HYSOCK_INADDR6_LEN];
-  U_32 length;
-  jobject anInetAddress;
-  U_16 nPort;
-  U_32 scope_id	= 0;
-
-  hysock_sockaddr_address6 (sockaddrP, nipAddress, &length, &scope_id);	
-  nPort	= hysock_sockaddr_port (sockaddrP);
-  anInetAddress	=
-    newJavaNetInetAddressGenericB (env,	nipAddress, length, scope_id);
-
-  setJavaIoFileDescriptorContents (env,	fileDescriptorSocketImpl,
-	      socketNew);
-  setSocketImplAddress (env, socketImpl, anInetAddress);
-  setSocketImplPort (env, socketImpl, hysock_ntohs (nPort));
-}
-
-/*----------------------former cache get/set ------------------------------------
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    oneTimeInitializationDatagram
- * Signature: (Z)V
- */
- /*
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_oneTimeInitializationDatagram(JNIEnv * env,
-		   jclass clazz,
-		   jboolean
-		   ipv6support)	
-{
-  jclass lookupClass;
-  jfieldID fid;	
-
-  netInitializeIDCaches	(env, ipv6support);
-
-  lookupClass =	(*env)->FindClass (env,	"java/net/DatagramPacket");
-  if (!lookupClass)
-    return;
-
-  fid =	
-    (*env)->GetFieldID (env, lookupClass, "address",
-      "Ljava/net/InetAddress;");
-  if (!fid)
-    return;
-  JCL_CACHE_SET	(env, FID_java_net_DatagramPacket_address, fid);
-
-  fid =	(*env)->GetFieldID (env, lookupClass, "length",	"I");
-  if (!fid)
-    return;
-  JCL_CACHE_SET	(env, FID_java_net_DatagramPacket_length, fid);	
-
-  fid =	(*env)->GetFieldID (env, lookupClass, "port", "I");
-  if (!fid)
-    return;
-  JCL_CACHE_SET	(env, FID_java_net_DatagramPacket_port,	fid);
-}
-*/
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    oneTimeInitializationSocket
- * Signature: (Z)V
- */
- /*
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_oneTimeInitializationSocket(JNIEnv	* env, jclass clazz,
-	    jboolean jcl_supports_ipv6)	
-{
-  jfieldID fid;	
-  jclass lookupClass;
-  //netInitializeIDCaches (env,	jcl_supports_ipv6);
-
-  lookupClass =	(*env)->FindClass (env,	"java/net/SocketImpl");	
-  if (!lookupClass)
-    return;
-
-  fid =	(*env)->GetFieldID (env, lookupClass, "address", "Ljava/net/InetAddress;");
-  if (!fid)
-    return;
-  //JCL_CACHE_SET (env,	FID_java_net_SocketImpl_address, fid);
-
-  fid =	(*env)->GetFieldID (env, lookupClass, "port", "I");
-  if (!fid)
-    return;
-  //JCL_CACHE_SET (env,	FID_java_net_SocketImpl_port, fid);
-}
-*/
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    createSocketImpl
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createSocketImpl(JNIEnv * env,
-	      jclass thisClz,
-	      jobject thisObjFD,
-	      jboolean
-	      preferIPv4Stack)
-{
-  createSocket (env, thisObjFD,	HYSOCK_STREAM, preferIPv4Stack);
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    createDatagramImpl
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createDatagramSocketImpl(JNIEnv * env,
-		jclass
-		thisClz,
-		jobject	
-		thisObjFD,
-		jboolean
-		preferIPv4Stack)
-{
-  createSocket (env, thisObjFD,	HYSOCK_DGRAM, preferIPv4Stack);	
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    readSocketImpl
- * Signature: (Ljava/io/FileDescriptor;[BIII)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_readSocketImpl(JNIEnv * env, jclass thisClz,
-	      jobject fileDescriptor,
-	      jbyteArray data, jint offset,
-	      jint count, jint timeout)	
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-  jbyte	*message;
-  I_32 result, localCount;
-
-/* TODO: ARRAY PINNING */
-#define	INTERNAL_RECEIVE_BUFFER_MAX 2048
-  U_8 internalBuffer[INTERNAL_RECEIVE_BUFFER_MAX];
-
-  hysocketP =getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-
-  /*----------------the older form,nearly the same with below------------
-  //result = pollSelectRead (env, fileDescriptor, timeout, TRUE);
-  */
-  result = selectRead (env,hysocketP, timeout, FALSE);	    
-  if (0	>= result)
-	return (jint) 0;
-
-
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return (jint) 0;
-    }
-
-  localCount = (count <	65536) ? count : 65536;	
-
-  if (localCount > INTERNAL_RECEIVE_BUFFER_MAX)	
-    {
-      message =	hymem_allocate_memory (localCount);
-    }
-  else
-    {
-      message =	internalBuffer;	
-    }
-
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-
-  result = hysock_read (hysocketP, (U_8 *) message, localCount, HYSOCK_NOFLAGS);
-
-  if (result > 0)
-    (*env)->SetByteArrayRegion (env, data, offset, result, (U_8 *)message);
-
-  if (((U_8 *)message) != internalBuffer)
-    {
-      hymem_free_memory	((U_8 *)message);
-    }
-#undef INTERNAL_MAX
-
-  /* If	no bytes are read, return -1 to	signal 'endOfFile' to the Java input stream */
-  if (0	< result)
-    {
-      return (jint) result;
-    }
-  else if (0 ==	result)	
-    {
-      return (jint) - 1;
-    }
-  else
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    writeSocketImpl
- * Signature: (Ljava/io/FileDescriptor;[BII)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_writeSocketImpl(JNIEnv * env, jclass thisClz,
-	   jobject fileDescriptor,
-	   jbyteArray data, jint offset,
-	   jint	count)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t socketP;
-  jbyte	*message;
-  I_32 result =	0, sent	= 0;
-
-/* TODO: ARRAY PINNING */
-#define	INTERNAL_SEND_BUFFER_MAX 512
-  U_8 internalBuffer[INTERNAL_SEND_BUFFER_MAX];	
-
-  if (count > INTERNAL_SEND_BUFFER_MAX)	
-    {
-      message =	hymem_allocate_memory (count);
-    }
-  else
-    {
-      message =	internalBuffer;	
-    }
-
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  (*env)->GetByteArrayRegion (env, data, offset, count,	message);
-  while	(sent <	count)
-    {
-      socketP =	
-	getJavaIoFileDescriptorContentsAsAPointer (env,	fileDescriptor);
-      if (!hysock_socketIsValid	(socketP))
-	{
-	  if (((U_8 *)message) != internalBuffer)
-	    {
-	      hymem_free_memory	(message);
-	    }
-
-	  throwJavaNetSocketException (env,
-	    sent ==
-	    0 ?	HYPORT_ERROR_SOCKET_BADSOCKET :	
-	  HYPORT_ERROR_SOCKET_INTERRUPTED);
-	  return (jint)	0;
-	}
-      result =
-	hysock_write (socketP, (U_8 *) message + sent, (I_32) count - sent,
-	HYSOCK_NOFLAGS);
-      if (result < 0)
-	break;
-      sent += result;
-    }
-  if ((U_8 *)message != internalBuffer)
-    {
-      hymem_free_memory	(message);
-    }
-#undef INTERNAL_MAX
-
-  /**
-   * We	should always throw an exception if all	the data cannot	be sent	because	Java methods
-   * assume all	the data will be sent or an error occurs.
-   */
-  if (result < 0)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      return (jint) sent;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    setNonBlockingImpl
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_setNonBlockingImpl	 (JNIEnv * env,	
-	  jclass fileDescriptor,jobject	afd,
-	  jboolean nonblocking)	
-{
-	PORT_ACCESS_FROM_ENV (env);
-	hysocket_t socketP;
-	int result;		
-	socketP	=getJavaIoFileDescriptorContentsAsAPointer (env, afd);
-	if (!hysock_socketIsValid (socketP))
-    	{
-      		//throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      		return ;
-    	}
-	result = hysock_set_nonblocking(socketP,nonblocking);
-	if (0 != result) {
-		throwJavaNetSocketException (env, result);		
-	}
-	return;	
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    connectSocketImpl	
- * Signature: (Ljava/io/FileDescriptor;ILjava/net/InetAddress;I)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_connectSocketImpl(JNIEnv *	env,
-	       jclass thisClz,
-	       jobject
-	       fileDescriptor,
-	       jint trafficClass,
-	       jobject inetAddress,
-	       jint remotePort		    
-	       )
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
-  int length;
-  U_16 nPort;
-  I_32 result;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  U_32 scope_id	= 0;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return -1;
-    }
-  else
-    {
-      netGetJavaNetInetAddressValue (env, inetAddress, nAddrBytes, &length);
-
-      nPort = hysock_htons ((U_16) remotePort);	
-      if (length == HYSOCK_INADDR_LEN)
-	{
-	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, length,
-	    HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
-	    socketP);
-	}
-      else
-	{
-	  netGetJavaNetInetAddressScopeId (env,	inetAddress, &scope_id);
-	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, length,
-	    HYADDR_FAMILY_AFINET6, nPort,
-	    (trafficClass & 0xFF) << 20, scope_id,
-	    socketP);
-	}
-
-      result = hysock_connect (socketP,	&sockaddrP);
-      if (0 != result)
-	{
-	  throwJavaNetConnectException (env, result);
-	  return result;
-	}
-    }
-    return result;
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    connectWithTimeoutSocketImpl
- * Signature: (Ljava/io/FileDescriptor;IILjava/net/InetAddress;IILjava/lang/Long;)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_connectWithTimeoutSocketImpl(JNIEnv * env,	
-	       jclass thisClz,
-	       jobject
-	       fileDescriptor,
-	       jint timeout,
-	       jint trafficClass,
-	       jobject inetAddr,
-	       jint port,
-	       jint step,
-	       jobject passContext)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
-  hysocket_t socketP;
-  /*former:jbyte * nAddrBytes;	*/
-  int length ; 
-  U_16 nPort;
-  I_32 result =	0;
-  hysockaddr_struct sockaddrP;
-  U_32 scope_id	= 0;
-  U_8 *	context	= NULL;	
-  context = getConnectContext(env,passContext);	
-  
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return -1;
-    }
-  else
-    {
-      /*----------------------- former -----------------------------
-      //jbyteArray byte_array =	getInetAddrIP(env,inteAddr);  
-      //length = (*env)->GetArrayLength	(env, byte_array);
-      //(*env)->GetByteArrayRegion (env, byte_array, 0,	length,	nAddrBytes);
-      */
-      netGetJavaNetInetAddressValue (env, inetAddr, nAddrBytes,	&length);
-      nPort = hysock_htons ((U_16) port);
-      hysock_sockaddr_init6 (&sockaddrP,(U_8 *)	nAddrBytes, length,
-	    HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
-	    socketP);
-
-      switch (step){
-	case SOCKET_CONNECT_STEP_START:	
-		result = hysock_connect_with_timeout (socketP, &sockaddrP,0, HY_PORT_SOCKET_STEP_START,&context);		
-		break;
-	case SOCKET_CONNECT_STEP_CHECK:	
-
-		result = hysock_connect_with_timeout (socketP, &sockaddrP,timeout, HY_PORT_SOCKET_STEP_CHECK,&context);	
-		break;
-	}
-      
-      /* set connext for	next call*/
-      setConnectContext(env,passContext,context);
-      if (0 == result)
-	{
-	  /* connected , so stop here */
-	  hysock_connect_with_timeout (socketP,	&sockaddrP, 0,
-	    HY_PORT_SOCKET_STEP_DONE, &context);
-	}
-      else if (result != HYPORT_ERROR_SOCKET_NOTCONNECTED)
-	{
-	  /* can not connect...	*/
-	  if ((HYPORT_ERROR_SOCKET_CONNRESET ==	result)	||
-	    (HYPORT_ERROR_SOCKET_CONNECTION_REFUSED == result) ||
-	    (HYPORT_ERROR_SOCKET_ADDRNOTAVAIL == result) ||
-	    (HYPORT_ERROR_SOCKET_ADDRINUSE == result) ||
-	    (HYPORT_ERROR_SOCKET_ENETUNREACH ==	result)	||
-	    (HYPORT_ERROR_SOCKET_EACCES	== result))
-	    {
-	      //hysock_connect_with_timeout (socketP, &sockaddrP,	
-	      //0,HY_PORT_SOCKET_STEP_DONE,
-	      //&context);
-	      throwJavaNetConnectException (env, result);
-	    }
-	  else
-	    {
-	      hysock_connect_with_timeout (socketP, &sockaddrP,	0,
-		HY_PORT_SOCKET_STEP_DONE,
-		&context);
-	      throwJavaNetSocketException (env,	result);
-	    }
-	}
-    }
-
-    return result;
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    socketBindImpl
- * Signature: (Ljava/io/FileDescriptor;ILjava/net/InetAddress;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_socketBindImpl(JNIEnv * env, jclass thisClz,
-	    jobject fileDescriptor,
-	    jint localPort,
-	    jobject inetAddress)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	nlocalAddrBytes[HYSOCK_INADDR6_LEN];
-  int length;
-  U_16 nPort;
-  I_32 result;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  U_32 scope_id	= 0;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  else
-    {
-      netGetJavaNetInetAddressValue (env, inetAddress, nlocalAddrBytes,	
-	&length);
-
-      nPort = hysock_htons ((U_16) localPort);
-      if (length == HYSOCK_INADDR6_LEN)	
-	{
-	  netGetJavaNetInetAddressScopeId (env,	inetAddress, &scope_id);
-	  hysock_sockaddr_init6	(&sockaddrP, nlocalAddrBytes, length,
-	    HYADDR_FAMILY_AFINET6, nPort, 0, scope_id,
-	    socketP);
-	}
-      else
-	{
-	  hysock_sockaddr_init6	(&sockaddrP, nlocalAddrBytes, length,
-	    HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
-	    socketP);
-	}
-      result = hysock_bind (socketP, &sockaddrP);
-      if (0 != result)
-	{
-	  throwJavaNetBindException (env, result);
-	  return;
-	}
-    }
-}
-
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    listenStreamSocketImpl
- * Signature: (Ljava/io/FileDescriptor;I)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_listenStreamSocketImpl(JNIEnv * env, jclass thisClz,
-	     jobject fileDescriptor,
-	     jint backlog)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t socketP;
-  I_32 result;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  else
-    {
-      result = hysock_listen (socketP, (I_32) backlog);	
-      if (result < 0)
-	{
-	  throwJavaNetSocketException (env, result);
-	}
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    availableStreamImpl
- * Signature: (Ljava/io/FileDescriptor;)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_availableStreamImpl(JNIEnv	* env, jclass thisClz,
-		jobject	fileDescriptor)	
-{
-#define	MSGLEN 2048   /* This could be replaced	by the default stack buffer size */
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-  char message[MSGLEN];	
-
-  I_32 result, flags = 0;
-
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, fileDescriptor);
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return (jint) 0;
-    }
-
-  result = hysock_select_read (hysocketP, 0, 1,	FALSE);	
-
-  if (HYPORT_ERROR_SOCKET_TIMEOUT == result)
-    {
-      return (jint) 0;	  /* The read operation	timed out, so answer 0 bytes available */
-    }
-  else if (0 > result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  result = hysock_setflag (HYSOCK_MSG_PEEK, &flags);  /* Create	a 'peek' flag argument for the read operation */
-  if (0	> result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-
-  result = hysock_read (hysocketP, (U_8	*) message, MSGLEN, flags);
-
-  if (0	> result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      return (jint) result;
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    acceptSocketImpl
- * Signature: (Ljava/io/FileDescriptor;Ljava/net/SocketImpl;Ljava/io/FileDescriptor;I)V	
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_acceptSocketImpl(JNIEnv * env, jclass thisClz,
-	     jobject fileDescriptorServer,
-	     jobject socketImpl,
-	     jobject
-	     fileDescriptorSocketImpl,
-	     jint timeout)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  hysocket_t socketS, socketNew;
-  hysockaddr_struct sockaddrP;
-  jbyte	nlocalAddrBytes[HYSOCK_INADDR6_LEN];
-
-  
-  result = pollSelectRead (env,	fileDescriptorServer, timeout, TRUE);
-
-  if (0	> result)
-    return;
-
-  socketS =
-    getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptorServer);
-  if (!hysock_socketIsValid (socketS))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-
-  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nlocalAddrBytes,
-       HYSOCK_INADDR_LEN, HYADDR_FAMILY_AFINET4, 0, 0, 0,
-       socketS);
-
-  result = hysock_accept (socketS, &sockaddrP, &socketNew);
-  if (0	!= result)
-    {
-      throwJavaNetBindException	(env, result);
-    }
-  else
-    {
-      updateSocket (env, &sockaddrP, socketNew,	socketImpl,
-	fileDescriptorSocketImpl);
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    supportsUrgentDataImpl
- * Signature: (Ljava/io/FileDescriptor;)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_ibm_platform_OSNetworkSystem_supportsUrgentDataImpl(JNIEnv * env, jclass thisClz,
-	     jobject fileDescriptor)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t socketP;
-  I_32 flags = 0;
-  I_32 result;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      return FALSE;
-    }
-  result = hysock_setflag (HYSOCK_MSG_OOB, &flags);
-  return !result;
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    sendUrgentDataImpl
- * Signature: (Ljava/io/FileDescriptor;B)Z
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_sendUrgentDataImpl(JNIEnv * env, jclass thisClz,
-	       jobject fileDescriptor,
-	       jbyte data)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t socketP;
-  I_32 flags = 0;
-  I_32 result =	0;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  result = hysock_setflag (HYSOCK_MSG_OOB, &flags);
-  if (!result)
-    {
-      result = hysock_write (socketP, &data, 1,	flags);	
-    }
-
-  /* Always throw an exception if all the data cannot be sent because Java methods
-   * assume all	the data will be sent or an error occurs.
-   */
-  if (result < 0)
-    {
-      throwJavaNetSocketException (env,	result);
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    connectDatagramImpl2
- * Signature: (Ljava/io/FileDescriptor;IILjava/net/InetAddress;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_connectDatagramImpl2(JNIEnv * env,	
-		  jclass thisClz,
-		  jobject
-		  fileDescriptor,
-		  jint remotePort,
-		  jint trafficClass,
-		  jobject
-		  inetAddress)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
-  int length;
-  U_16 nPort;
-  I_32 result;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  U_32 scope_id	= 0;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-
-  netGetJavaNetInetAddressValue	(env, inetAddress, nAddrBytes, &length);
-
-  nPort	= hysock_htons ((U_16) remotePort);
-  if (length ==	HYSOCK_INADDR_LEN)
-    {
-      hysock_sockaddr_init6 (&sockaddrP, (U_8 *) nAddrBytes, length,
-	   HYADDR_FAMILY_AFINET4, nPort, 0, 0, socketP);
-    }
-  else
-    {
-      netGetJavaNetInetAddressScopeId (env, inetAddress, &scope_id);
-      hysock_sockaddr_init6 (&sockaddrP, (U_8 *) nAddrBytes, length,
-	   HYADDR_FAMILY_AFINET6, nPort,
-	   (trafficClass & 0xFF) << 20,	scope_id, socketP);
-    }
-
-  result = hysock_connect (socketP, &sockaddrP);
-  if (0	!= result)
-    {
-      throwJavaNetConnectException (env, result);
-
-      return;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    disconnectDatagramImpl
- * Signature: (Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_disconnectDatagramImpl(JNIEnv * env,
-		    jclass thisClz,
-		    jobject
-		    fileDescriptor)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
-  U_16 nPort = 0;
-  I_32 result;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-
-  /* the address itself	should not matter as the protocol family is AF_UNSPEC.	This tells connect to 
-     disconnect	the Datagram */	
-  memset (nAddrBytes, 0, HYSOCK_INADDR6_LEN);
-  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, HYSOCK_INADDR_LEN,
-       HYADDR_FAMILY_UNSPEC, nPort, 0, 0, socketP);
-
-  /* there is the possiblity of	an exception here */
-  result = hysock_connect (socketP, &sockaddrP);
-
-  /* will likely need to eat the correct exception here.  Leave	as is until we figure out what that exception will be */
-  if (0	!= result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return;
-    }
-}
-
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    socketBindImpl2
- * Signature: (Ljava/io/FileDescriptor;IZLjava/net/InetAddress;)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_ibm_platform_OSNetworkSystem_socketBindImpl2(JNIEnv	* env,
-		   jclass thisClz,
-		   jobject fileDescriptor,
-		   jint	localPort,
-		   jboolean doDevice,
-		   jobject inetAddress)	
- {
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte nlocalAddrBytes[HYSOCK_INADDR6_LEN];
-  int length;
-  U_16 nPort;
-  I_32 result;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  U_32 scope_id = 0;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env, HYPORT_ERROR_SOCKET_BADSOCKET);
-      return;
-    }
-  else
-    {
-      netGetJavaNetInetAddressValue (env, inetAddress, nlocalAddrBytes,
-                                     &length);
-
-      nPort = hysock_htons ((U_16) localPort);
-      if (length == HYSOCK_INADDR6_LEN)
-        {
-          netGetJavaNetInetAddressScopeId (env, inetAddress, &scope_id);
-          hysock_sockaddr_init6 (&sockaddrP, nlocalAddrBytes, length,
-                                 HYADDR_FAMILY_AFINET6, nPort, 0, scope_id,
-                                 socketP);
-        }
-      else
-        {
-          hysock_sockaddr_init6 (&sockaddrP, nlocalAddrBytes, length,
-                                 HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
-                                 socketP);
-        }
-      result = hysock_bind (socketP, &sockaddrP);
-      if (0 != result)
-        {
-          throwJavaNetBindException (env, result);
-          return;
-        }
-    }
-}
-
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    peekDatagramImpl
- * Signature: (Ljava/io/FileDescriptor;Ljava/net/InetAddress;I)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_peekDatagramImpl(JNIEnv * env,
-	      jclass thisClz,
-	      jobject
-	      fileDescriptor,
-	      jobject senderAddress,
-	      jint timeout)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-  hysockaddr_struct sockaddrP;
-  char msg[1] =	{ 0 };
-  I_32 msgLen =	1;
-  I_32 result;
-  I_32 flags = 0;
-  jint hport;
-  jbyte	nlocalAddrBytes[HYSOCK_INADDR6_LEN];
-
-  result = pollSelectRead (env,	fileDescriptor,	timeout, TRUE);	
-  if (0	> result)
-    return (jint) 0;
-
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, fileDescriptor);
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return (jint) 0;
-    }
-
-  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nlocalAddrBytes,
-       HYSOCK_INADDR_LEN, HYADDR_FAMILY_AFINET4, 0, 0, 0,
-       hysocketP);
-
-  result = hysock_setflag (HYSOCK_MSG_PEEK, &flags);
-  if (0	> result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  result =
-    hysock_readfrom (hysocketP,	(U_8 *)	msg, msgLen, flags, &sockaddrP);
-
-/* Note, the msgsize error is acceptable as the	read buffer was	set to a nominal length.
-  Updating sockaddrP is	the purpose of this call. */
-  if (result < 0 && result != HYPORT_ERROR_SOCKET_MSGSIZE)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      updateAddress (env, &sockaddrP, senderAddress);
-      hport = (jint) hysock_ntohs (hysock_sockaddr_port	(&sockaddrP));
-      return hport;
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    receiveDatagramImpl
- * Signature: (Ljava/io/FileDescriptor;Ljava/net/DatagramPacket;[BIIIZ)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_receiveDatagramImpl(JNIEnv	* env,
-		  jclass thisClz,
-		  jobject
-		  fileDescriptor,
-		  jobject
-		  datagramPacket,
-		  jbyteArray data,
-		  jint offset,
-		  jint msgLength,
-		  jint timeout,	
-		  jboolean peek)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-  hysockaddr_struct sockaddrP;
-  jbyte	*message;
-  I_32 result, localCount;
-  I_32 flags = HYSOCK_NOFLAGS;
-  jbyte	nlocalAddrBytes[HYSOCK_INADDR6_LEN];
-
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, fileDescriptor);
-  result = pollSelectRead (env,	fileDescriptor,	timeout, TRUE);	
-  //result = selectRead (env,hysocketP, timeout, FALSE);
-  if (0	> result)
-    return (jint) 0;
-
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return (jint) 0;
-    }
-
-  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nlocalAddrBytes,
-       HYSOCK_INADDR_LEN, HYADDR_FAMILY_AFINET4, 0, 0, 0,
-       hysocketP);
-
-  localCount = (msgLength < 65536) ? msgLength : 65536;	
-  message = hymem_allocate_memory (localCount);	
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  if (peek)
-    {
-      result = hysock_setflag (HYSOCK_MSG_PEEK,	&flags);
-      if (result)
-	{
-	  hymem_free_memory (message);
-	  throwJavaNetSocketException (env, result);
-	  return (jint)	0;
-	}
-    }
-  result =
-    hysock_readfrom (hysocketP,	message, localCount, flags, &sockaddrP);
-  if (result > 0)
-    (*env)->SetByteArrayRegion (env, data, offset, result, message);
-  hymem_free_memory (message);
-  if (result < 0)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      updatePacket (env, &sockaddrP, datagramPacket, result);
-      return (jint) result;
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    recvConnectedDatagramImpl	
- * Signature: (Ljava/io/FileDescriptor;Ljava/net/DatagramPacket;[BIIIZ)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_recvConnectedDatagramImpl(JNIEnv *	env,
-		 jclass	
-		 thisClz,
-		 jobject
-		 fileDescriptor,
-		 jobject
-		 datagramPacket,
-		 jbyteArray
-		 data,
-		 jint offset,
-		 jint
-		 msgLength,
-		 jint timeout,
-		 jboolean
-		 peek)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-  jbyte	*message;
-  I_32 result;
-  I_32 localCount;
-  I_32 flags = HYSOCK_NOFLAGS;
-
-  /* check if there is any data	to be read before we go	ahead and do the read */
-  result = pollSelectRead (env,	fileDescriptor,	timeout, TRUE);	
-  if (0	> result)
-    {
-      return (jint) 0;
-    }
-
-  /* get the handle to the socket */
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, fileDescriptor);
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return (jint) 0;
-    }
-
-  /* allocate the buffer into which data will be read */
-  localCount = (msgLength < 65536) ? msgLength : 65536;	
-  message = hymem_allocate_memory (localCount);	
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-
-  /* check for peek option, if so set the appropriate flag */
-  if (peek)
-    {
-      result = hysock_setflag (HYSOCK_MSG_PEEK,	&flags);
-      if (result)
-	{
-	  hymem_free_memory ( message);	
-	  throwJavaNetSocketException (env, result);
-	  return (jint)	0;
-	}
-    }
-
-  /* read the data and copy it to the return array, then free the buffer as we
-     no	longer need it */
-  result = hysock_read (hysocketP, message, localCount,	flags);	
-  if (result > 0)
-    {
-      (*env)->SetByteArrayRegion (env, data, offset, result, message);
-    }
-  hymem_free_memory ( message);	
-  if (result < 0)
-    {
-      if ((HYPORT_ERROR_SOCKET_CONNRESET == result)
-	|| (HYPORT_ERROR_SOCKET_CONNECTION_REFUSED == result))
-	{
-	  throwJavaNetPortUnreachableException (env, result);
-	  return (jint)	0;
-	}
-      else
-	{
-	  throwJavaNetSocketException (env, result);
-	  return (jint)	0;
-	}
-    }
-  else
-    {
-      /* update	the packet with	the legth of data received.
-	 Since we are connected	we did not get back an address.	 This
-	 address is cached within the PlainDatagramSocket  java	object and is filled in	at
-	 the java level	*/
-      setDatagramPacketLength (env, datagramPacket, result);
-      return (jint) result;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    sendDatagramImpl
- * Signature: (Ljava/io/FileDescriptor;[BIIIZILjava/net/InetAddress;)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_sendDatagramImpl(JNIEnv * env,
-	       jclass thisClz,
-	       jobject
-	       fileDescriptor,
-	       jbyteArray data,	
-	       jint offset,
-	       jint msgLength,
-	       jint targetPort,	
-	       jboolean	
-	       bindToDevice,
-	       jint trafficClass,
-	       jobject inetAddress)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	*message;
-  jbyte	nhostAddrBytes[HYSOCK_INADDR6_LEN];
-  int length;
-
-  U_16 nPort;
-  I_32 result =	0, sent	= 0;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  int flags;
-  U_32 scope_id	= 0;
-
-  netGetJavaNetInetAddressValue	(env, inetAddress, nhostAddrBytes, &length);
-  nPort	= hysock_htons ((U_16) targetPort);
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (length ==	HYSOCK_INADDR6_LEN)
-    {
-      netGetJavaNetInetAddressScopeId (env, inetAddress, &scope_id);
-      hysock_sockaddr_init6 (&sockaddrP, nhostAddrBytes, length,
-	   HYADDR_FAMILY_AFINET6, nPort,
-	   (trafficClass & 0xFF) << 20,	scope_id, socketP);
-    }
-  else
-    {
-      hysock_sockaddr_init6 (&sockaddrP, nhostAddrBytes, length,
-	   HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
-	   socketP);
-    }
-
-  flags	= HYSOCK_NOFLAGS;
-
-  message = hymem_allocate_memory ( msgLength);	
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  (*env)->GetByteArrayRegion (env, data, offset, msgLength, message);
-
-  do
-    {
-      socketP =	
-	getJavaIoFileDescriptorContentsAsAPointer (env,	fileDescriptor);
-      if (!hysock_socketIsValid	(socketP))
-	{
-	  hymem_free_memory ( message);	
-	  throwJavaNetSocketException (env,
-	    sent ==
-	    0 ?	HYPORT_ERROR_SOCKET_BADSOCKET :	
-	  HYPORT_ERROR_SOCKET_INTERRUPTED);
-	  return (jint)	0;
-	}
-      result =
-	hysock_writeto (socketP, message + sent, (I_32)	msgLength - sent,
-	flags, &sockaddrP);
-      if (result < 0)
-	break;
-      sent += result;
-    }
-  while	(sent <	msgLength);
-
-  hymem_free_memory ( message);	
-  if (result < 0)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      return (jint) result;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    sendConnectedDatagramImpl	
- * Signature: (Ljava/io/FileDescriptor;[BIIZ)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_sendConnectedDatagramImpl(JNIEnv *	env,
-		 jclass	
-		 thisClz,
-		 jobject
-		 fileDescriptor,
-		 jbyteArray
-		 data,
-		 jint offset,
-		 jint
-		 msgLength,
-		 jboolean
-		 bindToDevice)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	*message;
-  I_32 result =	0;
-  I_32 sent = 0;
-  hysocket_t socketP;
-  int flags = HYSOCK_NOFLAGS;
-
-  /* allocate a	local buffer into which	we will	copy the data to be sent and which we will use	
-     for the write call	*/
-  message = hymem_allocate_memory ( msgLength);	
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  (*env)->GetByteArrayRegion (env, data, offset, msgLength, message);
-
-  do
-    {
-      /* make sure the socket is still valid */	
-      socketP =	
-	(hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env,
-	fileDescriptor);
-      if (!hysock_socketIsValid	(socketP))
-	{
-	  throwJavaNetSocketException (env,
-	    sent ==
-	    0 ?	HYPORT_ERROR_SOCKET_BADSOCKET :	
-	  HYPORT_ERROR_SOCKET_INTERRUPTED);
-	  return (jint)	0;
-	}
-
-      /* try to	send the next block of data */
-      result =
-	hysock_write (socketP, message + sent, (I_32) msgLength	- sent,	
-	flags);	
-      if (result < 0)
-	{
-	  break;
-	}
-      sent += result;
-    }
-  while	(sent <	msgLength);
-
-  /* ok	free the buffer	and return the length sent or an exception as appropriate  */
-  hymem_free_memory ( message);	
-
-#if defined(LINUX)
-  if (result < 0)
-    {
-      if ((HYPORT_ERROR_SOCKET_CONNRESET == result)
-	|| (HYPORT_ERROR_SOCKET_CONNECTION_REFUSED == result))
-	{
-	  //throwJavaNetPortUnreachableException (env, result);
-	  return (jint)	0;
-	}
-      else
-	{
-	  throwJavaNetSocketException (env, result);
-	  return (jint)	0;
-	}
-    }
-  else
-    {
-      return (jint) result;
-    }
-#endif
-
-  if (result < 0)
-    {
-      if ((HYPORT_ERROR_SOCKET_CONNRESET == result)
-	|| (HYPORT_ERROR_SOCKET_CONNECTION_REFUSED == result))
-	{
-	  throwJavaNetPortUnreachableException (env, result);
-	  return (jint)	0;
-	}
-      else
-	{
-	  throwJavaNetSocketException (env, result);
-	  return (jint)	0;
-	}
-    }
-  else
-    {
-      return (jint) result;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    createServerStreamSocketImpl
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createServerStreamSocketImpl(JNIEnv *
-								  env,
-								  jclass
-								  thisClz,
-								  jobject
-								  thisObjFD,
-								  jboolean
-								  preferIPv4Stack)
-{
-  hysocket_t socketP;
-  createSocket (env, thisObjFD,	HYSOCK_STREAM, preferIPv4Stack);
-  socketP =
-    (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env, thisObjFD);
-  setDefaultServerSocketOptions	(env, socketP);	
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    createMulticastSocketImpl	
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createMulticastSocketImpl(JNIEnv *	
-		  env,
-		  jclass
-		  thisClz,
-		  jobject
-		  thisObjFD,
-		  jboolean
-		  preferIPv4Stack)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  BOOLEAN value	= TRUE;	
-  hysocket_t socketP;
-  createSocket (env, thisObjFD,	HYSOCK_DGRAM, preferIPv4Stack);	
-  socketP =
-    (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env, thisObjFD);
-
-  hysock_setopt_bool (socketP, HY_SOL_SOCKET, HY_SO_REUSEPORT, &value);	
-  hysock_setopt_bool (socketP, HY_SOL_SOCKET, HY_SO_REUSEADDR, &value);	
-}
-
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_connectStreamWithTimeoutSocketImpl(JNIEnv *
-		    env,
-		    jclass
-		    thisClz,
-		    jobject
-		    fileDescriptor,
-		    jint
-		    remotePort,	
-		    jint
-		    timeout,
-		    jint
-		    trafficClass,
-		    jobject
-		    inetAddress)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
-  int length;
-  U_16 nPort;
-  I_32 result;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  U_8 *context = NULL;
-  I_32 remainingTimeout	= timeout;
-  I_32 passedTimeout = 0;
-  UDATA	finishTime = 0;	
-  BOOLEAN hasTimeout = timeout > 0;
-  U_32 scope_id	= 0;
-
-  /* if	a timeout was specified	calculate the finish time value	*/
-  if (hasTimeout)
-    {
-      finishTime = hytime_msec_clock ()	+ (UDATA) timeout;
-    }
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  else
-    {
-      netGetJavaNetInetAddressValue (env, inetAddress, nAddrBytes, &length);
-      nPort = hysock_htons ((U_16) remotePort);	
-      if (length == HYSOCK_INADDR_LEN)
-	{
-	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, length,
-	    HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
-	    socketP);
-	}
-      else
-	{
-	  netGetJavaNetInetAddressScopeId (env,	inetAddress, &scope_id);
-	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, length,
-	    HYADDR_FAMILY_AFINET6, nPort,
-	    (trafficClass & 0xFF) << 20, scope_id,
-	    socketP);
-	}
-
-      result =
-	hysock_connect_with_timeout (socketP, &sockaddrP, 0,
-	HY_PORT_SOCKET_STEP_START, &context);
-      if (0 == result)
-	{
-	  /* ok	we connected right away	so we are done */
-	  hysock_connect_with_timeout (socketP,	&sockaddrP, 0,
-	    HY_PORT_SOCKET_STEP_DONE, &context);
-	  return;
-	}
-      else if (result != HYPORT_ERROR_SOCKET_NOTCONNECTED)
-	{
-	  /* we	got an error other than	NOTCONNECTED so	we cannot continue */
-	  if ((HYPORT_ERROR_SOCKET_CONNRESET ==	result)	||
-	    (HYPORT_ERROR_SOCKET_CONNECTION_REFUSED == result) ||
-	    (HYPORT_ERROR_SOCKET_ADDRNOTAVAIL == result) ||
-	    (HYPORT_ERROR_SOCKET_ADDRINUSE == result) ||
-	    (HYPORT_ERROR_SOCKET_ENETUNREACH ==	result)	||
-	    (HYPORT_ERROR_SOCKET_EACCES	== result))
-	    {
-	      hysock_connect_with_timeout (socketP, &sockaddrP,	
-		remainingTimeout,
-		HY_PORT_SOCKET_STEP_DONE,
-		&context);
-	      throwJavaNetConnectException (env, result);
-	      return;
-	    }
-	  else
-	    {
-	      hysock_connect_with_timeout (socketP, &sockaddrP,	0,
-		HY_PORT_SOCKET_STEP_DONE,
-		&context);
-	      throwJavaNetSocketException (env,	result);
-	      return;
-	    }
-	}
-
-      while (HYPORT_ERROR_SOCKET_NOTCONNECTED == result)
-	{
-	  passedTimeout	= remainingTimeout;
-
-	  /* ok	now try	and connect.  Depending	on the platform	this may sleep for up to passedTimeout milliseconds */
-	  result =
-	    hysock_connect_with_timeout	(socketP, &sockaddrP, passedTimeout,
-	    HY_PORT_SOCKET_STEP_CHECK, &context);
-
-	  /* now check if the socket is	still connected.  Do it	here as	some platforms seem to think they 
-	   * are connected if the socket is closed on them. */
-	  socketP =
-	    getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-	  if (!hysock_socketIsValid (socketP))
-	    {
-	      hysock_connect_with_timeout (socketP, &sockaddrP,	0,
-		HY_PORT_SOCKET_STEP_DONE,
-		&context);
-	      throwJavaNetSocketException (env,	
-		HYPORT_ERROR_SOCKET_BADSOCKET);	
-	      return;
-	    }
-
-	  /* check if we are now connected, if so we can finish	the process and	return */
-	  if (0	== result)
-	    {
-	      hysock_connect_with_timeout (socketP, &sockaddrP,	0,
-		HY_PORT_SOCKET_STEP_DONE,
-		&context);
-	      return;
-	    }
-
-	  /* if	the error is HYPORT_ERROR_SOCKET_NOTCONNECTED then we have not yet connected and we may	not be
-	  done yet */
-	  if (HYPORT_ERROR_SOCKET_NOTCONNECTED == result)
-	    {
-	      /* check if the timeout has expired */
-	      if (hasTimeout)
-		{
-		  remainingTimeout = finishTime	- hytime_msec_clock ();	
-		  if (remainingTimeout <= 0)
-		    {
-		      hysock_connect_with_timeout (socketP, &sockaddrP,	0,
-			HY_PORT_SOCKET_STEP_DONE,
-			&context);
-		      throwJavaNetSocketTimeoutException (env, result);	
-		      return;
-		    }
-		}
-	      else
-		{
-		  remainingTimeout = 100;
-		}
-	    }
-	  else
-	    {
-	      if ((HYPORT_ERROR_SOCKET_CONNRESET == result) ||
-		(HYPORT_ERROR_SOCKET_CONNECTION_REFUSED	== result) ||
-		(HYPORT_ERROR_SOCKET_ADDRNOTAVAIL == result) ||	
-		(HYPORT_ERROR_SOCKET_ADDRINUSE == result) ||
-		(HYPORT_ERROR_SOCKET_ENETUNREACH == result) ||
-		(HYPORT_ERROR_SOCKET_EACCES == result))	
-		{
-		  hysock_connect_with_timeout (socketP,	&sockaddrP,
-		    remainingTimeout,
-		    HY_PORT_SOCKET_STEP_DONE,
-		    &context);
-		  throwJavaNetConnectException (env, result);
-		  return;
-		}
-		else
-		{
-		  hysock_connect_with_timeout (socketP,	&sockaddrP,
-		    remainingTimeout,
-		    HY_PORT_SOCKET_STEP_DONE,
-		    &context);
-		  throwJavaNetSocketException (env, result);
-		  return;
-		}
-	    }
-	}
-    }
-}
-
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_sendDatagramImpl2 (JNIEnv * env,
-	      jclass thisClz,
-	      jobject fileDescriptor,
-	      jbyteArray data,
-	      jint offset, jint	msgLength,
-	      jint targetPort,
-	      jobject inetAddress)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  jbyte	*message;
-  jbyte	nhostAddrBytes[HYSOCK_INADDR6_LEN];
-  U_16 nPort;
-  I_32 result =	0, sent	= 0;
-  hysocket_t socketP;
-  hysockaddr_struct sockaddrP;
-  int length;
-  U_32 scope_id	= 0;
-
-  if (inetAddress != NULL)
-    {
-      netGetJavaNetInetAddressValue (env, inetAddress, nhostAddrBytes,
-	&length);
-
-      socketP =	
-	(hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env,
-	fileDescriptor);
-      nPort = hysock_htons ((U_16) targetPort);	
-      if (length == HYSOCK_INADDR_LEN)
-	{
-	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nhostAddrBytes, length,
-	    HYPROTOCOL_FAMILY_INET4, nPort, 0, scope_id,
-	    socketP);
-	}
-      else
-	{
-	  netGetJavaNetInetAddressScopeId (env,	inetAddress, &scope_id);
-	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nhostAddrBytes, length,
-	    HYPROTOCOL_FAMILY_INET6, nPort, 0, scope_id,
-	    socketP);
-	}
-    }
-
-  message = hymem_allocate_memory ( msgLength);	
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  (*env)->GetByteArrayRegion (env, data, offset, msgLength, message);
-  while	(sent <	msgLength)
-    {
-      socketP =	
-	(hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env,
-	fileDescriptor);
-      if (!hysock_socketIsValid	(socketP))
-	{
-	  hymem_free_memory ( message);	
-	  throwJavaNetSocketException (env,
-	    sent ==
-	    0 ?	HYPORT_ERROR_SOCKET_BADSOCKET :	
-	  HYPORT_ERROR_SOCKET_INTERRUPTED);
-	  return (jint)	0;
-	}
-      result =
-	hysock_writeto (socketP, (U_8 *) message + sent,
-	(I_32) msgLength - sent, HYSOCK_NOFLAGS, &sockaddrP);
-      if (result < 0)
-	break;
-      sent += result;
-    }
-  hymem_free_memory ( message);	
-  /**
-   * We	should always throw an exception if all	the data cannot	be sent	because	Java methods
-   * assume all	the data will be sent or an error occurs.
-   */
-  if (result < 0)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      return (jint) sent;
-    }
-}
-
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_receiveStreamImpl(JNIEnv *	env, jclass thisClz,
-	      jobject fileDescriptor,
-	      jbyteArray data, jint offset,
-	      jint count, jint timeout)	
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-  jbyte	*message;
-  I_32 result, localCount;
-
-/* TODO: ARRAY PINNING */
-#define	INTERNAL_RECEIVE_BUFFER_MAX 2048
-  U_8 internalBuffer[INTERNAL_RECEIVE_BUFFER_MAX];
-
-  result = pollSelectRead (env,	fileDescriptor,	timeout, TRUE);	
-  if (0	> result)
-    return (jint) 0;
-
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, fileDescriptor);
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return (jint) 0;
-    }
-
-  localCount = (count <	65536) ? count : 65536;	
-
-  if (localCount > INTERNAL_RECEIVE_BUFFER_MAX)	
-    {
-      message =	hymem_allocate_memory (	localCount);
-    }
-  else
-    {
-      message =	internalBuffer;	
-    }
-
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  result =
-    hysock_read	(hysocketP, (U_8 *) message, localCount, HYSOCK_NOFLAGS);
-  if (result > 0)
-    (*env)->SetByteArrayRegion (env, data, offset, result, message);
-
-  if (((U_8 *)message) != internalBuffer)
-    {
-      hymem_free_memory	( message);
-    }
-#undef INTERNAL_MAX
-
-  /* If	no bytes are read, return -1 to	signal 'endOfFile' to the Java input stream */
-  if (0	< result)
-    {
-      return (jint) result;
-    }
-  else if (0 ==	result)	
-    {
-      return (jint) - 1;
-    }
-  else
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-}
-
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_sendStreamImpl(JNIEnv * env, jclass thisClz,
-	   jobject fileDescriptor,
-	   jbyteArray data, jint offset,
-	   jint	count)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t socketP;
-  jbyte	*message;
-  I_32 result =	0, sent	= 0;
-
-/* TODO: ARRAY PINNING */
-#define	INTERNAL_SEND_BUFFER_MAX 512
-  U_8 internalBuffer[INTERNAL_SEND_BUFFER_MAX];	
-
-  if (count > INTERNAL_SEND_BUFFER_MAX)	
-    {
-      message =	hymem_allocate_memory (	count);	
-    }
-  else
-    {
-      message =	internalBuffer;	
-    }
-
-  if (message == NULL)
-    {
-      throwNewOutOfMemoryError (env, "");
-      return 0;	
-    }
-  (*env)->GetByteArrayRegion (env, data, offset, count,	message);
-  while	(sent <	count)
-    {
-      socketP =	
-	getJavaIoFileDescriptorContentsAsAPointer (env,	fileDescriptor);
-      if (!hysock_socketIsValid	(socketP))
-	{
-	  if (((U_8 *)message) != internalBuffer)
-	    {
-	      hymem_free_memory	( message);
-	    }
-
-	  throwJavaNetSocketException (env,
-	    sent ==
-	    0 ?	HYPORT_ERROR_SOCKET_BADSOCKET :	
-	  HYPORT_ERROR_SOCKET_INTERRUPTED);
-	  return (jint)	0;
-	}
-      result =
-	hysock_write (socketP, (U_8 *) message + sent, (I_32) count - sent,
-	HYSOCK_NOFLAGS);
-      if (result < 0)
-	break;
-      sent += result;
-    }
-  if (((U_8 *)message) != internalBuffer)
-    {
-      hymem_free_memory	( message);
-    }
-#undef INTERNAL_MAX
-
-  /**
-   * We	should always throw an exception if all	the data cannot	be sent	because	Java methods
-   * assume all	the data will be sent or an error occurs.
-   */
-  if (result < 0)
-    {
-      throwJavaNetSocketException (env,	result);
-      return (jint) 0;
-    }
-  else
-    {
-      return (jint) sent;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    shutdownInputImpl	
- * Signature: (Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_shutdownInputImpl(JNIEnv *	env, jclass thisClz,
-	      jobject fileDescriptor)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  hysocket_t socketP;
-
-  socketP =
-    (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env,
-		 fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  result = hysock_shutdown_input (socketP);
-  if (0	!= result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    shutdownOutputImpl
- * Signature: (Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_shutdownOutputImpl(JNIEnv * env, jclass thisClz,
-	       jobject fileDescriptor)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  hysocket_t socketP;
-
-  socketP =
-    (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env,
-		 fileDescriptor);
-  if (!hysock_socketIsValid (socketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  result = hysock_shutdown_output (socketP);
-  if (0	!= result)
-    {
-      throwJavaNetSocketException (env,	result);
-      return;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    acceptStreamSocketImpl
- * Signature: (Ljava/io/FileDescriptor;Ljava/net/SocketImpl;Ljava/io/FileDescriptor;I)V	
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_acceptStreamSocketImpl(JNIEnv * env, jclass thisClz,
-	     jobject fileDescriptorServer,
-	     jobject socketImpl,
-	     jobject
-	     fileDescriptorSocketImpl,
-	     jint timeout)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  hysocket_t socketS, socketNew;
-  hysockaddr_struct sockaddrP;
-  jbyte	nlocalAddrBytes[HYSOCK_INADDR6_LEN];
-
-  result = pollSelectRead (env,	fileDescriptorServer, timeout, TRUE);
-  if (0	> result)
-    return;
-
-  socketS =
-    getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptorServer);
-  if (!hysock_socketIsValid (socketS))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-
-  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nlocalAddrBytes,
-       HYSOCK_INADDR_LEN, HYADDR_FAMILY_AFINET4, 0, 0, 0,
-       socketS);
-
-  result = hysock_accept (socketS, &sockaddrP, &socketNew);
-  if (0	!= result)
-    {
-      throwJavaNetBindException	(env, result);
-    }
-  else
-    {
-      updateSocket (env, &sockaddrP, socketNew,	socketImpl,
-	fileDescriptorSocketImpl);
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    createStreamSocketImpl
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createStreamSocketImpl(JNIEnv * env, jclass thisClz,
-	     jobject thisObjFD,	
-	     jboolean preferIPv4Stack)
-{
-  hysocket_t socketP;
-  createSocket (env, thisObjFD,	HYSOCK_STREAM, preferIPv4Stack);
-  socketP =
-    (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer (env, thisObjFD);
-  setPlatformBindOptions (env, socketP);
-}
-
-
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    selectImpl
- * Signature: ([Ljava/io/FileDescriptor;[Ljava/io/FileDescriptor;II[IJ)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_selectImpl	
-  (JNIEnv * env, jclass	thisClz, jobjectArray readFDArray, jobjectArray	writeFDArray,
-   jint	countReadC, jint countWriteC, jintArray	outFlags, jlong	timeout){
-  PORT_ACCESS_FROM_ENV (env);
-  hytimeval_struct timeP;	
-  I_32 result =	0;		
-  I_32 size = 0;		
-  jobject gotFD;		
-  hyfdset_t fdset_read,fdset_write;
-  hysocket_t hysocketP;		
-  jboolean isCopy ;
-  jint *flagArray;
-  int val;
-
-  fdset_read = hymem_allocate_memory(sizeof (struct hyfdset_struct));
-  fdset_write =	hymem_allocate_memory(sizeof (struct hyfdset_struct));
-  
-  FD_ZERO (&fdset_read->handle);
-  FD_ZERO (&fdset_write->handle);
-  for (val = 0; val<countReadC; val++){
-	  gotFD	= (*env)->GetObjectArrayElement(env,readFDArray,val);
-	  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, gotFD);
-	  /*No difference between ipv4 and ipv6 as in windows*/
-		FD_SET (hysocketP->sock, &fdset_read->handle);
-		if (0 >	(size -	hysocketP->sock))
-			size = hysocketP->sock;		
-	}
-  for (val = 0; val<countWriteC; val++){
-	  gotFD	= (*env)->GetObjectArrayElement(env,writeFDArray,val);
-	  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, gotFD);
-	  /*No difference between ipv4 and ipv6 as in windows*/
-	  FD_SET (hysocketP->sock, &fdset_write->handle);	
-		if (0 >	(size -	hysocketP->sock))
-			size = hysocketP->sock;	
-	}
-  /* the size is the max_fd + 1	*/
-  size =size + 1;
-
-  if (0	> size)	
-    {
-      result = HYPORT_ERROR_SOCKET_FDSET_SIZEBAD;
-    }
-  else
-    {
-      /* only set when timeout >= 0 (non-block)*/
-      if (0 <= timeout){
-	hysock_timeval_init ( 0, (I_32)timeout,	&timeP);
-	result = hysock_select (size, fdset_read, fdset_write, NULL,&timeP);
-      }	
-      else{
-	result = hysock_select (size, fdset_read, fdset_write, NULL,NULL);
-      }	
-    }
-    
-  if (0	< result){
-	  /*output the reslut to a int array*/
-	  flagArray = (*env)->GetIntArrayElements(env,outFlags,	&isCopy);
-	  for (val=0;val<countReadC;val++){
-		gotFD =	(*env)->GetObjectArrayElement(env,readFDArray,val);
-		hysocketP = getJavaIoFileDescriptorContentsAsAPointer (env, gotFD);
-		if (FD_ISSET(hysocketP->sock,&fdset_read->handle))
-			flagArray[val] = SOCKET_OP_READ;
-		else
-			flagArray[val] = SOCKET_OP_NONE;
-
-	 }
-		
-	  for (val=0;val<countWriteC;val++){
-		gotFD =	(*env)->GetObjectArrayElement(env,writeFDArray,val);
-		hysocketP = getJavaIoFileDescriptorContentsAsAPointer (env, gotFD);
-		if (FD_ISSET(hysocketP->sock,&fdset_write->handle))
-			flagArray[val+countReadC] = SOCKET_OP_WRITE;
-		else
-			flagArray[val+countReadC] = SOCKET_OP_NONE;
-
-		}
-	(*env)->ReleaseIntArrayElements(env,outFlags, flagArray, 0); 
-  }
-  hymem_free_memory(fdset_write);
-  hymem_free_memory(fdset_read);
-  /* return both correct and error result, let java code handle	the exception*/
-  return result;
-};
-
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    getSocketLocalAddressImpl	
- * Signature: (Ljava/io/FileDescriptor;Z)Ljava/net/InetAddress;	
- */
-JNIEXPORT jobject JNICALL Java_com_ibm_platform_OSNetworkSystem_getSocketLocalAddressImpl(JNIEnv * env,	jclass thisClz,	
-	    jobject fileDescriptor,
-	    jboolean preferIPv6Addresses)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  hysockaddr_struct sockaddrP;
-  jbyte	byte_array[HYSOCK_INADDR6_LEN];	
-  U_32 length;
-  U_32 scope_id	= 0;
-  memset (byte_array, 0, HYSOCK_INADDR6_LEN);
-
-  result =
-    netGetSockAddr (env, fileDescriptor, &sockaddrP, preferIPv6Addresses);
-  if (0	!= result)
-    {
-      return newJavaNetInetAddressGenericB (env, byte_array,
-	      HYSOCK_INADDR_LEN, 0);
-      /*The Java spec allows no	exception on this call */
-    }
-  else
-    {
-      hysock_sockaddr_address6 (&sockaddrP, byte_array,	&length, &scope_id);
-      /* Cannot	call gethostbyaddr since it is not reentrant on	some OS's */
-      return newJavaNetInetAddressGenericB (env, byte_array, length,
-	      scope_id);
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    getSocketLocalPortImpl
- * Signature: (Ljava/io/FileDescriptor;Z)I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_getSocketLocalPortImpl(JNIEnv * env, jclass thisClz,
-	       jobject fileDescriptor,
-	       jboolean	preferIPv6Addresses)
-  {
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  hysockaddr_struct sockaddrP;
-  U_16 nPort, hPort;
-
-  result =
-    netGetSockAddr (env, fileDescriptor, &sockaddrP, preferIPv6Addresses);
-  if (0	!= result)
-    {
-      return (jint) 0;	  /* The java spec does	not indicate any exceptions on this call */
-    }
-  else
-    {
-      nPort = hysock_sockaddr_port (&sockaddrP);
-      hPort = hysock_ntohs (nPort);
-      return (jint) hPort;
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    getSocketOptionImpl
- * Signature: (Ljava/io/FileDescriptor;I)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_com_ibm_platform_OSNetworkSystem_getSocketOptionImpl(JNIEnv * env, jclass thisClz,
-	    jobject aFileDescriptor,
-	    jint anOption)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, aFileDescriptor);	
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return NULL;
-    }
-  switch ((I_32) anOption & 0xffff)
-    {
-      case JAVASOCKOPT_SO_LINGER:
-	return getLingerOption (env, hysocketP);
-      case JAVASOCKOPT_TCP_NODELAY:
-	if ((anOption >> 16) & BROKEN_TCP_NODELAY)
-	  return NULL;
-	return getBooleanValue (env, hysocketP,	HY_IPPROTO_TCP,	HY_TCP_NODELAY);
-      case JAVASOCKOPT_MCAST_TTL:
-	if ((anOption >> 16) & BROKEN_MULTICAST_TTL)
-	  return newJavaLangByte (env, 0);
-	return getByteSocketOption (env, hysocketP, HY_MCAST_TTL);
-      case JAVASOCKOPT_MCAST_INTERFACE:	
-	if ((anOption >> 16) & BROKEN_MULTICAST_IF)
-	  return NULL;
-	return getMcastInterface (env, hysocketP);
-      case JAVASOCKOPT_IP_MULTICAST_IF2:
-	return getIPV6McastInterface (env, hysocketP);
-      case JAVASOCKOPT_SO_SNDBUF:
-	return getSendBufferSize (env, hysocketP);
-      case JAVASOCKOPT_SO_RCVBUF:
-	return getReceiveBufferSize (env, hysocketP);
-      case JAVASOCKOPT_SO_BROADCAST:
-	return getBooleanValue (env, hysocketP,	HY_SOL_SOCKET, HY_SO_BROADCAST);
-      case JAVASOCKOPT_SO_REUSEADDR:
-	return getBooleanValue (env, hysocketP,	HY_SOL_SOCKET, HY_SO_REUSEADDR);
-      case JAVASOCKOPT_SO_REUSEPORT:
-	return getBooleanValue (env, hysocketP,	HY_SOL_SOCKET, HY_SO_REUSEPORT);
-      case JAVASOCKOPT_SO_KEEPALIVE:
-	return getBooleanValue (env, hysocketP,	HY_SOL_SOCKET, HY_SO_KEEPALIVE);
-      case JAVASOCKOPT_SO_OOBINLINE:
-	return getBooleanValue (env, hysocketP,	HY_SOL_SOCKET, HY_SO_OOBINLINE);
-      case JAVASOCKOPT_IP_MULTICAST_LOOP:
-	return getBooleanValue (env, hysocketP,	HY_IPPROTO_IP,
-	  HY_IP_MULTICAST_LOOP);
-      case JAVASOCKOPT_IP_TOS:
-	return getIntegerValue (env, hysocketP,	HY_IPPROTO_IP, HY_IP_TOS);
-
-      default:
-	throwJavaNetSocketException (env, HYPORT_ERROR_SOCKET_OPTUNSUPP);
-	return NULL;
-    }
-}
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    setSocketOptionImpl
- * Signature: (Ljava/io/FileDescriptor;ILjava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_setSocketOptionImpl(JNIEnv	* env, jclass thisClz,
-	    jobject aFileDescriptor,
-	    jint anOption, jobject aValue)
-  {
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t hysocketP;	
-
-  hysocketP = getJavaIoFileDescriptorContentsAsAPointer	(env, aFileDescriptor);	
-  if (!hysock_socketIsValid (hysocketP))
-    {
-      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
-      return;
-    }
-  switch ((I_32) anOption & 0xffff)
-    {
-      case JAVASOCKOPT_SO_LINGER:
-	setLingerOption	(env, hysocketP, aValue);
-	break;
-      case JAVASOCKOPT_TCP_NODELAY:
-	if ((anOption >> 16) & BROKEN_TCP_NODELAY)
-	  return;
-	setBoolSocketOption (env, hysocketP, HY_IPPROTO_TCP, HY_TCP_NODELAY,
-	  aValue);
-	break;
-      case JAVASOCKOPT_MCAST_TTL:
-	if ((anOption >> 16) & BROKEN_MULTICAST_TTL)
-	  return;
-	setByteSocketOption (env, hysocketP, HY_MCAST_TTL, aValue);
-	break;
-      case JAVASOCKOPT_MCAST_ADD_MEMBERSHIP:
-	mcastAddMembership (env, hysocketP, aValue,
-	  (anOption >> 16) & BROKEN_MULTICAST_IF);
-	break;
-      case JAVASOCKOPT_MCAST_DROP_MEMBERSHIP:
-	mcastDropMembership (env, hysocketP, aValue,
-	  (anOption >> 16) & BROKEN_MULTICAST_IF);
-	break;
-      case JAVASOCKOPT_MCAST_INTERFACE:	
-	if ((anOption >> 16) & BROKEN_MULTICAST_IF)
-	  return;
-	setMcastInterface (env,	hysocketP, aValue);
-	break;
-      case JAVASOCKOPT_IP_MULTICAST_IF2:
-	setIPV6McastInterface (env, hysocketP, aValue);	
-	break;
-      case JAVASOCKOPT_SO_SNDBUF:
-	setSendBufferSize (env,	hysocketP, aValue);
-	break;
-      case JAVASOCKOPT_SO_RCVBUF:
-	setReceiveBufferSize (env, hysocketP, aValue);
-	break;
-      case JAVASOCKOPT_SO_BROADCAST:
-	setBoolSocketOption (env, hysocketP, HY_SOL_SOCKET, HY_SO_BROADCAST,
-	  aValue);
-	break;
-      case JAVASOCKOPT_SO_REUSEADDR:
-	setBoolSocketOption (env, hysocketP, HY_SOL_SOCKET, HY_SO_REUSEADDR,
-	  aValue);
-	break;
-      case JAVASOCKOPT_SO_REUSEPORT:
-	setBoolSocketOption (env, hysocketP, HY_SOL_SOCKET, HY_SO_REUSEPORT,
-	  aValue);
-	break;
-      case JAVASOCKOPT_SO_KEEPALIVE:
-	setBoolSocketOption (env, hysocketP, HY_SOL_SOCKET, HY_SO_KEEPALIVE,
-	  aValue);
-	break;
-      case JAVASOCKOPT_SO_OOBINLINE:
-	setBoolSocketOption (env, hysocketP, HY_SOL_SOCKET, HY_SO_OOBINLINE,
-	  aValue);
-	break;
-      case JAVASOCKOPT_IP_MULTICAST_LOOP:
-	setBoolSocketOption (env, hysocketP, HY_IPPROTO_IP,
-	  HY_IP_MULTICAST_LOOP,	aValue);
-	break;
-      case JAVASOCKOPT_IP_TOS:
-	setIntegerSocketOption (env, hysocketP,	HY_IPPROTO_IP, HY_IP_TOS,
-	  aValue);
-	break;
-      case JAVASOCKOPT_REUSEADDR_AND_REUSEPORT:	
-	setReuseAddrAndReusePort (env, hysocketP, aValue);
-	break;
-
-      default:
-	throwJavaNetSocketException (env, HYPORT_ERROR_SOCKET_OPTUNSUPP);
-    }
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    getSocketFlags
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_getSocketFlagsImpl	
-  (JNIEnv * env, jclass	thisClz)
-{
-  /* Return the	flags indicating the socket state to save in the class library.	*/
-  /* 1 - Multicast interface */	
-  /* 2 - Multicast TTL */
-  /* 4 - Socket	TCP_NODELAY */
-  /* 8 - Calling shutdown output before	close when SO_LINGER is	set */
-
-  return 0;
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    socketCloseImpl
- * Signature: (Ljava/io/FileDescriptor;)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_socketCloseImpl(JNIEnv * env, jclass thisClz,
-	      jobject fileDescriptor)
-  {
-  PORT_ACCESS_FROM_ENV (env);
-  hysocket_t socketP;
-  I_32 result =	0;
-
-  socketP = getJavaIoFileDescriptorContentsAsAPointer (env, fileDescriptor);
-  if (hysock_socketIsValid (socketP))
-    {
-      /* Set the file descriptor before	closing	so the select polling loop will	terminate. */
-      /* Some platforms	wait in	the socket close. */
-      setJavaIoFileDescriptorContents (env, fileDescriptor,
-	    (void *) -1);
-      result= hysock_close (&socketP);     
-    }   	
-}
-
-JNIEXPORT jobject JNICALL Java_com_ibm_platform_OSNetworkSystem_getHostByAddrImpl(JNIEnv * env,	jclass clazz,
-	       jbyteArray addr)	
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result =	0;
-  hysockaddr_struct in_addr;
-  U_32 length;
-  char hostName[OSNIMAXHOST];
-  jbyte	ipaddr[HYSOCK_INADDR6_LEN];
-  int address_family = HYADDR_FAMILY_AFINET4;
-  length = (*env)->GetArrayLength (env,	addr);
-
-  /* If	it's a valid length for	an IP address then do the work */
-  if (length ==	HYSOCK_INADDR6_LEN || length ==	HYSOCK_INADDR_LEN)
-    {
-      if (length == HYSOCK_INADDR6_LEN)	
-	{
-	  address_family = HYADDR_FAMILY_AFINET6;
-	}
-
-      (*env)->GetByteArrayRegion (env, addr, 0,	length,	ipaddr);
-      hysock_sockaddr_init6 (&in_addr, (U_8 *) ipaddr, length,
-	(I_16) address_family, 0, 0, 0,	NULL);
-      result =
-	hysock_getnameinfo (&in_addr, sizeof (in_addr.addr), hostName,
-	OSNIMAXHOST, 0);
-      if (0 == result)
-	{
-	  return newJavaNetInetAddressGenericBS	(env, ipaddr, length,
-	    hostName, 0);
-	}
-    }
-
-  throwJavaNetUnknownHostException (env, result);
-  return NULL;
-}
-
-JNIEXPORT jobject JNICALL Java_com_ibm_platform_OSNetworkSystem_getHostByNameImpl(JNIEnv * env,	jclass clazz,
-	       jstring aName,
-	       jboolean	preferIPv6Addresses)
-{
-  PORT_ACCESS_FROM_ENV (env);
-  I_32 result;
-  jbyte	nipAddr[HYSOCK_INADDR6_LEN];
-  jobject inetA;
-  const	char *str = (*env)->GetStringUTFChars (env, aName, 0);
-  hyaddrinfo_struct addrinfo;
-  hyaddrinfo_t hints;
-  U_32 length =	0;
-  I_32 family;
-  U_32 scope_id	= 0;
-  I_32 i = 0;
-  I_32 addrLength = 0;
-  BOOLEAN preferIPv4StackValue = preferIPv4Stack (env);	
-
-  if (NULL == str)
-    {
-      return NULL;
-    }
-  if (!preferIPv4StackValue)
-    {
-      hysock_getaddrinfo_create_hints (&hints, (I_16) HYADDR_FAMILY_UNSPEC, 0,
-	       HYPROTOCOL_FAMILY_UNSPEC, 0);
-    }
-  else
-    {
-      hysock_getaddrinfo_create_hints (&hints, (I_16) HYADDR_FAMILY_AFINET4,
-	       0, HYPROTOCOL_FAMILY_UNSPEC, 0);	
-    }
-  result = hysock_getaddrinfo ((char *)	str, hints, &addrinfo);	
-
-  if (result !=	0)
-    {
-      (*env)->ReleaseStringUTFChars (env, aName, str);
-      throwJavaNetUnknownHostException (env, result);
-      return NULL;
-    }
-
-  /* now loop through the addresses returned and return	the first one that matches the preference indicated */
-  hysock_getaddrinfo_length (&addrinfo,	&addrLength);
-  for (i = 0; i	< addrLength; i++)
-    {
-      hysock_getaddrinfo_family	(&addrinfo, &family, i);
-      if (((family == HYADDR_FAMILY_AFINET4)
-	&& ((preferIPv6Addresses == FALSE) || preferIPv4StackValue))
-	|| ((family == HYADDR_FAMILY_AFINET6)
-	&& (preferIPv6Addresses	== TRUE) && (!preferIPv4StackValue)))
-	{
-	  /* ok	found one that matches the preference so get the required info */
-	  hysock_getaddrinfo_address (&addrinfo, (U_8 *) nipAddr, i,
-	    &scope_id);	
-	  break;
-	}
-    }
-
-  /* check if there was	no match for the preferIPv6Addresses.  If not just return the first one	*/
-  if (i	== addrLength)
-    {
-      hysock_getaddrinfo_family	(&addrinfo, &family, 0);
-      hysock_getaddrinfo_address (&addrinfo, (U_8 *) nipAddr, 0, &scope_id);
-    }
-
-  hysock_freeaddrinfo (&addrinfo);
-
-  length =
-    (family ==
-     HYPROTOCOL_FAMILY_INET4) ?	HYSOCK_INADDR_LEN : HYSOCK_INADDR6_LEN;	
-
-  inetA	=
-    newJavaNetInetAddressGenericBS (env, nipAddr, length, (char	*) str,	
-	    scope_id);
-
-  (*env)->ReleaseStringUTFChars	(env, aName, str);
-  return inetA;	
-}
-
-/*
- * Class:     com_ibm_platform_OSNetworkSystem
- * Method:    setInetAddressImpl
- * Signature: (Ljava/net/InetAddress;[B)V
- */
-JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_setInetAddressImpl	
-  (JNIEnv *env,	jobject	thisClz, jobject sender, jbyteArray address){
-   PORT_ACCESS_FROM_ENV	(env);
-   I_8 * passAddr = NULL;
-   jbyteArray addr_array =    (jbyteArray) ((*env)->GetObjectField (env, getJavaNetInetAddressClass(env),
-	    getJavaNetInetAddressIpaddress(env)));
-   I_32	length = (*env)->GetArrayLength	(env, address);	
-   addr_array =	(*env)->NewByteArray(env, (jsize) length);
-   (*env)->GetByteArrayRegion (env, address, 0,	length,	passAddr);
-   (*env)->SetByteArrayRegion (env, addr_array,	0, length, passAddr);
-}
-
+/* Copyright 1998, 2005	The Apache Software Foundation or its licensors, as applicable
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this	file except in compliance with the License.
+ * You may obtain a copy of the	License	at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or	agreed to in writing, software
+ * distributed under the License is distributed	on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either	express	or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "OSNetworkSystem.h"
+#include "helpers.h"
+#include "jcl.h"
+#include "nethelp.h"
+#include "jclprots.h"
+#include "portsock.h"
+#include "socket.h"
+#include "jclglob.h"
+
+
+void * getConnectContext(JNIEnv	*env,jobject longclass);
+void setConnectContext(JNIEnv *env,jobject longclass,U_8 * context);
+
+/**
+ * A helper method, to set the connect context to a Long object.
+ *
+ * @param env		pointer	to the JNI library
+ * @param longclass	Java Long Object
+ */
+void
+setConnectContext(JNIEnv *env,jobject longclass,U_8 * context){	
+  jclass descriptorCLS;	
+  jfieldID descriptorFID;
+  descriptorCLS	= (*env)->FindClass (env, "java/lang/Long");
+  descriptorFID	= (*env)->GetFieldID (env, descriptorCLS, "value","J");	
+  (*env)->SetLongField(env,longclass,descriptorFID,(jlong)context);
+};
+
+/**
+ * A helper method, to get the connect context.	
+ *
+ * @param env		pointer	to the JNI library
+ * @param longclass	Java Long Object
+ */
+void *
+getConnectContext(JNIEnv *env,jobject longclass){
+  jclass descriptorCLS;	
+  jfieldID descriptorFID;
+  void * retConnectContext;
+  descriptorCLS	= (*env)->FindClass (env, "java/lang/Long");
+  descriptorFID	= (*env)->GetFieldID (env, descriptorCLS, "value", "J");
+  retConnectContext = (void *) ((*env)->GetLongField (env, longclass, descriptorFID));
+  return retConnectContext;
+}
+
+/*----------------------former cache get/set ------------------------------------
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    oneTimeInitializationDatagram
+ * Signature: (Z)V
+ */
+ /*
+JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_oneTimeInitializationDatagram(JNIEnv * env,
+		   jclass clazz,
+		   jboolean
+		   ipv6support)	
+{
+  jclass lookupClass;
+  jfieldID fid;	
+
+  netInitializeIDCaches	(env, ipv6support);
+
+  lookupClass =	(*env)->FindClass (env,	"java/net/DatagramPacket");
+  if (!lookupClass)
+    return;
+
+  fid =	
+    (*env)->GetFieldID (env, lookupClass, "address",
+      "Ljava/net/InetAddress;");
+  if (!fid)
+    return;
+  JCL_CACHE_SET	(env, FID_java_net_DatagramPacket_address, fid);
+
+  fid =	(*env)->GetFieldID (env, lookupClass, "length",	"I");
+  if (!fid)
+    return;
+  JCL_CACHE_SET	(env, FID_java_net_DatagramPacket_length, fid);	
+
+  fid =	(*env)->GetFieldID (env, lookupClass, "port", "I");
+  if (!fid)
+    return;
+  JCL_CACHE_SET	(env, FID_java_net_DatagramPacket_port,	fid);
+}
+*/
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    oneTimeInitializationSocket
+ * Signature: (Z)V
+ */
+ /*
+JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_oneTimeInitializationSocket(JNIEnv	* env, jclass clazz,
+	    jboolean jcl_supports_ipv6)	
+{
+  jfieldID fid;	
+  jclass lookupClass;
+  //netInitializeIDCaches (env,	jcl_supports_ipv6);
+
+  lookupClass =	(*env)->FindClass (env,	"java/net/SocketImpl");	
+  if (!lookupClass)
+    return;
+
+  fid =	(*env)->GetFieldID (env, lookupClass, "address", "Ljava/net/InetAddress;");
+  if (!fid)
+    return;
+  //JCL_CACHE_SET (env,	FID_java_net_SocketImpl_address, fid);
+
+  fid =	(*env)->GetFieldID (env, lookupClass, "port", "I");
+  if (!fid)
+    return;
+  //JCL_CACHE_SET (env,	FID_java_net_SocketImpl_port, fid);
+}
+*/
+
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    createSocketImpl
+ * Signature: (Ljava/io/FileDescriptor;Z)V
+ */
+JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createSocketImpl(JNIEnv * env,
+	      jclass thisClz,
+	      jobject thisObjFD,
+	      jboolean
+	      preferIPv4Stack)
+{
+  createSocket (env, thisObjFD,	HYSOCK_STREAM, preferIPv4Stack);
+}
+
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    createDatagramImpl
+ * Signature: (Ljava/io/FileDescriptor;Z)V
+ */
+JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_createDatagramSocketImpl(JNIEnv * env,
+		jclass
+		thisClz,
+		jobject	
+		thisObjFD,
+		jboolean
+		preferIPv4Stack)
+{
+  createSocket (env, thisObjFD,	HYSOCK_DGRAM, preferIPv4Stack);	
+}
+
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    readSocketImpl
+ * Signature: (Ljava/io/FileDescriptor;[BIII)I
+ */
+JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_readSocketImpl(JNIEnv * env, jclass thisClz,
+	      jobject fileDescriptor,
+	      jbyteArray data, jint offset,
+	      jint count, jint timeout)	
+{
+  PORT_ACCESS_FROM_ENV (env);
+  hysocket_t hysocketP;	
+  jbyte	*message;
+  I_32 result, localCount;
+
+/* TODO: ARRAY PINNING */
+#define	INTERNAL_RECEIVE_BUFFER_MAX 2048
+  U_8 internalBuffer[INTERNAL_RECEIVE_BUFFER_MAX];
+
+  hysocketP =getJavaIoFileDescriptorContentsAsPointer (env, fileDescriptor);
+
+  /*----------------the older form,nearly the same with below------------
+  //result = pollSelectRead (env, fileDescriptor, timeout, TRUE);
+  */
+  result = selectRead (env,hysocketP, timeout, FALSE);	    
+  if (0	>= result)
+	return (jint) 0;
+
+
+  if (!hysock_socketIsValid (hysocketP))
+    {
+      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
+      return (jint) 0;
+    }
+
+  localCount = (count <	65536) ? count : 65536;	
+
+  if (localCount > INTERNAL_RECEIVE_BUFFER_MAX)	
+    {
+      message =	hymem_allocate_memory (localCount);
+    }
+  else
+    {
+      message =	internalBuffer;	
+    }
+
+  if (message == NULL)
+    {
+      throwNewOutOfMemoryError (env, "");
+      return 0;	
+    }
+
+  result = hysock_read (hysocketP, (U_8 *) message, localCount, HYSOCK_NOFLAGS);
+
+  if (result > 0)
+    (*env)->SetByteArrayRegion (env, data, offset, result, (U_8 *)message);
+
+  if (((U_8 *)message) != internalBuffer)
+    {
+      hymem_free_memory	((U_8 *)message);
+    }
+#undef INTERNAL_MAX
+
+  /* If	no bytes are read, return -1 to	signal 'endOfFile' to the Java input stream */
+  if (0	< result)
+    {
+      return (jint) result;
+    }
+  else if (0 ==	result)	
+    {
+      return (jint) - 1;
+    }
+  else
+    {
+      throwJavaNetSocketException (env,	result);
+      return (jint) 0;
+    }
+}
+
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    writeSocketImpl
+ * Signature: (Ljava/io/FileDescriptor;[BII)I
+ */
+JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_writeSocketImpl(JNIEnv * env, jclass thisClz,
+	   jobject fileDescriptor,
+	   jbyteArray data, jint offset,
+	   jint	count)
+{
+  PORT_ACCESS_FROM_ENV (env);
+  hysocket_t socketP;
+  jbyte	*message;
+  I_32 result =	0, sent	= 0;
+
+/* TODO: ARRAY PINNING */
+#define	INTERNAL_SEND_BUFFER_MAX 512
+  U_8 internalBuffer[INTERNAL_SEND_BUFFER_MAX];	
+
+  if (count > INTERNAL_SEND_BUFFER_MAX)	
+    {
+      message =	hymem_allocate_memory (count);
+    }
+  else
+    {
+      message =	internalBuffer;	
+    }
+
+  if (message == NULL)
+    {
+      throwNewOutOfMemoryError (env, "");
+      return 0;	
+    }
+  (*env)->GetByteArrayRegion (env, data, offset, count,	message);
+  while	(sent <	count)
+    {
+      socketP =	
+	getJavaIoFileDescriptorContentsAsPointer (env,	fileDescriptor);
+      if (!hysock_socketIsValid	(socketP))
+	{
+	  if (((U_8 *)message) != internalBuffer)
+	    {
+	      hymem_free_memory	(message);
+	    }
+
+	  throwJavaNetSocketException (env,
+	    sent ==
+	    0 ?	HYPORT_ERROR_SOCKET_BADSOCKET :	
+	  HYPORT_ERROR_SOCKET_INTERRUPTED);
+	  return (jint)	0;
+	}
+      result =
+	hysock_write (socketP, (U_8 *) message + sent, (I_32) count - sent,
+	HYSOCK_NOFLAGS);
+      if (result < 0)
+	break;
+      sent += result;
+    }
+  if ((U_8 *)message != internalBuffer)
+    {
+      hymem_free_memory	(message);
+    }
+#undef INTERNAL_MAX
+
+  /**
+   * We	should always throw an exception if all	the data cannot	be sent	because	Java methods
+   * assume all	the data will be sent or an error occurs.
+   */
+  if (result < 0)
+    {
+      throwJavaNetSocketException (env,	result);
+      return (jint) 0;
+    }
+  else
+    {
+      return (jint) sent;
+    }
+}
+
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    setNonBlockingImpl
+ * Signature: (Ljava/io/FileDescriptor;Z)V
+ */
+JNIEXPORT void JNICALL Java_com_ibm_platform_OSNetworkSystem_setNonBlockingImpl	 (JNIEnv * env,	
+	  jclass fileDescriptor,jobject	afd,
+	  jboolean nonblocking)	
+{
+	PORT_ACCESS_FROM_ENV (env);
+	hysocket_t socketP;
+	int result;		
+	socketP	=getJavaIoFileDescriptorContentsAsPointer (env, afd);
+	if (!hysock_socketIsValid (socketP))
+    	{
+      		//throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
+      		return ;
+    	}
+	result = hysock_set_nonblocking(socketP,nonblocking);
+	if (0 != result) {
+		throwJavaNetSocketException (env, result);		
+	}
+	return;	
+}
+
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    connectSocketImpl	
+ * Signature: (Ljava/io/FileDescriptor;ILjava/net/InetAddress;I)I
+ */
+JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_connectSocketImpl(JNIEnv *	env,
+	       jclass thisClz,
+	       jobject
+	       fileDescriptor,
+	       jint trafficClass,
+	       jobject inetAddress,
+	       jint remotePort		    
+	       )
+{
+  PORT_ACCESS_FROM_ENV (env);
+  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
+  int length;
+  U_16 nPort;
+  I_32 result;
+  hysocket_t socketP;
+  hysockaddr_struct sockaddrP;
+  U_32 scope_id	= 0;
+
+  socketP = getJavaIoFileDescriptorContentsAsPointer (env, fileDescriptor);
+  if (!hysock_socketIsValid (socketP))
+    {
+      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
+      return -1;
+    }
+  else
+    {
+      netGetJavaNetInetAddressValue (env, inetAddress, nAddrBytes, &length);
+
+      nPort = hysock_htons ((U_16) remotePort);	
+      if (length == HYSOCK_INADDR_LEN)
+	{
+	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, length,
+	    HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
+	    socketP);
+	}
+      else
+	{
+	  netGetJavaNetInetAddressScopeId (env,	inetAddress, &scope_id);
+	  hysock_sockaddr_init6	(&sockaddrP, (U_8 *) nAddrBytes, length,
+	    HYADDR_FAMILY_AFINET6, nPort,
+	    (trafficClass & 0xFF) << 20, scope_id,
+	    socketP);
+	}
+
+      result = hysock_connect (socketP,	&sockaddrP);
+      if (0 != result)
+	{
+	  throwJavaNetConnectException (env, result);
+	  return result;
+	}
+    }
+    return result;
+}
+/*
+ * Class:     com_ibm_platform_OSNetworkSystem
+ * Method:    connectWithTimeoutSocketImpl
+ * Signature: (Ljava/io/FileDescriptor;IILjava/net/InetAddress;IILjava/lang/Long;)I
+ */
+JNIEXPORT jint JNICALL Java_com_ibm_platform_OSNetworkSystem_connectWithTimeoutSocketImpl(JNIEnv * env,	
+	       jclass thisClz,
+	       jobject
+	       fileDescriptor,
+	       jint timeout,
+	       jint trafficClass,
+	       jobject inetAddr,
+	       jint port,
+	       jint step,
+	       jobject passContext)
+{
+  PORT_ACCESS_FROM_ENV (env);
+  jbyte	nAddrBytes[HYSOCK_INADDR6_LEN];	
+  hysocket_t socketP;
+  /*former:jbyte * nAddrBytes;	*/
+  int length ; 
+  U_16 nPort;
+  I_32 result =	0;
+  hysockaddr_struct sockaddrP;
+  U_32 scope_id	= 0;
+  U_8 *	context	= NULL;	
+  context = getConnectContext(env,passContext);	
+  
+  socketP = getJavaIoFileDescriptorContentsAsPointer (env, fileDescriptor);
+
+  if (!hysock_socketIsValid (socketP))
+    {
+      throwJavaNetSocketException (env,	HYPORT_ERROR_SOCKET_BADSOCKET);	
+      return -1;
+    }
+  else
+    {
+      /*----------------------- former -----------------------------
+      //jbyteArray byte_array =	getInetAddrIP(env,inteAddr);  
+      //length = (*env)->GetArrayLength	(env, byte_array);
+      //(*env)->GetByteArrayRegion (env, byte_array, 0,	length,	nAddrBytes);
+      */
+      netGetJavaNetInetAddressValue (env, inetAddr, nAddrBytes,	&length);
+      nPort = hysock_htons ((U_16) port);
+      hysock_sockaddr_init6 (&sockaddrP,(U_8 *)	nAddrBytes, length,
+	    HYADDR_FAMILY_AFINET4, nPort, 0, scope_id,
+	    socketP);
+

[... 1922 lines stripped ...]