/hg/icedtea8-forest/jdk: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 5 04:00:36 UTC 2017
changeset ec081506c192 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=ec081506c192
author: alanb
date: Fri May 05 04:39:57 2017 +0100
8034182, PR2290: Misc. warnings in java.net code
Reviewed-by: chegar
changeset 14eda4ea5dc1 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=14eda4ea5dc1
author: chegar
date: Fri May 05 05:03:04 2017 +0100
8034174, PR2290: Remove use of JVM_* functions from java.net code
Reviewed-by: alanb, dsamersoff, michaelm
changeset 79df90ff3070 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=79df90ff3070
author: simonis
date: Thu Feb 27 10:53:07 2014 +0100
8035876, PR2290: AIX build issues after '8034174: Remove use of JVM_* functions from java.net code'
Reviewed-by: alanb, chegar
diffstat:
make/lib/NetworkingLibraries.gmk | 4 +
src/aix/native/java/net/aix_close.c | 12 +
src/share/native/java/net/net_util.c | 28 +-
src/share/native/java/net/net_util.h | 10 +-
src/solaris/native/java/net/Inet4AddressImpl.c | 20 +-
src/solaris/native/java/net/Inet6AddressImpl.c | 40 +-
src/solaris/native/java/net/NetworkInterface.c | 16 +-
src/solaris/native/java/net/PlainDatagramSocketImpl.c | 166 +++------
src/solaris/native/java/net/PlainSocketImpl.c | 79 ++--
src/solaris/native/java/net/SocketInputStream.c | 5 +-
src/solaris/native/java/net/SocketOutputStream.c | 14 +-
src/solaris/native/java/net/bsd_close.c | 13 +-
src/solaris/native/java/net/linux_close.c | 12 +-
src/solaris/native/java/net/net_util_md.c | 43 +-
src/solaris/native/java/net/net_util_md.h | 55 +--
src/solaris/native/java/net/solaris_close.c | 122 +++++++
src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c | 16 +-
src/windows/native/java/net/DualStackPlainSocketImpl.c | 6 +-
src/windows/native/java/net/Inet4AddressImpl.c | 2 +-
src/windows/native/java/net/Inet6AddressImpl.c | 4 +-
src/windows/native/java/net/NetworkInterface.c | 2 +-
src/windows/native/java/net/NetworkInterface_winXP.c | 2 +-
src/windows/native/java/net/SocketInputStream.c | 5 +-
src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c | 66 +--
src/windows/native/java/net/TwoStacksPlainSocketImpl.c | 12 +-
src/windows/native/sun/net/spi/DefaultProxySelector.c | 26 +-
26 files changed, 399 insertions(+), 381 deletions(-)
diffs (truncated from 1995 to 500 lines):
diff -r c0e856f2dacd -r 79df90ff3070 make/lib/NetworkingLibraries.gmk
--- a/make/lib/NetworkingLibraries.gmk Mon May 16 10:36:51 2016 -0700
+++ b/make/lib/NetworkingLibraries.gmk Thu Feb 27 10:53:07 2014 +0100
@@ -38,6 +38,10 @@
LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir))
LIBNET_EXCLUDE_FILES :=
+ifneq ($(OPENJDK_TARGET_OS), solaris)
+ LIBNET_EXCLUDE_FILES += solaris_close.c
+endif
+
ifneq ($(OPENJDK_TARGET_OS), linux)
LIBNET_EXCLUDE_FILES += linux_close.c
endif
diff -r c0e856f2dacd -r 79df90ff3070 src/aix/native/java/net/aix_close.c
--- a/src/aix/native/java/net/aix_close.c Mon May 16 10:36:51 2016 -0700
+++ b/src/aix/native/java/net/aix_close.c Thu Feb 27 10:53:07 2014 +0100
@@ -38,6 +38,18 @@
* (see aix_close_init).
*
*/
+
+/*
+ AIX needs a workaround for I/O cancellation, see:
+ http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp?topic=/com.ibm.aix.basetechref/doc/basetrf1/close.htm
+ ...
+ The close subroutine is blocked until all subroutines which use the file
+ descriptor return to usr space. For example, when a thread is calling close
+ and another thread is calling select with the same file descriptor, the
+ close subroutine does not return until the select call returns.
+ ...
+*/
+
#include <stdio.h>
#include <stdlib.h>
#include <signal.h>
diff -r c0e856f2dacd -r 79df90ff3070 src/share/native/java/net/net_util.c
--- a/src/share/native/java/net/net_util.c Mon May 16 10:36:51 2016 -0700
+++ b/src/share/native/java/net/net_util.c Thu Feb 27 10:53:07 2014 +0100
@@ -46,13 +46,10 @@
jstring s;
jint preferIPv4Stack;
- if ((*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_2) == JNI_OK) {
- if (JVM_InitializeSocketLibrary() < 0) {
- JNU_ThrowByName(env, "java/lang/UnsatisfiedLinkError",
- "failed to initialize net library.");
- return JNI_VERSION_1_2;
- }
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
+ return JNI_EVERSION; /* JNI version not supported */
}
+
iCls = (*env)->FindClass(env, "java/lang/Boolean");
CHECK_NULL_RETURN(iCls, JNI_VERSION_1_2);
mid = (*env)->GetStaticMethodID(env, iCls, "getBoolean", "(Ljava/lang/String;)Z");
@@ -108,7 +105,7 @@
return (*env)->GetObjectField(env, holder, ia6_scopeifnameID);
}
-int setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
+jboolean setInet6Address_scopeifname(JNIEnv *env, jobject iaObj, jobject scopeifname) {
jobject holder;
initInetAddrs(env);
@@ -136,7 +133,7 @@
return (*env)->GetIntField(env, holder, ia6_scopeidID);
}
-int setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
+jboolean setInet6Address_scopeid(JNIEnv *env, jobject iaObj, int scopeid) {
jobject holder;
initInetAddrs(env);
@@ -144,15 +141,13 @@
CHECK_NULL_RETURN(holder, JNI_FALSE);
(*env)->SetIntField(env, holder, ia6_scopeidID, scopeid);
if (scopeid > 0) {
- (*env)->SetBooleanField(env, holder, ia6_scopeidsetID, JNI_TRUE);
+ (*env)->SetBooleanField(env, holder, ia6_scopeidsetID, JNI_TRUE);
}
return JNI_TRUE;
}
-
-int getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
+jboolean getInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *dest) {
jobject holder, addr;
- jbyteArray barr;
initInetAddrs(env);
holder = (*env)->GetObjectField(env, iaObj, ia6_holder6ID);
@@ -163,7 +158,7 @@
return JNI_TRUE;
}
-int setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
+jboolean setInet6Address_ipaddress(JNIEnv *env, jobject iaObj, char *address) {
jobject holder;
jbyteArray addr;
@@ -230,7 +225,6 @@
initInetAddrs(env);
#ifdef AF_INET6
if (him->sa_family == AF_INET6) {
- jbyteArray ipaddress;
#ifdef WIN32
struct SOCKADDR_IN6 *him6 = (struct SOCKADDR_IN6 *)him;
#else
@@ -255,7 +249,7 @@
} else {
static jclass inet6Cls = 0;
jint scope;
- int ret;
+ jboolean ret;
if (inet6Cls == 0) {
jclass c = (*env)->FindClass(env, "java/net/Inet6Address");
CHECK_NULL_RETURN(c, NULL);
@@ -266,7 +260,8 @@
iaObj = (*env)->NewObject(env, inet6Cls, ia6_ctrID);
CHECK_NULL_RETURN(iaObj, NULL);
ret = setInet6Address_ipaddress(env, iaObj, (char *)&(him6->sin6_addr));
- CHECK_NULL_RETURN(ret, NULL);
+ if (ret == JNI_FALSE)
+ return NULL;
setInetAddress_family(env, iaObj, IPv6);
scope = getScopeID(him);
setInet6Address_scopeid(env, iaObj, scope);
@@ -322,7 +317,6 @@
return JNI_FALSE;
}
} else {
- jbyteArray ipaddress;
jbyte caddrCur[16];
int scope;
diff -r c0e856f2dacd -r 79df90ff3070 src/share/native/java/net/net_util.h
--- a/src/share/native/java/net/net_util.h Mon May 16 10:36:51 2016 -0700
+++ b/src/share/native/java/net/net_util.h Thu Feb 27 10:53:07 2014 +0100
@@ -62,12 +62,12 @@
* get_ methods that return objects return NULL on error.
*/
extern jobject getInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj);
-extern int setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
+extern jboolean setInet6Address_scopeifname(JNIEnv *env, jobject ia6Obj, jobject scopeifname);
extern int getInet6Address_scopeid_set(JNIEnv *env, jobject ia6Obj);
extern int getInet6Address_scopeid(JNIEnv *env, jobject ia6Obj);
-extern int setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
-extern int getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
-extern int setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
+extern jboolean setInet6Address_scopeid(JNIEnv *env, jobject ia6Obj, int scopeid);
+extern jboolean getInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *dest);
+extern jboolean setInet6Address_ipaddress(JNIEnv *env, jobject ia6Obj, char *address);
extern void setInetAddress_addr(JNIEnv *env, jobject iaObj, int address);
extern void setInetAddress_family(JNIEnv *env, jobject iaObj, int family);
@@ -164,7 +164,7 @@
/* Socket operations
*
- * These work just like the JVM_* procedures, except that they may do some
+ * These work just like the system calls, except that they may do some
* platform-specific pre/post processing of the arguments and/or results.
*/
diff -r c0e856f2dacd -r 79df90ff3070 src/solaris/native/java/net/Inet4AddressImpl.c
--- a/src/solaris/native/java/net/Inet4AddressImpl.c Mon May 16 10:36:51 2016 -0700
+++ b/src/solaris/native/java/net/Inet4AddressImpl.c Thu Feb 27 10:53:07 2014 +0100
@@ -93,7 +93,7 @@
char hostname[NI_MAXHOST+1];
hostname[0] = '\0';
- if (JVM_GetHostName(hostname, NI_MAXHOST)) {
+ if (gethostname(hostname, NI_MAXHOST)) {
/* Something went wrong, maybe networking is not setup? */
strcpy(hostname, "localhost");
} else {
@@ -356,7 +356,7 @@
char hostname[NI_MAXHOST+1];
hostname[0] = '\0';
- if (JVM_GetHostName(hostname, sizeof(hostname))) {
+ if (gethostname(hostname, NI_MAXHOST)) {
/* Something went wrong, maybe networking is not setup? */
strcpy(hostname, "localhost");
} else {
@@ -753,7 +753,7 @@
* Let's try to create a RAW socket to send ICMP packets
* This usually requires "root" privileges, so it's likely to fail.
*/
- fd = JVM_Socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+ fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
if (fd != -1) {
/*
* It didn't fail, so we can use ICMP_ECHO requests.
@@ -764,8 +764,8 @@
/*
* Can't create a raw socket, so let's try a TCP socket
*/
- fd = JVM_Socket(AF_INET, SOCK_STREAM, 0);
- if (fd == JVM_IO_ERR) {
+ fd = socket(AF_INET, SOCK_STREAM, 0);
+ if (fd == -1) {
/* note: if you run out of fds, you may not be able to load
* the exception class, and get a NoClassDefFoundError
* instead.
@@ -793,9 +793,8 @@
*/
SET_NONBLOCKING(fd);
- /* no need to use NET_Connect as non-blocking */
him.sin_port = htons(7); /* Echo */
- connect_rv = JVM_Connect(fd, (struct sockaddr *)&him, len);
+ connect_rv = NET_Connect(fd, (struct sockaddr *)&him, len);
/**
* connection established or refused immediately, either way it means
@@ -805,7 +804,7 @@
close(fd);
return JNI_TRUE;
} else {
- int optlen;
+ socklen_t optlen = (socklen_t)sizeof(connect_rv);
switch (errno) {
case ENETUNREACH: /* Network Unreachable */
@@ -835,9 +834,8 @@
timeout = NET_Wait(env, fd, NET_WAIT_CONNECT, timeout);
if (timeout >= 0) {
/* has connection been established? */
- optlen = sizeof(connect_rv);
- if (JVM_GetSockOpt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
- &optlen) <0) {
+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
+ &optlen) <0) {
connect_rv = errno;
}
if (connect_rv == 0 || connect_rv == ECONNREFUSED) {
diff -r c0e856f2dacd -r 79df90ff3070 src/solaris/native/java/net/Inet6AddressImpl.c
--- a/src/solaris/native/java/net/Inet6AddressImpl.c Mon May 16 10:36:51 2016 -0700
+++ b/src/solaris/native/java/net/Inet6AddressImpl.c Thu Feb 27 10:53:07 2014 +0100
@@ -66,27 +66,27 @@
*/
JNIEXPORT jstring JNICALL
Java_java_net_Inet6AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
+ int ret;
char hostname[NI_MAXHOST+1];
hostname[0] = '\0';
- if (JVM_GetHostName(hostname, sizeof(hostname))) {
+ ret = gethostname(hostname, NI_MAXHOST);
+ if (ret == -1) {
/* Something went wrong, maybe networking is not setup? */
strcpy(hostname, "localhost");
} else {
// ensure null-terminated
hostname[NI_MAXHOST] = '\0';
-#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- /* On Linux/FreeBSD gethostname() says "host.domain.sun.com". On
- * Solaris gethostname() says "host", so extra work is needed.
- */
-#else
+ }
+
+#if defined(__solaris__) && defined(AF_INET6)
+ if (ret == 0) {
/* Solaris doesn't want to give us a fully qualified domain name.
* We do a reverse lookup to try and get one. This works
* if DNS occurs before NIS in /etc/resolv.conf, but fails
* if NIS comes first (it still gets only a partial name).
* We use thread-safe system calls.
*/
-#ifdef AF_INET6
struct addrinfo hints, *res;
int error;
@@ -111,9 +111,9 @@
freeaddrinfo(res);
}
-#endif /* AF_INET6 */
-#endif /* __linux__ || _ALLBSD_SOURCE */
}
+#endif
+
return (*env)->NewStringUTF(env, hostname);
}
@@ -179,7 +179,7 @@
* the name (if the name actually matches something in DNS etc.
*/
myhostname[0] = '\0';
- if (JVM_GetHostName(myhostname, NI_MAXHOST)) {
+ if (gethostname(myhostname, NI_MAXHOST) == -1) {
/* Something went wrong, maybe networking is not setup? */
return NULL;
}
@@ -447,7 +447,7 @@
}
while (iterator != NULL) {
- int ret1;
+ jboolean ret1;
if (iterator->ai_family == AF_INET) {
jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
if (IS_NULL(iaObj)) {
@@ -467,7 +467,7 @@
goto cleanupAndReturn;
}
ret1 = setInet6Address_ipaddress(env, iaObj, (char *)&(((struct sockaddr_in6*)iterator->ai_addr)->sin6_addr));
- if (!ret1) {
+ if (ret1 == JNI_FALSE) {
ret = NULL;
goto cleanupAndReturn;
}
@@ -755,15 +755,15 @@
* or the echo service has been disabled.
*/
- fd = JVM_Socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+ fd = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
if (fd != -1) { /* Good to go, let's do a ping */
return ping6(env, fd, &him6, timeout, netif, ttl);
}
/* No good, let's fall back on TCP */
- fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0);
- if (fd == JVM_IO_ERR) {
+ fd = socket(AF_INET6, SOCK_STREAM, 0);
+ if (fd == -1) {
/* note: if you run out of fds, you may not be able to load
* the exception class, and get a NoClassDefFoundError
* instead.
@@ -787,9 +787,8 @@
}
SET_NONBLOCKING(fd);
- /* no need to use NET_Connect as non-blocking */
him6.sin6_port = htons((short) 7); /* Echo port */
- connect_rv = JVM_Connect(fd, (struct sockaddr *)&him6, len);
+ connect_rv = NET_Connect(fd, (struct sockaddr *)&him6, len);
/**
* connection established or refused immediately, either way it means
@@ -799,7 +798,7 @@
close(fd);
return JNI_TRUE;
} else {
- int optlen;
+ socklen_t optlen = (socklen_t)sizeof(connect_rv);
switch (errno) {
case ENETUNREACH: /* Network Unreachable */
@@ -830,9 +829,8 @@
if (timeout >= 0) {
/* has connection been established */
- optlen = sizeof(connect_rv);
- if (JVM_GetSockOpt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
- &optlen) <0) {
+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&connect_rv,
+ &optlen) <0) {
connect_rv = errno;
}
if (connect_rv == 0 || ECONNREFUSED) {
diff -r c0e856f2dacd -r 79df90ff3070 src/solaris/native/java/net/NetworkInterface.c
--- a/src/solaris/native/java/net/NetworkInterface.c Mon May 16 10:36:51 2016 -0700
+++ b/src/solaris/native/java/net/NetworkInterface.c Thu Feb 27 10:53:07 2014 +0100
@@ -1048,7 +1048,7 @@
static int openSocket(JNIEnv *env, int proto) {
int sock;
- if ((sock = JVM_Socket(proto, SOCK_DGRAM, 0)) < 0) {
+ if ((sock = socket(proto, SOCK_DGRAM, 0)) < 0) {
// If EPROTONOSUPPORT is returned it means we don't have
// support for this proto so don't throw an exception.
if (errno != EPROTONOSUPPORT) {
@@ -1075,9 +1075,9 @@
int sock;
struct ifreq if2;
- if ((sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
if (errno == EPROTONOSUPPORT) {
- if ((sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+ if ( (sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"IPV6 Socket creation failed");
return -1;
@@ -1499,9 +1499,9 @@
int sock, alreadyV6 = 0;
struct lifreq if2;
- if ((sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
if (errno == EPROTONOSUPPORT) {
- if ((sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+ if ( (sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"IPV6 Socket creation failed");
return -1;
@@ -1528,7 +1528,7 @@
strncpy(if2.lifr_name, ifname, sizeof(if2.lifr_name) - 1);
if (ioctl(sock, SIOCGLIFNETMASK, (char *)&if2) < 0) {
close(sock);
- if ((sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+ if ( (sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"IPV6 Socket creation failed");
return -1;
@@ -1872,9 +1872,9 @@
int sock;
struct ifreq if2;
- if ((sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
if (errno == EPROTONOSUPPORT) {
- if ((sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+ if ( (sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"IPV6 Socket creation failed");
return -1;
diff -r c0e856f2dacd -r 79df90ff3070 src/solaris/native/java/net/PlainDatagramSocketImpl.c
--- a/src/solaris/native/java/net/PlainDatagramSocketImpl.c Mon May 16 10:36:51 2016 -0700
+++ b/src/solaris/native/java/net/PlainDatagramSocketImpl.c Thu Feb 27 10:53:07 2014 +0100
@@ -195,6 +195,7 @@
int fd;
int len = 0;
SOCKADDR him;
+ socklen_t slen = sizeof(him);
if (IS_NULL(fdObj)) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
@@ -232,7 +233,7 @@
/* Now that we're a connected socket, let's extract the port number
* that the system chose for us and store it in the Socket object.
*/
- if (JVM_GetSockName(fd, (struct sockaddr *)&him, &len) == -1) {
+ if (getsockname(fd, (struct sockaddr *)&him, &slen) == -1) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"Error getting socket name");
return;
@@ -280,7 +281,7 @@
setDefaultScopeID(env, (struct sockaddr *)&rmtaddr);
- if (JVM_Connect(fd, (struct sockaddr *)&rmtaddr, len) == -1) {
+ if (NET_Connect(fd, (struct sockaddr *)&rmtaddr, len) == -1) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException",
"Connect failed");
return;
@@ -302,7 +303,7 @@
#if defined(__linux__) || defined(_ALLBSD_SOURCE)
SOCKADDR addr;
- int len;
+ socklen_t len;
#endif
if (IS_NULL(fdObj)) {
@@ -324,11 +325,11 @@
him4->sin_family = AF_UNSPEC;
len = sizeof(struct sockaddr_in);
}
- JVM_Connect(fd, (struct sockaddr *)&addr, len);
+ NET_Connect(fd, (struct sockaddr *)&addr, len);
#ifdef __linux__
int localPort = 0;
- if (JVM_GetSockName(fd, (struct sockaddr *)&addr, &len) == -1)
+ if (getsockname(fd, (struct sockaddr *)&addr, &len) == -1)
return;
localPort = NET_GetPortFromSockaddr((struct sockaddr *)&addr);
@@ -348,7 +349,7 @@
#endif
#else
- JVM_Connect(fd, 0, 0);
+ NET_Connect(fd, 0, 0);
#endif
}
@@ -465,20 +466,11 @@
(struct sockaddr *)rmtaddrP, len);
if (ret < 0) {
- switch (ret) {
- case JVM_IO_ERR :
- if (errno == ECONNREFUSED) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException",
+ if (errno == ECONNREFUSED) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException",
"ICMP Port Unreachable");
- } else {
- NET_ThrowByNameWithLastError(env, "java/io/IOException", "sendto failed");
- }
- break;
-
More information about the distro-pkg-dev
mailing list