jdk-sandbox: comparison jdk/src/solaris/native/sun/nio/ch/Net.c

equal deleted inserted replaced

-:cb36782f6044
+:ba232b417248
 /*
-* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+#include <sys/poll.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include "net_util_md.h"
 #include "nio_util.h"
 #include "nio.h"
 #include "sun_nio_ch_PollArrayWrapper.h"
+#ifdef _AIX
+#include <sys/utsname.h>
+#endif
 /**
 * IP_MULTICAST_ALL supported since 2.6.31 but may not be available at
 * build time.
 */
 #define IP_MULTICAST_ALL    49
 #endif
 #endif
 /**
-* IPV6_ADD_MEMBERSHIP/IPV6_DROP_MEMBERSHIP may not be defined on OSX
+* IPV6_ADD_MEMBERSHIP/IPV6_DROP_MEMBERSHIP may not be defined on OSX and AIX
 */
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(_AIX)
 #ifndef IPV6_ADD_MEMBERSHIP
 #define IPV6_ADD_MEMBERSHIP     IPV6_JOIN_GROUP
 #define IPV6_DROP_MEMBERSHIP    IPV6_LEAVE_GROUP
 #endif
 #endif
+#if defined(_AIX)
+#ifndef IP_BLOCK_SOURCE
+#define IP_BLOCK_SOURCE                 58   /* Block data from a given source to a given group */
+#define IP_UNBLOCK_SOURCE               59   /* Unblock data from a given source to a given group */
+#define IP_ADD_SOURCE_MEMBERSHIP        60   /* Join a source-specific group */
+#define IP_DROP_SOURCE_MEMBERSHIP       61   /* Leave a source-specific group */
+#endif
+#ifndef MCAST_BLOCK_SOURCE
+#define MCAST_BLOCK_SOURCE              64
+#define MCAST_UNBLOCK_SOURCE            65
+#define MCAST_JOIN_SOURCE_GROUP         66
+#define MCAST_LEAVE_SOURCE_GROUP        67
+#endif
+#endif /* _AIX */
 #define COPY_INET6_ADDRESS(env, source, target) \
 (*env)->GetByteArrayRegion(env, source, 0, 16, target)
 /*
 sin6->sin6_family = AF_INET6;
 COPY_INET6_ADDRESS(env, source, (jbyte*)&(sin6->sin6_addr));
 }
 #endif
+#ifdef _AIX
+/*
+* Checks whether or not "socket extensions for multicast source filters" is supported.
+* Returns JNI_TRUE if it is supported, JNI_FALSE otherwise
+*/
+static jboolean isSourceFilterSupported(){
+static jboolean alreadyChecked = JNI_FALSE;
+static jboolean result = JNI_TRUE;
+if (alreadyChecked != JNI_TRUE){
+struct utsname uts;
+memset(&uts, 0, sizeof(uts));
+strcpy(uts.sysname, "?");
+const int utsRes = uname(&uts);
+int major = -1;
+int minor = -1;
+major = atoi(uts.version);
+minor = atoi(uts.release);
+if (strcmp(uts.sysname, "AIX") == 0) {
+if (major < 6 || (major == 6 && minor < 1)) {// unsupported on aix < 6.1
+result = JNI_FALSE;
+}
+}
+alreadyChecked = JNI_TRUE;
+}
+return result;
+}
+#endif  /* _AIX */
 JNIEXPORT void JNICALL
 Java_sun_nio_ch_Net_initIDs(JNIEnv *env, jclass clazz)
 {
 /* Here because Windows native code does need to init IDs */
 }
 }
 JNIEXPORT jboolean JNICALL
 Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0(JNIEnv* env, jclass cl)
 {
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(_AIX)
 /* for now IPv6 sockets cannot join IPv4 multicast groups */
 return JNI_FALSE;
 #else
 return JNI_TRUE;
 #endif
 mreq.imr_interface.s_addr = htonl(interf);
 opt = (join) ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP;
 optval = (void*)&mreq;
 optlen = sizeof(mreq);
 } else {
+#ifdef _AIX
+/* check AIX for support of source filtering */
+if (isSourceFilterSupported() != JNI_TRUE){
+return IOS_UNAVAILABLE;
+}
+#endif
 mreq_source.imr_multiaddr.s_addr = htonl(group);
 mreq_source.imr_sourceaddr.s_addr = htonl(source);
 mreq_source.imr_interface.s_addr = htonl(interf);
 opt = (join) ? IP_ADD_SOURCE_MEMBERSHIP : IP_DROP_SOURCE_MEMBERSHIP;
 optval = (void*)&mreq_source;
 optlen = sizeof(mreq_source);
 }
 n = setsockopt(fdval(env,fdo), IPPROTO_IP, opt, optval, optlen);
 if (n < 0) {
-if (join && (errno == ENOPROTOOPT))
+if (join && (errno == ENOPROTOOPT || errno == EOPNOTSUPP))
 return IOS_UNAVAILABLE;
 handleSocketError(env, errno);
 }
 return 0;
 }
 #else
 struct ip_mreq_source mreq_source;
 int n;
 int opt = (block) ? IP_BLOCK_SOURCE : IP_UNBLOCK_SOURCE;
+#ifdef _AIX
+/* check AIX for support of source filtering */
+if (isSourceFilterSupported() != JNI_TRUE){
+return IOS_UNAVAILABLE;
+}
+#endif
 mreq_source.imr_multiaddr.s_addr = htonl(group);
 mreq_source.imr_sourceaddr.s_addr = htonl(source);
 mreq_source.imr_interface.s_addr = htonl(interf);
 n = setsockopt(fdval(env,fdo), IPPROTO_IP, opt,
 (void*)&mreq_source, sizeof(mreq_source));
 if (n < 0) {
-if (block && (errno == ENOPROTOOPT))
+if (block && (errno == ENOPROTOOPT || errno == EOPNOTSUPP))
 return IOS_UNAVAILABLE;
 handleSocketError(env, errno);
 }
 return 0;
 #endif
 #endif
 }
 n = setsockopt(fdval(env,fdo), IPPROTO_IPV6, opt, optval, optlen);
 if (n < 0) {
-if (join && (errno == ENOPROTOOPT))
+if (join && (errno == ENOPROTOOPT || errno == EOPNOTSUPP))
 return IOS_UNAVAILABLE;
 handleSocketError(env, errno);
 }
 return 0;
 #else
 initGroupSourceReq(env, group, index, source, &req);
 n = setsockopt(fdval(env,fdo), IPPROTO_IPV6, opt,
 (void*)&req, sizeof(req));
 if (n < 0) {
-if (block && (errno == ENOPROTOOPT))
+if (block && (errno == ENOPROTOOPT || errno == EOPNOTSUPP))
 return IOS_UNAVAILABLE;
 handleSocketError(env, errno);
 }
 return 0;
 #endif
 return IOS_INTERRUPTED;
 } else {
 handleSocketError(env, errno);
 return IOS_THROWN;
 }
+}
+JNIEXPORT jshort JNICALL
+Java_sun_nio_ch_Net_pollinValue(JNIEnv *env, jclass this)
+{
+return (jshort)POLLIN;
+}
+JNIEXPORT jshort JNICALL
+Java_sun_nio_ch_Net_polloutValue(JNIEnv *env, jclass this)
+{
+return (jshort)POLLOUT;
+}
+JNIEXPORT jshort JNICALL
+Java_sun_nio_ch_Net_pollerrValue(JNIEnv *env, jclass this)
+{
+return (jshort)POLLERR;
+}
+JNIEXPORT jshort JNICALL
+Java_sun_nio_ch_Net_pollhupValue(JNIEnv *env, jclass this)
+{
+return (jshort)POLLHUP;
+}
+JNIEXPORT jshort JNICALL
+Java_sun_nio_ch_Net_pollnvalValue(JNIEnv *env, jclass this)
+{
+return (jshort)POLLNVAL;
+}
+JNIEXPORT jshort JNICALL
+Java_sun_nio_ch_Net_pollconnValue(JNIEnv *env, jclass this)
+{
+return (jshort)POLLOUT;
 }
 /* Declared in nio_util.h */

changeset 22607	ba232b417248
parent 22573	8f0344f13b7f
parent 22605	dba3d6b22818
child 23016	1805013d2034