Mercurial > hg > openjdk > icedtea > jdk7 > jdk
changeset 5528:f3f1d84e8a56
7152948: DatagramDispatcher.c should memset msghdr to make it portable to other platforms
Reviewed-by: alanb, chegar
| author | zhangshj |
|---|---|
| date | Wed, 14 Mar 2012 15:14:52 +0000 |
| parents | 66ee1ee981c2 |
| children | a76bc4fefb36 |
| files | src/solaris/native/sun/nio/ch/DatagramDispatcher.c |
| diffstat | 1 files changed, 9 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/sun/nio/ch/DatagramDispatcher.c Mon Aug 06 15:51:54 2012 +0400 +++ b/src/solaris/native/sun/nio/ch/DatagramDispatcher.c Wed Mar 14 15:14:52 2012 +0000 @@ -36,6 +36,7 @@ #include <sys/socket.h> #include "nio_util.h" +#include <limits.h> JNIEXPORT jint JNICALL Java_sun_nio_ch_DatagramDispatcher_read0(JNIEnv *env, jclass clazz, @@ -60,23 +61,14 @@ ssize_t result = 0; struct iovec *iov = (struct iovec *)jlong_to_ptr(address); struct msghdr m; - if (len > 16) { - len = 16; + if (len > IOV_MAX) { + len = IOV_MAX; } - m.msg_name = NULL; - m.msg_namelen = 0; + // initialize the message + memset(&m, 0, sizeof(m)); m.msg_iov = iov; 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); if (result < 0 && errno == ECONNREFUSED) { @@ -108,23 +100,14 @@ struct iovec *iov = (struct iovec *)jlong_to_ptr(address); struct msghdr m; ssize_t result = 0; - if (len > 16) { - len = 16; + if (len > IOV_MAX) { + len = IOV_MAX; } - m.msg_name = NULL; - m.msg_namelen = 0; + // initialize the message + memset(&m, 0, sizeof(m)); m.msg_iov = iov; 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); if (result < 0 && errno == ECONNREFUSED) {