OpenJDK / portola / portola
changeset 6129:e76ab178e431
6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone
Reviewed-by: alanb, dsamersoff
author | chegar |
---|---|
date | Thu, 29 Jul 2010 10:02:41 +0100 |
parents | 4ae58033c829 |
children | 7cec6f30de9c |
files | jdk/src/solaris/native/java/net/NetworkInterface.c |
diffstat | 1 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/solaris/native/java/net/NetworkInterface.c Tue Jul 27 11:40:46 2010 +0100 +++ b/jdk/src/solaris/native/java/net/NetworkInterface.c Thu Jul 29 10:02:41 2010 +0100 @@ -131,7 +131,7 @@ static short getSubnet(JNIEnv *env, int sock, const char *ifname); static int getIndex(int sock, const char *ifname); -static int getFlags(JNIEnv *env, int sock, const char *ifname); +static int getFlags(int sock, const char *ifname); static int getMacAddress(JNIEnv *env, int sock, const char* ifname, const struct in_addr* addr, unsigned char *buf); static int getMTU(JNIEnv *env, int sock, const char *ifname); @@ -550,7 +550,7 @@ name_utf = (*env)->GetStringUTFChars(env, name, &isCopy); - ret = getFlags(env, sock, name_utf); + ret = getFlags(sock, name_utf); close(sock); (*env)->ReleaseStringUTFChars(env, name, name_utf); @@ -885,7 +885,7 @@ * the 'parent' interface with the new records. */ *name_colonP = 0; - if (getFlags(env,sock,name) < 0) { + if (getFlags(sock, name) < 0) { // failed to access parent interface do not create parent. // We are a virtual interface with no parent. isVirtual = 1; @@ -1257,7 +1257,7 @@ return if2.ifr_mtu; } -static int getFlags(JNIEnv *env, int sock, const char *ifname) { +static int getFlags(int sock, const char *ifname) { struct ifreq if2; int ret = -1; @@ -1633,13 +1633,12 @@ } -static int getFlags(JNIEnv *env, int sock, const char *ifname) { +static int getFlags(int sock, const char *ifname) { struct lifreq lifr; memset((caddr_t)&lifr, 0, sizeof(lifr)); strcpy((caddr_t)&(lifr.lifr_name), ifname); if (ioctl(sock, SIOCGLIFFLAGS, (char *)&lifr) < 0) { - NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGLIFFLAGS failed"); return -1; }