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

6972374: NetworkInterface.getNetworkInterfaces throws "java.net.SocketException" on Solaris zone

Browse Source 
Reviewed-by: alanb, dsamersoff
This commit is contained in:
Chris Hegarty 2010-07-29 10:02:41 +01:00
parent 837cc6d064
commit 2d91b17b0a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/solaris/native/java/net/NetworkInterface.c
View File

@ -131,7 +131,7 @@ static struct sockaddr *getBroadcast(JNIEnv *env, int sock, const char *name, s
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 @@ static int getFlags0(JNIEnv *env, jstring name) {
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 @@ netif *addif(JNIEnv *env, int sock, const char * if_name, netif *ifs, struct soc
* 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 @@ static int getMTU(JNIEnv *env, int sock, const char *ifname) {
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 getMTU(JNIEnv *env, int sock, const char *ifname) {
}
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;
}