stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2012-03-14 08:28:25 -07:00
commit 85d4c76d59
1 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c
View File

@ -36,6 +36,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include "nio_util.h" #include "nio_util.h"
#include <limits.h>
JNIEXPORT jint JNICALL JNIEXPORT jint JNICALL
Java_sun_nio_ch_DatagramDispatcher_read0(JNIEnv *env, jclass clazz, Java_sun_nio_ch_DatagramDispatcher_read0(JNIEnv *env, jclass clazz,
@ -60,23 +61,14 @@ Java_sun_nio_ch_DatagramDispatcher_readv0(JNIEnv *env, jclass clazz,
ssize_t result = 0; ssize_t result = 0;
struct iovec *iov = (struct iovec *)jlong_to_ptr(address); struct iovec *iov = (struct iovec *)jlong_to_ptr(address);
struct msghdr m; struct msghdr m;
if (len > 16) { if (len > IOV_MAX) {
len = 16; len = IOV_MAX;
} }
m.msg_name = NULL; // initialize the message
m.msg_namelen = 0; memset(&m, 0, sizeof(m));
m.msg_iov = iov; m.msg_iov = iov;
m.msg_iovlen = len; m.msg_iovlen = len;
#ifdef __solaris__
m.msg_accrights = NULL;
m.msg_accrightslen = 0;
#endif
#if defined(__linux__) || defined(_ALLBSD_SOURCE)
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
result = recvmsg(fd, &m, 0); result = recvmsg(fd, &m, 0);
if (result < 0 && errno == ECONNREFUSED) { if (result < 0 && errno == ECONNREFUSED) {
@ -108,23 +100,14 @@ Java_sun_nio_ch_DatagramDispatcher_writev0(JNIEnv *env, jclass clazz,
struct iovec *iov = (struct iovec *)jlong_to_ptr(address); struct iovec *iov = (struct iovec *)jlong_to_ptr(address);
struct msghdr m; struct msghdr m;
ssize_t result = 0; ssize_t result = 0;
if (len > 16) { if (len > IOV_MAX) {
len = 16; len = IOV_MAX;
} }
m.msg_name = NULL; // initialize the message
m.msg_namelen = 0; memset(&m, 0, sizeof(m));
m.msg_iov = iov; m.msg_iov = iov;
m.msg_iovlen = len; m.msg_iovlen = len;
#ifdef __solaris__
m.msg_accrights = NULL;
m.msg_accrightslen = 0;
#endif
#if defined(__linux__) || defined(_ALLBSD_SOURCE)
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
result = sendmsg(fd, &m, 0); result = sendmsg(fd, &m, 0);
if (result < 0 && errno == ECONNREFUSED) { if (result < 0 && errno == ECONNREFUSED) {