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

6800805: java.net.NetworkInterface.getNetworkInterfaces() does not list IPv6 network interfaces correctly

Browse Source 
Reviewed-by: jccollet
This commit is contained in:
Chris Hegarty 2009-02-16 17:19:05 +00:00
parent 030a13d8fe
commit 7dbcbc13d7
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -969,13 +969,39 @@ netif *addif(JNIEnv *env, netif *ifs, char *if_name, int index, int family,
// Got access to parent, so create it if necessary.
strcpy(vname, name);
*unit = '\0';
}
else {
} else {
#if defined(__solaris__) && defined(AF_INET6)
struct lifreq lifr;
memset((char *) &lifr, 0, sizeof(lifr));
strcpy(lifr.lifr_name, vname);
/* Try with an IPv6 socket in case the interface has only IPv6
* addresses assigned to it */
close(sock);
sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0);
if (sock < 0) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
"Socket creation failed");
return ifs; /* return untouched list */
}
if (ioctl(sock, SIOCGLIFFLAGS, (char *)&lifr) >= 0) {
// Got access to parent, so create it if necessary.
strcpy(vname, name);
*unit = '\0';
} else {
// failed to access parent interface do not create parent.
// We are a virtual interface with no parent.
isVirtual = 1;
vname[0] = 0;
}
#else
// failed to access parent interface do not create parent.
// We are a virtual interface with no parent.
isVirtual = 1;
vname[0] = 0;
#endif
}
}
close(sock);