Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: harmony-dev@incubator.apache.org
Message-ID: <20051201061149.44207.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r350181 [180/198] - in
 /incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core: ./ depends/
 depends/files/ depends/jars/ depends/libs/ depends/libs/linux.IA32/
 depends/libs/win.IA32/ depends/oss/ depends/oss/linux.IA32/
 depends/oss/win....
Date: Thu, 01 Dec 2005 06:04:00 -0000
To: harmony-commits@incubator.apache.org
From: geirm@apache.org

Added: incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.c?rev=350181&view=auto
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.c (added)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.c Wed Nov 30 21:29:27 2005
@@ -0,0 +1,1291 @@
+/* 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 "nethelp.h"
+#include "jclglob.h"
+#include "portsock.h"
+#include "hyport.h"
+
+void throwJavaNetBindException (JNIEnv * env, I_32 errorNumber);
+jobject newJavaNetInetAddressGenericBS (JNIEnv * env, jbyte * address,
+          U_32 length, char *hostName,
+          U_32 scope_id);
+void throwJavaNetUnknownHostException (JNIEnv * env, I_32 errorNumber);
+jobject newJavaNetInetAddressGenericB (JNIEnv * env, jbyte * address,
+               U_32 length, U_32 scope_id);
+jobject newJavaLangByte (JNIEnv * env, U_8 aByte);
+U_8 byteValue (JNIEnv * env, jobject aByte);
+I_32 intValue (JNIEnv * env, jobject anInteger);
+void throwJavaNetPortUnreachableException (JNIEnv * env, I_32 errorNumber);
+jobject newJavaByteArray (JNIEnv * env, jbyte * bytes, jint length);
+jobjectArray createAliasArrayFromAddrinfo (JNIEnv * env,
+             hyaddrinfo_t addresses,
+             char *hName);
+BOOLEAN booleanValue (JNIEnv * env, jobject aBoolean);
+BOOLEAN jcl_supports_ipv6 (JNIEnv * env);
+jobject newJavaLangInteger (JNIEnv * env, I_32 anInt);
+BOOLEAN preferIPv4Stack (JNIEnv * env);
+char *netLookupErrorString (JNIEnv * env, I_32 anErrorNum);
+void netInitializeIDCaches (JNIEnv * env, jboolean ipv6_support);
+jobject newJavaLangBoolean (JNIEnv * env, BOOLEAN aBool);
+void throwJavaLangIllegalArgumentException (JNIEnv * env, I_32 errorNumber);
+void netGetJavaNetInetAddressValue (JNIEnv * env, jobject anInetAddress,
+            U_8 * buffer, U_32 * length);
+void throwJavaIoInterruptedIOException (JNIEnv * env, I_32 errorNumber);
+void throwJavaNetSocketTimeoutException (JNIEnv * env, I_32 errorNumber);
+void callThreadYield (JNIEnv * env);
+void throwJavaNetConnectException (JNIEnv * env, I_32 errorNumber);
+void netGetJavaNetInetAddressScopeId (JNIEnv * env, jobject anInetAddress,
+              U_32 * scope_id);
+BOOLEAN preferIPv6Addresses (JNIEnv * env);
+jobjectArray createAliasArray (JNIEnv * env, jbyte ** addresses,
+             I_32 * family, U_32 count, char *hName,
+             U_32 * scope_id_array);
+void throwJavaNetSocketException (JNIEnv * env, I_32 errorNumber);
+I_32 netGetSockAddr (JNIEnv * env, jobject fileDescriptor,
+         hysockaddr_t sockaddrP, jboolean preferIPv6Addresses);
+
+/**
+ * Set the exception state of the VM with a new java.lang.IllegalArgumentException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaLangIllegalArgumentException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/lang/IllegalArgumentException");
+  if (0 == aClass)
+    {
+      return;
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+
+}
+
+/**
+ * Set the exception state of the VM with a new java.net.BindException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaNetBindException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/net/BindException");
+  if (0 == aClass)
+    {
+      (*env)->ExceptionClear (env);
+      aClass = (*env)->FindClass (env, "java/net/SocketException");
+      if (0 == aClass)
+        {
+          return;
+        }
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+}
+
+/**
+ * Set the exception state of the VM with a new java.net.ConnectException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaNetConnectException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/net/ConnectException");
+  if (0 == aClass)
+    {
+      (*env)->ExceptionClear (env);
+      aClass = (*env)->FindClass (env, "java/net/SocketException");
+      if (0 == aClass)
+        {
+          return;
+        }
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+}
+
+/**
+ * Set the exception state of the VM with a new java.net.SocketException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaNetSocketException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/net/SocketException");
+  if (0 == aClass)
+    {
+      return;
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+
+}
+
+/**
+ * Set the exception state of the VM with a new java.net.UnknownHostException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaNetUnknownHostException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  char *errorMessage;
+  if (errorNumber == HYPORT_ERROR_SOCKET_SYSTEMFULL)
+    {
+      throwNewOutOfMemoryError (env, "");
+      return;
+    }
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/net/UnknownHostException");
+  if (0 == aClass)
+    {
+      return;
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+
+}
+
+/**
+ * Set the exception state of the VM with a new java.io.InterruptedIOException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaIoInterruptedIOException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/io/InterruptedIOException");
+  if (0 == aClass)
+    {
+      return;
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+
+}
+
+/**
+ * Answer a new java.lang.Boolean object.
+ *
+ * @param env   pointer to the JNI library
+ * @param aBool the Boolean constructor argument
+ *
+ * @return  the new Boolean
+ */
+
+jobject
+newJavaLangBoolean (JNIEnv * env, BOOLEAN aBool)
+{
+  jclass tempClass;
+  jmethodID tempMethod;
+
+  tempClass = JCL_CACHE_GET (env, CLS_java_lang_Boolean);
+  tempMethod = JCL_CACHE_GET (env, MID_java_lang_Boolean_init);
+  return (*env)->NewObject (env, tempClass, tempMethod, (jboolean) aBool);
+}
+
+/**
+ * Answer a new java.lang.Byte object.
+ *
+ * @param env   pointer to the JNI library
+ * @param aByte the Byte constructor argument
+ *
+ * @return  the new Byte
+ */
+
+jobject
+newJavaLangByte (JNIEnv * env, U_8 aByte)
+{
+  jclass tempClass;
+  jmethodID tempMethod;
+
+  tempClass = JCL_CACHE_GET (env, CLS_java_lang_Byte);
+  tempMethod = JCL_CACHE_GET (env, MID_java_lang_Byte_init);
+  return (*env)->NewObject (env, tempClass, tempMethod, (jbyte) aByte);
+}
+
+/**
+ * Answer a new java.lang.Integer object.
+ *
+ * @param env   pointer to the JNI library
+ * @param anInt the Integer constructor argument
+ *
+ * @return  the new Integer
+ */
+
+jobject
+newJavaLangInteger (JNIEnv * env, I_32 anInt)
+{
+  jclass tempClass;
+  jmethodID tempMethod;
+
+  tempClass = JCL_CACHE_GET (env, CLS_java_lang_Integer);
+  tempMethod = JCL_CACHE_GET (env, MID_java_lang_Integer_init);
+  return (*env)->NewObject (env, tempClass, tempMethod, (jint) anInt);
+}
+
+/**
+ * Answer the network address structure for this socket.  A helper method, used
+ * to later query a socket bound to the default address/port.  See the 
+ * Java_java_net_Socket_netGetSocketLocalAddress/Port functions.
+ *
+ * @param env         pointer to the JNI library
+ * @param fileDescriptor    pointer to the socket file descriptor
+ * @param sockAddrResult  pointer pointer to the sockaddr struct to return the address in
+ * @param preferIPv6Addresses on V4/V6 nodes, a preference as to which address to return for the node
+ *
+ * @return  0, if no errors occurred, otherwise the (negative) error code
+ */
+
+I_32
+netGetSockAddr (JNIEnv * env, jobject fileDescriptor, hysockaddr_t sockaddrP,
+    jboolean preferIPv6Addresses)
+{
+  PORT_ACCESS_FROM_ENV (env);
+  I_32 result = 0;
+  hysocket_t socketP;
+  U_8 ipAddr[HYSOCK_INADDR6_LEN];
+  memset (ipAddr, 0, HYSOCK_INADDR6_LEN);
+
+  socketP = getJavaIoFileDescriptorContentsAsPointer (env, fileDescriptor);
+  if (!hysock_socketIsValid (socketP))
+    {
+      return HYPORT_ERROR_SOCKET_UNKNOWNSOCKET;
+    }
+  else
+    {
+      if (preferIPv6Addresses)
+        {
+          hysock_sockaddr_init6 (sockaddrP, ipAddr, HYSOCK_INADDR6_LEN,
+            HYADDR_FAMILY_UNSPEC, 0, 0, 0, socketP);
+          result = hysock_getsockname (socketP, sockaddrP);
+        }
+      else
+        {
+          hysock_sockaddr_init6 (sockaddrP, ipAddr, HYSOCK_INADDR_LEN,
+            HYADDR_FAMILY_AFINET4, 0, 0, 0, socketP);
+          result = hysock_getsockname (socketP, sockaddrP);
+        }
+      return result;
+    }
+}
+
+/**
+ * Answer the 'value' field value from a java.lang.Boolean
+ *
+ * @param env     pointer to the JNI library
+ * @param aBoolean    the object to access the 'value' field of
+ *
+ * @return  the 'value' field boolean value (completion status is not returned)
+ */
+
+BOOLEAN
+booleanValue (JNIEnv * env, jobject aBoolean)
+{
+  return (BOOLEAN) ((*env)->
+        GetBooleanField (env, aBoolean,
+             JCL_CACHE_GET (env,
+                FID_java_lang_Boolean_value)));
+}
+
+/**
+ * Answer the 'value' field value from a java.lang.Byte
+ *
+ * @param env     pointer to the JNI library
+ * @param aByte   the object to access the 'value' field of
+ *
+ * @return  the 'value' field byte value (completion status is not returned)
+ */
+
+U_8
+byteValue (JNIEnv * env, jobject aByte)
+{
+  return (U_8) ((*env)->
+    GetByteField (env, aByte,
+            JCL_CACHE_GET (env, FID_java_lang_Byte_value)));
+}
+
+/**
+ * Answer the 'value' field value from a java.lang.Integer
+ *
+ * @param env       pointer to the JNI library
+ * @param anInteger   the object to access the 'value' field of
+ *
+ * @return  the 'value' field integer value (completion status is not returned)
+ */
+
+I_32
+intValue (JNIEnv * env, jobject anInteger)
+{
+  return (I_32) ((*env)->
+     GetIntField (env, anInteger,
+            JCL_CACHE_GET (env,
+               FID_java_lang_Integer_value)));
+}
+
+/**
+ * Answer the errorString corresponding to the errorNumber, if available.
+ * This function will answer a default error string, if the errorNumber is not
+ * recognized.
+ *
+ * This function will have to be reworked to handle internationalization properly, removing
+ * the explicit strings.
+ *
+ * @param anErrorNum    the error code to resolve to a human readable string
+ *
+ * @return  a human readable error string
+ */
+
+char *
+netLookupErrorString (JNIEnv * env, I_32 anErrorNum)
+{
+  PORT_ACCESS_FROM_ENV (env);
+  switch (anErrorNum)
+    {
+    case HYPORT_ERROR_SOCKET_BADSOCKET:
+      return "Bad socket";
+    case HYPORT_ERROR_SOCKET_NOTINITIALIZED:
+      return "Socket library uninitialized";
+    case HYPORT_ERROR_SOCKET_BADAF:
+      return "Bad address family";
+    case HYPORT_ERROR_SOCKET_BADPROTO:
+      return "Bad protocol";
+    case HYPORT_ERROR_SOCKET_BADTYPE:
+      return "Bad type";
+    case HYPORT_ERROR_SOCKET_SYSTEMBUSY:
+      return "System busy handling requests";
+    case HYPORT_ERROR_SOCKET_SYSTEMFULL:
+      return "Too many sockets allocated";
+    case HYPORT_ERROR_SOCKET_NOTCONNECTED:
+      return "Socket is not connected";
+    case HYPORT_ERROR_SOCKET_INTERRUPTED:
+      return "The call was cancelled";
+    case HYPORT_ERROR_SOCKET_TIMEOUT:
+      return "The operation timed out";
+    case HYPORT_ERROR_SOCKET_CONNRESET:
+      return "The connection was reset";
+    case HYPORT_ERROR_SOCKET_WOULDBLOCK:
+      return "The socket is marked as nonblocking operation would block";
+    case HYPORT_ERROR_SOCKET_ADDRNOTAVAIL:
+      return "The address is not available";
+    case HYPORT_ERROR_SOCKET_ADDRINUSE:
+      return "The address is already in use";
+    case HYPORT_ERROR_SOCKET_NOTBOUND:
+      return "The socket is not bound";
+    case HYPORT_ERROR_SOCKET_UNKNOWNSOCKET:
+      return "Resolution of the FileDescriptor to socket failed";
+    case HYPORT_ERROR_SOCKET_INVALIDTIMEOUT:
+      return "The specified timeout is invalid";
+    case HYPORT_ERROR_SOCKET_FDSETFULL:
+      return "Unable to create an FDSET";
+    case HYPORT_ERROR_SOCKET_TIMEVALFULL:
+      return "Unable to create a TIMEVAL";
+    case HYPORT_ERROR_SOCKET_REMSOCKSHUTDOWN:
+      return "The remote socket has shutdown gracefully";
+    case HYPORT_ERROR_SOCKET_NOTLISTENING:
+      return "Listen() was not invoked prior to accept()";
+    case HYPORT_ERROR_SOCKET_NOTSTREAMSOCK:
+      return "The socket does not support connection-oriented service";
+    case HYPORT_ERROR_SOCKET_ALREADYBOUND:
+      return "The socket is already bound to an address";
+    case HYPORT_ERROR_SOCKET_NBWITHLINGER:
+      return "The socket is marked non-blocking & SO_LINGER is non-zero";
+    case HYPORT_ERROR_SOCKET_ISCONNECTED:
+      return "The socket is already connected";
+    case HYPORT_ERROR_SOCKET_NOBUFFERS:
+      return "No buffer space is available";
+    case HYPORT_ERROR_SOCKET_HOSTNOTFOUND:
+      return "Authoritative Answer Host not found";
+    case HYPORT_ERROR_SOCKET_NODATA:
+      return "Valid name, no data record of requested type";
+    case HYPORT_ERROR_SOCKET_BOUNDORCONN:
+      return "The socket has not been bound or is already connected";
+    case HYPORT_ERROR_SOCKET_OPNOTSUPP:
+      return "The socket does not support the operation";
+    case HYPORT_ERROR_SOCKET_OPTUNSUPP:
+      return "The socket option is not supported";
+    case HYPORT_ERROR_SOCKET_OPTARGSINVALID:
+      return "The socket option arguments are invalid";
+    case HYPORT_ERROR_SOCKET_SOCKLEVELINVALID:
+      return "The socket level is invalid";
+    case HYPORT_ERROR_SOCKET_TIMEOUTFAILURE:
+      return "The timeout operation failed";
+    case HYPORT_ERROR_SOCKET_SOCKADDRALLOCFAIL:
+      return "Failed to allocate address structure";
+    case HYPORT_ERROR_SOCKET_FDSET_SIZEBAD:
+      return "The calculated maximum size of the file descriptor set is bad";
+    case HYPORT_ERROR_SOCKET_UNKNOWNFLAG:
+      return "The flag is unknown";
+    case HYPORT_ERROR_SOCKET_MSGSIZE:
+      return
+  "The datagram was too big to fit the specified buffer, so truncated";
+    case HYPORT_ERROR_SOCKET_NORECOVERY:
+      return "The operation failed with no recovery possible";
+    case HYPORT_ERROR_SOCKET_ARGSINVALID:
+      return "The arguments are invalid";
+    case HYPORT_ERROR_SOCKET_BADDESC:
+      return "The socket argument is not a valid file descriptor";
+    case HYPORT_ERROR_SOCKET_NOTSOCK:
+      return "The socket argument is not a socket";
+    case HYPORT_ERROR_SOCKET_HOSTENTALLOCFAIL:
+      return "Unable to allocate the hostent structure";
+    case HYPORT_ERROR_SOCKET_TIMEVALALLOCFAIL:
+      return "Unable to allocate the timeval structure";
+    case HYPORT_ERROR_SOCKET_LINGERALLOCFAIL:
+      return "Unable to allocate the linger structure";
+    case HYPORT_ERROR_SOCKET_IPMREQALLOCFAIL:
+      return "Unable to allocate the ipmreq structure";
+    case HYPORT_ERROR_SOCKET_FDSETALLOCFAIL:
+      return "Unable to allocate the fdset structure";
+    case HYPORT_ERROR_SOCKET_CONNECTION_REFUSED:
+      return "Connection refused";
+
+    default:
+      return (char *) hysock_error_message ();
+    }
+}
+
+/**
+ * Set up JNI ID Caches.
+ *
+ * @param env           pointer to the JNI library
+ *
+ */
+
+void
+netInitializeIDCaches (JNIEnv * env, jboolean ipv6_support)
+{
+  jclass lookupClass;
+  jmethodID mid;
+  jfieldID fid;
+  jobject globalRef;
+
+  /* Set the JCL cache to use IPv6 address support */
+  JCL_CACHE_SET (env, jcl_supports_ipv6, ipv6_support);
+
+  /* java/lang/Boolean class, constructors, and fids */
+  lookupClass = (*env)->FindClass (env, "java/lang/Boolean");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewWeakGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  mid = (*env)->GetMethodID (env, lookupClass, "<init>", "(Z)V");
+  if (!mid)
+    return;
+  fid = (*env)->GetFieldID (env, lookupClass, "value", "Z");
+  if (!fid)
+    return;
+  JCL_CACHE_SET (env, CLS_java_lang_Boolean, globalRef);
+  JCL_CACHE_SET (env, MID_java_lang_Boolean_init, mid);
+  JCL_CACHE_SET (env, FID_java_lang_Boolean_value, fid);
+
+  /* java/lang/Byte class, constructors, and fids */
+  lookupClass = (*env)->FindClass (env, "java/lang/Byte");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewWeakGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  mid = (*env)->GetMethodID (env, lookupClass, "<init>", "(B)V");
+  if (!mid)
+    return;
+  fid = (*env)->GetFieldID (env, lookupClass, "value", "B");
+  if (!fid)
+    return;
+  JCL_CACHE_SET (env, CLS_java_lang_Byte, globalRef);
+  JCL_CACHE_SET (env, MID_java_lang_Byte_init, mid);
+  JCL_CACHE_SET (env, FID_java_lang_Byte_value, fid);
+
+  /* java/lang/Integer class, constructors, and fids */
+  lookupClass = (*env)->FindClass (env, "java/lang/Integer");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewWeakGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  mid = (*env)->GetMethodID (env, lookupClass, "<init>", "(I)V");
+  if (!mid)
+    return;
+  fid = (*env)->GetFieldID (env, lookupClass, "value", "I");
+  if (!fid)
+    return;
+  JCL_CACHE_SET (env, CLS_java_lang_Integer, globalRef);
+  JCL_CACHE_SET (env, MID_java_lang_Integer_init, mid);
+  JCL_CACHE_SET (env, FID_java_lang_Integer_value, fid);
+
+  /* InetAddress cache setup */
+  lookupClass = (*env)->FindClass (env, "java/net/InetAddress");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewWeakGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  fid = (*env)->GetFieldID (env, lookupClass, "ipaddress", "[B");
+
+  if (!fid)
+    return;
+  JCL_CACHE_SET (env, CLS_java_net_InetAddress, globalRef);
+  JCL_CACHE_SET (env, FID_java_net_InetAddress_address, fid);
+
+  mid = NULL;
+  mid =
+    (*env)->GetStaticMethodID (env, lookupClass, "preferIPv6Addresses",
+             "()Z");
+  if (!mid)
+    return;
+  JCL_CACHE_SET (env, MID_java_net_InetAddress_preferIPv6Addresses, mid);
+
+  if (ipv6_support)
+    {
+      /* static InetAddress getByAddress( String name, byte[] address ) */
+      mid =
+        (*env)->GetStaticMethodID (env, lookupClass, "getByAddress",
+        "(Ljava/lang/String;[B)Ljava/net/InetAddress;");
+      if (!mid)
+        return;
+      JCL_CACHE_SET (env,
+        MID_java_net_InetAddress_getByAddress_Ljava_lang_String_byteArray,
+        mid);
+
+      /* static InetAddress getByAddress( byte[] address ) */
+      mid =
+        (*env)->GetStaticMethodID (env, lookupClass, "getByAddress",
+        "([B)Ljava/net/InetAddress;");
+      if (!mid)
+        return;
+      JCL_CACHE_SET (env, MID_java_net_InetAddress_getByAddress_byteArray,
+        mid);
+    }
+  else
+    {
+      /* InetAddress( byte[] addr ) */
+      mid = (*env)->GetMethodID (env, lookupClass, "<init>", "([B)V");
+      if (!mid)
+        return;
+      JCL_CACHE_SET (env, MID_java_net_InetAddress_init_byteArray, mid);
+
+      /* InetAddress( byte[] addr, String address ) */
+      mid =
+        (*env)->GetMethodID (env, lookupClass, "<init>",
+        "([BLjava/lang/String;)V");
+      if (!mid)
+        return;
+      JCL_CACHE_SET (env,
+        MID_java_net_InetAddress_init_byteArrayLjava_lang_String,
+        mid);
+    }
+
+  /* cache Socket class CLS and preferIPv4Socket method */
+  lookupClass = (*env)->FindClass (env, "java/net/Socket");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewWeakGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  mid =
+    (*env)->GetStaticMethodID (env, lookupClass, "preferIPv4Stack", "()Z");
+  if (!mid)
+    return;
+  JCL_CACHE_SET (env, CLS_java_net_Socket, globalRef);
+  JCL_CACHE_SET (env, MID_java_net_Socket_preferIPv4Stack, mid);
+
+  lookupClass = (*env)->FindClass (env, "java/lang/Thread");
+  if (!lookupClass)
+    return;
+  globalRef = (*env)->NewWeakGlobalRef (env, lookupClass);
+  if (!globalRef)
+    return;
+  mid = (*env)->GetStaticMethodID (env, lookupClass, "yield", "()V");
+  if (!mid)
+    return;
+  JCL_CACHE_SET (env, CLS_java_lang_Thread, globalRef);
+  JCL_CACHE_SET (env, MID_java_lang_Thread_yield, mid);
+
+}
+
+/**
+ * Answer the 'address' field value from a java.net.InetAddress
+ *
+ * @param env           pointer to the JNI library
+ * @param anInetAddress   the object to access the 'value' field of
+ *
+ * @return  the 'address' field integer value (completion status is not returned)
+ */
+
+void
+netGetJavaNetInetAddressValue (JNIEnv * env, jobject anInetAddress,
+             U_8 * buffer, U_32 * length)
+{
+  jbyteArray byte_array =
+    (jbyteArray) ((*env)->GetObjectField (env, anInetAddress,
+            JCL_CACHE_GET (env,
+               FID_java_net_InetAddress_address)));
+  *length = (*env)->GetArrayLength (env, byte_array);
+  (*env)->GetByteArrayRegion (env, byte_array, 0, *length, buffer);
+}
+
+/**
+ * Call the java.lang.Thread.yield() method.
+ *
+ * @param env   pointer to the JNI library
+ *
+ */
+
+void
+callThreadYield (JNIEnv * env)
+{
+  jmethodID tempMethod;
+  jclass tempClass;
+  jobject globalRef;
+
+  tempClass = JCL_CACHE_GET (env, CLS_java_lang_Thread);
+  tempMethod = JCL_CACHE_GET (env, MID_java_lang_Thread_yield);
+  if (tempClass == 0)
+    {
+      tempClass = (*env)->FindClass (env, "java/lang/Thread");
+      if (!tempClass)
+        return;
+      globalRef = (*env)->NewWeakGlobalRef (env, tempClass);
+      if (!globalRef)
+        return;
+      tempMethod = (*env)->GetStaticMethodID (env, tempClass, "yield", "()V");
+      if (!tempMethod)
+        return;
+      JCL_CACHE_SET (env, CLS_java_lang_Thread, globalRef);
+      JCL_CACHE_SET (env, MID_java_lang_Thread_yield, tempMethod);
+    }
+  (*env)->CallStaticVoidMethod (env, tempClass, tempMethod);
+}
+
+/**
+ * A helper method, to construct an array of InetAddress's, based upon the nominated host name
+ * and array of alternate addresses.  Used by the netGetAliasesByAddr/Name functions.  If the host
+ * does not have aliases (only multi-homed hosts do), answer an array with a single InetAddress
+ * constructed from the host name & address.
+ *
+ * @param env       pointer to the JNI library
+ * @param addresses     an array of host addresses
+ * @param family      an array of families matching host addresses
+ * @param count     the number of addresses
+ * @param hName     the host name
+ * @param h_aliases pointer to the array of alternate addresses
+ * @param  scope_id_array scope ids for the addresses
+ *
+ * @return  an array of InetAddress's
+ */
+
+jobjectArray
+createAliasArray (JNIEnv * env, jbyte ** addresses, I_32 * family, U_32 count,
+      char *hName, U_32 * scope_id_array)
+{
+  PORT_ACCESS_FROM_ENV (env);
+  U_32 i, length;
+  jobjectArray aliases;
+  jobject element;
+  jclass tempClass = (*env)->FindClass (env, "java/net/InetAddress");
+
+  /* Number of structures */
+  for (i = 0; i < count; i++)
+    {
+
+      /* Create the byte array for the appropriate family and fill it in */
+      if (family[i] == HYADDR_FAMILY_AFINET4)
+        {
+          length = HYSOCK_INADDR_LEN;
+        }
+      else
+        {
+          length = HYSOCK_INADDR6_LEN;
+        }
+
+      element =
+        newJavaNetInetAddressGenericBS (env, addresses[i], length, hName,
+        scope_id_array[i]);
+
+      if (i == 0)
+        {
+          aliases = (*env)->NewObjectArray (env, count, tempClass, element);
+        }
+      else
+        {
+          (*env)->SetObjectArrayElement (env, aliases, i, element);
+        }
+    }
+  return aliases;
+}
+
+/**
+ * A helper method, to construct an array of InetAddress's, based upon the nominated host name
+ * and array of alternate addresses.  Used by the netGetAliasesByAddr/Name functions.  If the host
+ * does not have aliases (only multi-homed hosts do), answer an array with a single InetAddress
+ * constructed from the host name & address.
+ *
+ * @param env           pointer to the JNI library
+ * @param addresses     addrinfos to take the ip addresses from
+ * @param hName         the host name
+ * @param h_aliases pointer to the array of alternate addresses
+ *
+ * @return  an array of InetAddress's
+ */
+
+jobjectArray
+createAliasArrayFromAddrinfo (JNIEnv * env, hyaddrinfo_t addresses,
+            char *hName)
+{
+  PORT_ACCESS_FROM_ENV (env);
+  U_32 count = 0;
+  U_32 i, j;
+  I_32 length = 0;
+  jbyte **aliasList;
+  I_32 *family;
+  U_32 *scope_id_array;
+  U_32 mem_size;
+  BOOLEAN contains;
+  jbyte temp_address[HYSOCK_INADDR6_LEN];
+  jobjectArray inetAddressArray;
+  U_32 scope_id = 0;
+
+  hysock_getaddrinfo_length (addresses, &length);
+
+  /* The array needs to be big enough to hold an aliases and an address for each entry */
+  mem_size = length * sizeof (jbyte *);
+  aliasList = jclmem_allocate_memory (env, mem_size);
+  family = jclmem_allocate_memory (env, length * sizeof (I_32));
+  scope_id_array = jclmem_allocate_memory (env, length * sizeof (U_32));
+  memset (aliasList, 0, mem_size);
+
+  for (i = 0; i < (U_32) length; i++)
+    {
+      memset (temp_address, 0, HYSOCK_INADDR6_LEN);
+      hysock_getaddrinfo_address (addresses, temp_address, i, &scope_id);
+
+      /* On some platforms we get duplicate addresses back for each protocol type, 
+      we only want 1 per list, so we're filtering duplicates */
+      contains = FALSE;
+      for (j = 0; j < count; j++)
+        {
+          if (!memcmp (temp_address, aliasList[j], HYSOCK_INADDR6_LEN))
+            {
+              contains = TRUE;
+            }
+        }
+      if (!contains)
+        {
+          aliasList[count] =
+            (U_8 *) jclmem_allocate_memory (env, HYSOCK_INADDR6_LEN);
+          hysock_getaddrinfo_family (addresses, &family[count], i);
+          scope_id_array[count] = scope_id;
+          memcpy (aliasList[count++], temp_address, HYSOCK_INADDR6_LEN);
+        }
+    }
+  inetAddressArray =
+    createAliasArray (env, aliasList, family, count, hName, scope_id_array);
+
+  for (i = 0; i < count; i++)
+    {
+      jclmem_free_memory (env, aliasList[i]);
+    }
+  jclmem_free_memory (env, family);
+  jclmem_free_memory (env, scope_id_array);
+  jclmem_free_memory (env, aliasList);
+
+  return inetAddressArray;
+}
+
+/**
+ * Answers whether or not the jcl supports IPv6.
+ *
+ * @param env     pointer to the JNI library
+ * @return                  a boolean
+ */
+
+BOOLEAN
+jcl_supports_ipv6 (JNIEnv * env)
+{
+  return (BOOLEAN) JCL_CACHE_GET (env, jcl_supports_ipv6);
+}
+
+/**
+ * Answer a new byte[] object.
+ *
+ * @param env       pointer to the JNI library
+ * @param bytes     bytes to write to the new ByteArray
+ *
+ * @return  the new InetAddress
+ */
+
+jobject
+newJavaByteArray (JNIEnv * env, jbyte * bytes, jint length)
+{
+  jbyteArray byte_array = (*env)->NewByteArray (env, length);
+  if (byte_array == NULL)
+    {
+      return NULL;
+    }
+  (*env)->SetByteArrayRegion (env, byte_array, 0, length, bytes);
+
+  return byte_array;
+}
+
+/**
+ * Answer a new java.net.InetAddress object.
+ *
+ * @param env       pointer to the JNI library
+ * @param address   the ip address as a byte array, in network order
+ * @param length      the number of bytes in the address
+ * @param scope_id    the scope id for the address if applicable.  Otherwise should be 0
+ *
+ * Determines whether to return a InetAddress in the case of IPv4, or Inet4Address/Inet6Address in the case of IPv6
+ * @return  the new InetAddress
+ */
+
+jobject
+newJavaNetInetAddressGenericB (JNIEnv * env, jbyte * address, U_32 length,
+             U_32 scope_id)
+{
+  jclass tempClass;
+  jmethodID tempMethod;
+  jmethodID tempMethodWithScope = NULL;
+  jbyteArray byte_array;
+  BOOLEAN isAnyAddress = 1;
+  static jbyte IPv4ANY[4] = { 0, 0, 0, 0 };
+  static jbyte IPv6ANY[16] =
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+  U_32 i = 0;
+
+  /* check if the address being returned is the any address.  If so we need to check the prefer flags to see how it should be returned
+  (either as IPv4 Any or IPv6 ANY) */
+
+  if (jcl_supports_ipv6 (env))
+    {
+      /* Figure out if it is the any address */
+      for (i = 0; i < length; i++)
+        {
+          if (address[i] != 0)
+            {
+              isAnyAddress = 0;
+              break;
+            }
+        }
+    }
+  else
+    {
+      /* just do what we used to do without checking */
+      isAnyAddress = 0;
+    }
+
+  /* If it is the any address then set up to return appropriately based on the flags */
+  if (isAnyAddress)
+    {
+      if ((!preferIPv4Stack (env)) && (preferIPv6Addresses (env)))
+        {
+          if ((byte_array =
+            newJavaByteArray (env, IPv6ANY, sizeof (IPv6ANY))) == NULL)
+            {
+              return NULL;
+            }
+        }
+      else
+        {
+          if ((byte_array =
+            newJavaByteArray (env, IPv4ANY, sizeof (IPv4ANY))) == NULL)
+            {
+              return NULL;
+            }
+        }
+    }
+  else
+    {
+      /* not any so just set up to return the address normally */
+      if ((byte_array = newJavaByteArray (env, address, length)) == NULL)
+        {
+          return NULL;
+        }
+    }
+
+  if (jcl_supports_ipv6 (env))
+    {
+      tempMethodWithScope = NULL;
+      if (scope_id != 0)
+        {
+          tempMethodWithScope =
+            (*env)->GetStaticMethodID (env,
+            JCL_CACHE_GET (env,
+            CLS_java_net_InetAddress),
+            "getByAddress",
+            "([BI)Ljava/net/InetAddress;");
+          if ((*env)->ExceptionCheck (env))
+            {
+              (*env)->ExceptionClear (env);
+              tempMethodWithScope = NULL;
+            }
+        }
+
+      if (tempMethodWithScope != NULL)
+        {
+          /* create using the scope id */
+          tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+          return (*env)->CallStaticObjectMethod (env, tempClass,
+            tempMethodWithScope,
+            byte_array, scope_id);
+        }
+      else
+        {
+          tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+          tempMethod =
+            JCL_CACHE_GET (env,
+            MID_java_net_InetAddress_getByAddress_byteArray);
+          return (*env)->CallStaticObjectMethod (env, tempClass, tempMethod,
+            byte_array);
+        }
+    }
+  else
+    {
+      tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+      tempMethod =
+        JCL_CACHE_GET (env, MID_java_net_InetAddress_init_byteArray);
+      return (*env)->NewObject (env, tempClass, tempMethod, byte_array);
+    }
+}
+
+/**
+ * Answer a new java.net.InetAddress object.
+ *
+ * @param env       pointer to the JNI library
+ * @param address     the ip address as a byte array, in network order
+ * @param length      the number of bytes in the address
+ * @param hostName    the host name 
+ * @param scope_id    the scope id for the address if applicable.  Otherwise should be 0
+ *
+ * Determines whether to return a InetAddress in the case of IPv4, or Inet4Address/Inet6Address in the case of IPv6
+ * @return  the new InetAddress
+ */
+
+jobject
+newJavaNetInetAddressGenericBS (JNIEnv * env, jbyte * address, U_32 length,
+        char *hostName, U_32 scope_id)
+{
+  jclass tempClass;
+  jmethodID tempMethod;
+  jmethodID tempMethodWithScope = NULL;
+  jbyteArray byte_array;
+  jstring aString;
+  BOOLEAN isAnyAddress = 1;
+  static jbyte IPv4ANY[4] = { 0, 0, 0, 0 };
+  static jbyte IPv6ANY[16] =
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+  U_32 i = 0;
+
+  aString = (*env)->NewStringUTF (env, hostName);
+
+  /* check if the address being returned is the any address.  If so we need to check the prefer flags to see how it should be returned
+     (either as IPv4 Any or IPv6 ANY) */
+
+  if (jcl_supports_ipv6 (env))
+    {
+      /* Figure out if it is the any address */
+      for (i = 0; i < length; i++)
+        {
+          if (address[i] != 0)
+            {
+              isAnyAddress = 0;
+              break;
+            }
+        }
+    }
+  else
+    {
+      /* just do what we used to do without checking */
+      isAnyAddress = 0;
+    }
+
+  /* If it is the any address then set up to return appropriately based on the flags */
+  if (isAnyAddress)
+    {
+      if ((!preferIPv4Stack (env)) && (preferIPv6Addresses (env)))
+        {
+          if ((byte_array =
+            newJavaByteArray (env, IPv6ANY, sizeof (IPv6ANY))) == NULL)
+            {
+              return NULL;
+            }
+        }
+      else
+        {
+          if ((byte_array =
+            newJavaByteArray (env, IPv4ANY, sizeof (IPv4ANY))) == NULL)
+            {
+              return NULL;
+            }
+        }
+    }
+  else
+    {
+      /* not any so just set up to return the address normally */
+      if ((byte_array = newJavaByteArray (env, address, length)) == NULL)
+        {
+          return NULL;
+        }
+    }
+
+  if (jcl_supports_ipv6 (env))
+    {
+      tempMethodWithScope = NULL;
+      if (scope_id != 0)
+        {
+          tempMethodWithScope =
+            (*env)->GetStaticMethodID (env,
+            JCL_CACHE_GET (env,
+            CLS_java_net_InetAddress),
+            "getByAddress",
+            "(Ljava/lang/String;[BI)Ljava/net/InetAddress;");
+          if ((*env)->ExceptionCheck (env))
+            {
+              (*env)->ExceptionClear (env);
+              tempMethodWithScope = NULL;
+            }
+        }
+
+      if (tempMethodWithScope != NULL)
+        {
+          /* create using the scope id */
+          tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+          return (*env)->CallStaticObjectMethod (env, tempClass,
+            tempMethodWithScope, aString,
+            byte_array, scope_id);
+        }
+      else
+        {
+          tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+          tempMethod =
+            JCL_CACHE_GET (env,
+            MID_java_net_InetAddress_getByAddress_Ljava_lang_String_byteArray);
+          return (*env)->CallStaticObjectMethod (env, tempClass, tempMethod,
+            aString, byte_array);
+        }
+      }
+    else
+      {
+        tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+        tempMethod =
+          JCL_CACHE_GET (env,
+          MID_java_net_InetAddress_init_byteArrayLjava_lang_String);
+        return (*env)->NewObject (env, tempClass, tempMethod, byte_array,
+          aString);
+    }
+}
+
+/**
+ * Set the exception state of the VM with a new java.net.PortUnreachableException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaNetPortUnreachableException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/net/PortUnreachableException");
+  if (0 == aClass)
+    {
+      return;
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+
+}
+
+/**
+ * Set the exception state of the VM with a new java.net.SocketTimeoutException.
+ *
+ * @param env         pointer to the JNI library
+ * @param errorNumber the error code which lead to the exception
+ *
+ */
+
+void
+throwJavaNetSocketTimeoutException (JNIEnv * env, I_32 errorNumber)
+{
+  jclass aClass;
+  /* the error message lookup should be done before the FindClass call, because the FindClass call
+   * may reset the error number that is used in hysock_error_message */
+  char *errorMessage = netLookupErrorString (env, errorNumber);
+  aClass = (*env)->FindClass (env, "java/net/SocketTimeoutException");
+  if (0 == aClass)
+    {
+      return;
+    }
+  (*env)->ThrowNew (env, aClass, errorMessage);
+
+}
+
+/**
+ * Answers whether or not we should prefer the IPv4 stack
+ *
+ * @param env     pointer to the JNI library
+ * @return                  a boolean
+ */
+
+BOOLEAN
+preferIPv4Stack (JNIEnv * env)
+{
+  BOOLEAN result = FALSE;
+
+  /* if the jcl does not support IPV6 then just use the IPV4 stack without checking
+     the values of the flags */
+  if (!jcl_supports_ipv6 (env))
+    {
+      return TRUE;
+    }
+
+  result =
+    (*env)->CallStaticBooleanMethod (env,
+             JCL_CACHE_GET (env, CLS_java_net_Socket),
+             JCL_CACHE_GET (env,
+                MID_java_net_Socket_preferIPv4Stack));
+  if ((*env)->ExceptionCheck (env))
+    {
+      /* older JCLs do not have the right code for security checks so this may fail with an exception
+         just clear the exception and set the value to false which is the default */
+      (*env)->ExceptionClear (env);
+      return FALSE;
+    }
+  else
+    {
+      return result;
+    }
+}
+
+/**
+ * Answers whether or not we should prefer the IPv4 stack
+ *
+ * @param env     pointer to the JNI library
+ * @return                  a boolean
+ */
+
+BOOLEAN
+preferIPv6Addresses (JNIEnv * env)
+{
+  BOOLEAN result = FALSE;
+
+  /* if the jcl does not support IPV6 then we don't prefer IPv6 addresses for any case so just return false 
+     without checking the values of the flags */
+  if (!jcl_supports_ipv6 (env))
+    {
+      return FALSE;
+    }
+
+  result =
+    (*env)->CallStaticBooleanMethod (env,
+             JCL_CACHE_GET (env,
+                CLS_java_net_InetAddress),
+             JCL_CACHE_GET (env,
+                MID_java_net_InetAddress_preferIPv6Addresses));
+  if ((*env)->ExceptionCheck (env))
+    {
+      /* older JCLs do not have the right code for security checks so this may fail with an exception
+         just clear the exception and set the value to false which is the default */
+      (*env)->ExceptionClear (env);
+      return FALSE;
+    }
+  else
+    {
+      return result;
+    }
+}
+
+/**
+ * Answer the 'scope_id' field value from a java.net.InetAddress
+ *
+ * @param env           pointer to the JNI library
+ * @param anInetAddress   the object to access the 'value' field 
+ * @param   scope_id             pointer to the integer in which the scope_id value should be returned
+ *
+ */
+void
+netGetJavaNetInetAddressScopeId (JNIEnv * env, jobject anInetAddress,
+         U_32 * scope_id)
+{
+  jfieldID scopeFid;
+  jclass inet6AddressClass = (*env)->FindClass (env, "java/net/Inet6Address");
+
+  /* only inet6 addresses have the scope id so only get the value for this type of InetAddress */
+  if ((!((*env)->ExceptionCheck (env)))
+    && (*env)->IsInstanceOf (env, anInetAddress, inet6AddressClass))
+    {
+      scopeFid = (*env)->GetFieldID (env, inet6AddressClass, "scope_id", "I");
+      /* this is to support older jcls that did not have the scope id */
+      if (!((*env)->ExceptionCheck (env)))
+        {
+          *scope_id = (*env)->GetIntField (env, anInetAddress, scopeFid);
+        }
+      else
+        {
+          *scope_id = 0;
+        }
+    }
+  else
+    {
+      *scope_id = 0;
+    }
+
+  /* clear any exception that might have occured */
+  (*env)->ExceptionClear (env);
+
+}

Added: incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.h?rev=350181&view=auto
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.h (added)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/nethelp.h Wed Nov 30 21:29:27 2005
@@ -0,0 +1,40 @@
+/* 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.
+ */
+
+#if !defined(nethelp_h)
+#define nethelp_h
+#include "iohelp.h"
+#include "hysocket.h"
+#define JAVASOCKOPT_TCP_NODELAY 1
+#define JAVASOCKOPT_SO_REUSEADDR 4
+#define JAVASOCKOPT_MCAST_ADD_MEMBERSHIP 19
+#define JAVASOCKOPT_MCAST_DROP_MEMBERSHIP 20
+#define JAVASOCKOPT_MCAST_TTL 17
+#define JAVASOCKOPT_SO_KEEPALIVE 8
+#define JAVASOCKOPT_MCAST_TIME_TO_LIVE 10	/* Currently unused */
+#define JAVASOCKOPT_SO_BROADCAST 32
+#define JAVASOCKOPT_SO_BINDADDR 15
+#define JAVASOCKOPT_MCAST_INTERFACE 16
+#define JAVASOCKOPT_SO_LINGER 128
+#define JAVASOCKOPT_SO_REUSEPORT 512
+#define JAVASOCKOPT_SO_SNDBUF 4097
+#define JAVASOCKOPT_SO_RCVBUF 4098
+#define JAVASOCKOPT_SO_RCVTIMEOUT  4102
+#define JAVASOCKOPT_IP_TOS 3
+#define JAVASOCKOPT_IP_MULTICAST_LOOP 18
+#define JAVASOCKOPT_IP_MULTICAST_IF2 31
+#define JAVASOCKOPT_SO_OOBINLINE  4099
+#define JAVASOCKOPT_REUSEADDR_AND_REUSEPORT  10001
+#endif /* nethelp_h */

Added: incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/netif.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/netif.c?rev=350181&view=auto
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/netif.c (added)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/netif.c Wed Nov 30 21:29:27 2005
@@ -0,0 +1,214 @@
+/* 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 "nethelp.h"
+#include "jclprots.h"
+#include "helpers.h"
+#include "jclglob.h"
+#include "portsock.h"
+
+/**
+ * Answer an array of NetworkInterface objects.  One for each network interface within the system
+ *
+ * @param env pointer to the JNI library
+ * @param clazz the class of the object invoking the JNI function
+ *
+ * @return      an array of NetworkInterface objects of length 0 or more
+ */
+
+jobjectArray JNICALL
+Java_java_net_NetworkInterface_getNetworkInterfacesImpl (JNIEnv * env,
+               jclass clazz)
+{
+  /* variables to store network interfac edata returned by call to port library */
+  struct hyNetworkInterfaceArray_struct networkInterfaceArray;
+  I_32 result = 0;
+
+  /* variables for class and method objects needed to create bridge to java */
+  jclass networkInterfaceClass = NULL;
+  jclass inetAddressClass = NULL;
+  jclass utilClass = NULL;
+  jmethodID methodID = NULL;
+  jmethodID utilMid = NULL;
+
+  /* JNI objects used to return values from native call */
+  jstring name = NULL;
+  jstring displayName = NULL;
+  jobjectArray addresses = NULL;
+  jobjectArray networkInterfaces = NULL;
+  jbyteArray bytearray = NULL;
+
+  /* jobjects used to build the object arrays returned */
+  jobject currentInterface = NULL;
+  jobject element = NULL;
+
+  /* misc variables needed for looping and determining inetAddress info */
+  U_32 length = 0;
+  I_32 family = 0;
+  U_32 i = 0;
+  U_32 j = 0;
+  U_32 nameLength = 0;
+
+  /* required call if we are going to call port library methods */
+  PORT_ACCESS_FROM_ENV (env);
+
+  /* get the classes and methods that we need for later calls */
+  networkInterfaceClass =
+    (*env)->FindClass (env, "java/net/NetworkInterface");
+  if (networkInterfaceClass == NULL)
+    {
+      throwJavaNetSocketException (env, HYPORT_ERROR_SOCKET_NORECOVERY);
+      return NULL;
+    }
+
+  inetAddressClass = (*env)->FindClass (env, "java/net/InetAddress");
+  if (inetAddressClass == NULL)
+    {
+      throwJavaNetSocketException (env, HYPORT_ERROR_SOCKET_NORECOVERY);
+      return NULL;
+    }
+
+  methodID =
+    (*env)->GetMethodID (env, networkInterfaceClass, "<init>",
+       "(Ljava/lang/String;Ljava/lang/String;[Ljava/net/InetAddress;I)V");
+  if (methodID == NULL)
+    {
+      throwJavaNetSocketException (env, HYPORT_ERROR_SOCKET_NORECOVERY);
+      return NULL;
+    }
+
+  utilClass = (*env)->FindClass (env, "com/ibm/oti/util/Util");
+  if (!utilClass)
+    {
+      return NULL;
+    }
+
+  utilMid =
+    ((*env)->
+     GetStaticMethodID (env, utilClass, "toString",
+      "([BII)Ljava/lang/String;"));
+  if (!utilMid)
+    return NULL;
+
+  result =
+    hysock_get_network_interfaces (&networkInterfaceArray,
+           preferIPv4Stack (env));
+
+  if (result < 0)
+    {
+      /* this means an error occured.  The value returned is the socket error that should be returned */
+      throwJavaNetSocketException (env, result);
+      return NULL;
+    }
+
+  /* now loop through the interfaces and extract the information to be returned */
+  for (j = 0; j < networkInterfaceArray.length; j++)
+    {
+      /* set the name and display name and reset the addresses object array */
+      addresses = NULL;
+      name = NULL;
+      displayName = NULL;
+
+      if (networkInterfaceArray.elements[j].name != NULL)
+        {
+          nameLength = strlen (networkInterfaceArray.elements[j].name);
+          bytearray = (*env)->NewByteArray (env, nameLength);
+          if (bytearray == NULL)
+            {
+              /* NewByteArray should have thrown an exception */
+              return NULL;
+            }
+          (*env)->SetByteArrayRegion (env, bytearray, (jint) 0, nameLength,
+            networkInterfaceArray.elements[j].name);
+          name =
+            (*env)->CallStaticObjectMethod (env, utilClass, utilMid,
+            bytearray, (jint) 0, nameLength);
+          if ((*env)->ExceptionCheck (env))
+            {
+              return NULL;
+            }
+        }
+
+      if (networkInterfaceArray.elements[j].displayName != NULL)
+        {
+          nameLength = strlen (networkInterfaceArray.elements[j].displayName);
+          bytearray = (*env)->NewByteArray (env, nameLength);
+          if (bytearray == NULL)
+            {
+              /* NewByteArray should have thrown an exception */
+              return NULL;
+            }
+          (*env)->SetByteArrayRegion (env, bytearray, (jint) 0, nameLength,
+            networkInterfaceArray.elements[j].
+            displayName);
+          displayName =
+            (*env)->CallStaticObjectMethod (env, utilClass, utilMid,
+            bytearray, (jint) 0, nameLength);
+          if ((*env)->ExceptionCheck (env))
+            {
+              return NULL;
+            }
+        }
+
+      /* generate the object with the inet addresses for the itnerface       */
+      for (i = 0; i < networkInterfaceArray.elements[j].numberAddresses; i++)
+        {
+          element = newJavaNetInetAddressGenericB (env,
+            networkInterfaceArray.
+            elements[j].addresses[i].
+            addr.bytes,
+            networkInterfaceArray.
+            elements[j].addresses[i].
+            length,
+            networkInterfaceArray.
+            elements[j].addresses[i].
+            scope);
+          if (i == 0)
+            {
+              addresses =
+                (*env)->NewObjectArray (env,
+                networkInterfaceArray.elements[j].
+                numberAddresses, inetAddressClass,
+                element);
+            }
+          else
+            {
+              (*env)->SetObjectArrayElement (env, addresses, i, element);
+            }
+        }
+
+      /* now  create the NetworkInterface object for this interface and then add it it ot the arrary that will be returned */
+      currentInterface =
+        (*env)->NewObject (env, networkInterfaceClass, methodID, name,
+        displayName, addresses,
+        networkInterfaceArray.elements[j].index);
+
+      if (j == 0)
+        {
+          networkInterfaces =
+            (*env)->NewObjectArray (env, networkInterfaceArray.length,
+            networkInterfaceClass, currentInterface);
+        }
+      else
+        {
+          (*env)->SetObjectArrayElement (env, networkInterfaces, j,
+            currentInterface);
+        }
+    }
+
+  /* free the memory for the interfaces struct and return the new NetworkInterface List */
+  hysock_free_network_interface_struct (&networkInterfaceArray);
+  return networkInterfaces;
+}

Added: incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/ois.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/ois.c?rev=350181&view=auto
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/ois.c (added)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/ois.c Wed Nov 30 21:29:27 2005
@@ -0,0 +1,224 @@
+/* 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 "jni.h"
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2Z
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jboolean newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "Z");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetBooleanField (env, targetObject, fid, newValue);
+    }
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2C
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jchar newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "C");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetCharField (env, targetObject, fid, newValue);
+    }
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2I
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jint newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "I");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetIntField (env, targetObject, fid, newValue);
+    }
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2F
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jfloat newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "F");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetFloatField (env, targetObject, fid, newValue);
+    }
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2D
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jdouble newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "D");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetDoubleField (env, targetObject, fid, newValue);
+    }
+
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2S
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jshort newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "S");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetShortField (env, targetObject, fid, newValue);
+    }
+
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2J
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jlong newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "J");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetLongField (env, targetObject, fid, newValue);
+    }
+}
+
+jobject JNICALL
+Java_java_io_ObjectInputStream_newInstance (JNIEnv * env, jclass clazz,
+              jobject instantiationClass,
+              jobject constructorClass)
+{
+  jmethodID mid =
+    (*env)->GetMethodID (env, constructorClass, "<init>", "()V");
+
+  if (mid == 0)
+    {
+      /* Cant newInstance,No empty constructor... */
+      return (jobject) 0;
+    }
+  else
+    {
+      return (jobject) (*env)->NewObject (env, instantiationClass, mid);  /* Instantiate an object of a given class */
+    }
+
+}
+
+void JNICALL
+  Java_java_io_ObjectInputStream_setField__Ljava_lang_Object_2Ljava_lang_Class_2Ljava_lang_String_2B
+  (JNIEnv * env, jclass clazz, jobject targetObject, jobject declaringClass,
+   jobject fieldName, jbyte newValue)
+{
+  const char *fieldNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "B");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetByteField (env, targetObject, fid, newValue);
+    }
+}
+
+void JNICALL
+Java_java_io_ObjectInputStream_objSetField (JNIEnv * env, jclass clazz,
+              jobject targetObject,
+              jobject declaringClass,
+              jobject fieldName,
+              jobject fieldTypeName,
+              jobject newValue)
+{
+  const char *fieldNameInC, *fieldTypeNameInC;
+  jfieldID fid;
+  if (targetObject == NULL)
+    return;
+  fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  fieldTypeNameInC = (*env)->GetStringUTFChars (env, fieldTypeName, NULL);
+  fid =
+    (*env)->GetFieldID (env, declaringClass, fieldNameInC, fieldTypeNameInC);
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+  (*env)->ReleaseStringUTFChars (env, fieldTypeName, fieldTypeNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid != 0)
+    {
+      (*env)->SetObjectField (env, targetObject, fid, newValue);
+    }
+}

Added: incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/oos.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/oos.c?rev=350181&view=auto
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/oos.c (added)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/oos.c Wed Nov 30 21:29:27 2005
@@ -0,0 +1,220 @@
+/* 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 "jni.h"
+
+jlong JNICALL
+Java_java_io_ObjectOutputStream_getFieldLong (JNIEnv * env, jclass clazz,
+                jobject targetObject,
+                jobject declaringClass,
+                jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "J");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jlong) 0L;
+    }
+  else
+    {
+      return (*env)->GetLongField (env, targetObject, fid);
+    }
+}
+
+jshort JNICALL
+Java_java_io_ObjectOutputStream_getFieldShort (JNIEnv * env, jclass clazz,
+                 jobject targetObject,
+                 jobject declaringClass,
+                 jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "S");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jshort) 0;
+    }
+  else
+    {
+      return (*env)->GetShortField (env, targetObject, fid);
+    }
+}
+
+jdouble JNICALL
+Java_java_io_ObjectOutputStream_getFieldDouble (JNIEnv * env, jclass clazz,
+            jobject targetObject,
+            jobject declaringClass,
+            jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "D");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jdouble) 0.0;
+    }
+  else
+    {
+      return (*env)->GetDoubleField (env, targetObject, fid);
+    }
+}
+
+jboolean JNICALL
+Java_java_io_ObjectOutputStream_getFieldBool (JNIEnv * env, jclass clazz,
+                jobject targetObject,
+                jobject declaringClass,
+                jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "Z");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jboolean) 0;
+    }
+  else
+    {
+      return (*env)->GetBooleanField (env, targetObject, fid);
+    }
+}
+
+jbyte JNICALL
+Java_java_io_ObjectOutputStream_getFieldByte (JNIEnv * env, jclass clazz,
+                jobject targetObject,
+                jobject declaringClass,
+                jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "B");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jbyte) 0;
+    }
+  else
+    {
+      return (*env)->GetByteField (env, targetObject, fid);
+    }
+}
+
+jfloat JNICALL
+Java_java_io_ObjectOutputStream_getFieldFloat (JNIEnv * env, jclass clazz,
+                 jobject targetObject,
+                 jobject declaringClass,
+                 jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "F");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jfloat) 0.0f;
+    }
+  else
+    {
+      return (*env)->GetFloatField (env, targetObject, fid);
+    }
+
+}
+
+jchar JNICALL
+Java_java_io_ObjectOutputStream_getFieldChar (JNIEnv * env, jclass clazz,
+                jobject targetObject,
+                jobject declaringClass,
+                jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "C");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jchar) 0;
+    }
+  else
+    {
+      return (*env)->GetCharField (env, targetObject, fid);
+    }
+}
+
+jobject JNICALL
+Java_java_io_ObjectOutputStream_getFieldObj (JNIEnv * env, jclass clazz,
+               jobject targetObject,
+               jobject declaringClass,
+               jobject fieldName,
+               jobject fieldTypeName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  const char *fieldTypeNameInC =
+    (*env)->GetStringUTFChars (env, fieldTypeName, NULL);
+  jfieldID fid =
+    (*env)->GetFieldID (env, declaringClass, fieldNameInC, fieldTypeNameInC);
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+  (*env)->ReleaseStringUTFChars (env, fieldTypeName, fieldTypeNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jobject) 0;
+    }
+  else
+    {
+      return (*env)->GetObjectField (env, targetObject, fid);
+    }
+}
+
+jint JNICALL
+Java_java_io_ObjectOutputStream_getFieldInt (JNIEnv * env, jclass clazz,
+               jobject targetObject,
+               jobject declaringClass,
+               jobject fieldName)
+{
+  const char *fieldNameInC = (*env)->GetStringUTFChars (env, fieldName, NULL);
+  jfieldID fid = (*env)->GetFieldID (env, declaringClass, fieldNameInC, "I");
+  (*env)->ReleaseStringUTFChars (env, fieldName, fieldNameInC);
+
+  /* Two options now. Maybe getFieldID caused an exception, or maybe it returned the real value */
+  if (fid == 0)
+    {
+      /* Field not found. I believe we must throw an exception here */
+      return (jint) 0;
+    }
+  else
+    {
+      return (*env)->GetIntField (env, targetObject, fid);
+    }
+}

Added: incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/osc.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/osc.c?rev=350181&view=auto
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/osc.c (added)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/ibm_core/native-src/win.IA32/luni/osc.c Wed Nov 30 21:29:27 2005
@@ -0,0 +1,108 @@
+/* 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 "jcl.h"
+#include "jclglob.h"
+
+jobject JNICALL
+Java_java_io_ObjectStreamClass_getFieldSignature (JNIEnv * env, jclass clazz,
+              jobject reflectField)
+{
+  jclass fieldClass = (*env)->GetObjectClass (env, reflectField);
+  return (*env)->CallNonvirtualObjectMethod (env, reflectField, fieldClass,
+               JCL_CACHE_GET (env,
+                  MID_java_lang_reflect_Field_getSignature));
+}
+
+jobject JNICALL
+Java_java_io_ObjectStreamClass_getMethodSignature (JNIEnv * env, jclass clazz,
+               jobject reflectMethod)
+{
+  jclass methodClass = (*env)->GetObjectClass (env, reflectMethod);
+  return (*env)->CallNonvirtualObjectMethod (env, reflectMethod, methodClass,
+               JCL_CACHE_GET (env,
+                  MID_java_lang_reflect_Method_getSignature));
+}
+
+jobject JNICALL
+Java_java_io_ObjectStreamClass_getConstructorSignature (JNIEnv * env,
+              jclass clazz,
+              jobject
+              reflectConstructor)
+{
+  jclass constructorClass = (*env)->GetObjectClass (env, reflectConstructor);
+  return (*env)->CallNonvirtualObjectMethod (env, reflectConstructor,
+               constructorClass,
+               JCL_CACHE_GET (env,
+                  MID_java_lang_reflect_Constructor_getSignature));
+}
+
+jboolean JNICALL
+Java_java_io_ObjectStreamClass_hasClinit (JNIEnv * env, jclass clazz,
+            jobject targetClass)
+{
+  jmethodID mid =
+    (*env)->GetStaticMethodID (env, targetClass, "<clinit>", "()V");
+  (*env)->ExceptionClear (env);
+
+  /* Can I just return mid and rely on typecast to convert to jboolean ? Safe implementation for now */
+  if (mid == 0)
+    {
+      /* No <clinit>... */
+      return (jboolean) 0;
+    }
+  else
+    {
+      return (jboolean) 1;
+    }
+}
+
+void JNICALL
+Java_java_io_ObjectStreamClass_oneTimeInitialization (JNIEnv * env,
+                  jclass clazz)
+{
+  jclass lookupClass;
+  jmethodID mid;
+
+  lookupClass = (*env)->FindClass (env, "java/lang/reflect/Field");
+  if (!lookupClass)
+    return;
+  mid =
+    (*env)->GetMethodID (env, lookupClass, "getSignature",
+       "()Ljava/lang/String;");
+  if (!mid)
+    return;
+  JCL_CACHE_SET (env, MID_java_lang_reflect_Field_getSignature, mid);
+
+  lookupClass = (*env)->FindClass (env, "java/lang/reflect/Method");
+  if (!lookupClass)
+    return;
+  mid =
+    (*env)->GetMethodID (env, lookupClass, "getSignature",
+       "()Ljava/lang/String;");
+  if (!mid)
+    return;
+  JCL_CACHE_SET (env, MID_java_lang_reflect_Method_getSignature, mid);
+
+  lookupClass = (*env)->FindClass (env, "java/lang/reflect/Constructor");
+  if (!lookupClass)
+    return;
+  mid =
+    (*env)->GetMethodID (env, lookupClass, "getSignature",
+       "()Ljava/lang/String;");
+  if (!mid)
+    return;
+  JCL_CACHE_SET (env, MID_java_lang_reflect_Constructor_getSignature, mid);
+}