jdk-sandbox: comparison jdk/src/java.base/unix/native/libnet/NetworkInterface.c

equal deleted inserted replaced

-:48a0335cdadc
+:42d2c26ffdf3
 #ifdef AF_INET6
 static netif  *enumIPv6Interfaces(JNIEnv *env, int sock, netif *ifs);
 #endif
 static netif  *addif(JNIEnv *env, int sock, const char *if_name, netif *ifs,
-struct sockaddr *ifr_addrP, int family, short prefix);
+struct sockaddr *ifr_addrP, struct sockaddr *ifr_broadaddrP,
+struct sockaddr *ifr_subnetaddrP, int family, short prefix);
 static void    freeif(netif *ifs);
 static int     openSocket(JNIEnv *env, int proto);
 static int     openSocketWithFallback(JNIEnv *env, const char *ifname);
 static struct  sockaddr *getBroadcast(JNIEnv *env, int sock, const char *name,
 struct sockaddr *brdcast_store);
 static short   getSubnet(JNIEnv *env, int sock, const char *ifname);
+static short   computeMaskFromAddress(struct sockaddr *ifr_subnetaddrP);
 static int     getIndex(int sock, const char *ifname);
 static int     getFlags(int sock, const char *ifname, int *flags);
 static int     getMacAddress(JNIEnv *env, int sock,  const char *ifname,
 const struct in_addr *addr, unsigned char *buf);
 currif = ifs;
 }
 }
 netif *addif(JNIEnv *env, int sock, const char *if_name, netif *ifs,
-struct sockaddr *ifr_addrP, int family, short prefix)
+struct sockaddr *ifr_addrP, struct sockaddr *ifr_broadaddrP,
+struct sockaddr *ifr_subnetaddrP, int family, short prefix)
 {
 netif *currif = ifs, *parent;
 netaddr *addrP;
 #ifdef LIFNAMSIZ
 addrP->family = family;
 addrP->brdcast = NULL;
 addrP->mask = prefix;
 addrP->next = 0;
 if (family == AF_INET) {
 // Deal with broadcast addr & subnet mask
-struct sockaddr *brdcast_to =
+if (ifr_broadaddrP != NULL) {  // just set it, if already known
-(struct sockaddr *) ((char *)addrP + sizeof(netaddr) + addr_size);
+addrP->brdcast =
-addrP->brdcast = getBroadcast(env, sock, name, brdcast_to);
+(struct sockaddr *)((char *)addrP + sizeof(netaddr) + addr_size);
-if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
+memcpy(addrP->brdcast, ifr_broadaddrP, addr_size);
-return ifs;
+} else {  // otherwise look it up
-}
+struct sockaddr *brdcast_to =
-if ((mask = getSubnet(env, sock, name)) != -1) {
+(struct sockaddr *)((char *)addrP + sizeof(netaddr) + addr_size);
-addrP->mask = mask;
+addrP->brdcast = getBroadcast(env, sock, name, brdcast_to);
-} else if((*env)->ExceptionCheck(env)) {
+if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
 return ifs;
 }
 }
+if (ifr_subnetaddrP != NULL) {  // just compute the mask, if already known
+addrP->mask = computeMaskFromAddress(ifr_subnetaddrP);
+} else {   // otherwise look it up
+if ((mask = getSubnet(env, sock, name)) != -1) {
+addrP->mask = mask;
+} else if((*env)->ExceptionCheck(env)) {
+return ifs;
+}
+}
+}
 // Deal with virtual interface with colon notation e.g. eth0:1
 name_colonP = strchr(name, ':');
 if (name_colonP != NULL) {
 // This is a virtual interface. If we are able to access the parent
 }
 return ifs;
 }
+static short computeMaskFromAddress(struct sockaddr *ifr_subnetaddrP) {
+short ret = 0;
+unsigned int mask;
+mask = ntohl(((struct sockaddr_in*)ifr_subnetaddrP)->sin_addr.s_addr);
+while (mask) {
+mask <<= 1;
+ret++;
+}
+return ret;
+}
 /*
 * Opens a socket for further ioct calls. proto is one of AF_INET or AF_INET6.
 */
 static int openSocket(JNIEnv *env, int proto) {
 int sock;
 return ifs;
 }
 // Iterate through each interface
 ifreqP = ifc.ifc_req;
+struct sockaddr addr, broadaddr, netmask;
 for (i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++, ifreqP++) {
+struct sockaddr* broadaddrP = NULL;
+struct sockaddr* subnetaddrP = NULL;
+// Ignore non IPv4 Interfaces
+if ((struct sockaddr *)&(ifreqP->ifr_addr) != NULL &&
+((struct sockaddr *)&(ifreqP->ifr_addr))->sa_family != AF_INET) {
+continue;
+}
+memcpy(&addr, &(ifreqP->ifr_addr), sizeof(struct sockaddr));
+// set broadaddrP, if applicable
+if ((ifreqP->ifr_flags & IFF_POINTOPOINT) == 0 &&
+ifreqP->ifr_flags & IFF_BROADCAST) {
+if (ioctl(sock, SIOCGIFBRDADDR, ifreqP) == 0) {
+memcpy(&broadaddr, &(ifreqP->ifr_broadaddr), sizeof(struct sockaddr));
+broadaddrP = &broadaddr;
+}
+// restore the address, for subsequent calls
+memcpy(&(ifreqP->ifr_addr), &addr, sizeof(struct sockaddr));
+}
+if (ioctl(sock, SIOCGIFNETMASK, ifreqP) == 0) {
 #if defined(_AIX)
-if (ifreqP->ifr_addr.sa_family != AF_INET) continue;
+memcpy(&netmask, &(ifreqP->ifr_addr), sizeof(struct sockaddr));
-#endif
+#else
+memcpy(&netmask, &(ifreqP->ifr_netmask), sizeof(struct sockaddr));
+#endif
+subnetaddrP = &netmask;
+}
 // Add to the list
 ifs = addif(env, sock, ifreqP->ifr_name, ifs,
-(struct sockaddr *)&(ifreqP->ifr_addr), AF_INET, 0);
+&addr, broadaddrP, subnetaddrP, AF_INET, 0);
 // If an exception occurred then free the list
 if ((*env)->ExceptionOccurred(env)) {
 free(buf);
 freeif(ifs);
 memcpy((void*)addr.sin6_addr.s6_addr, (const void*)ipv6addr, 16);
 addr.sin6_scope_id = if_idx;
 ifs = addif(env, sock, devname, ifs, (struct sockaddr *)&addr,
-AF_INET6, (short)prefix);
+NULL, NULL, AF_INET6, (short)prefix);
 // If an exception occurred then return the list as is.
 if ((*env)->ExceptionOccurred(env)) {
 fclose(f);
 return ifs;
 s6->sin6_scope_id = if2.ifr_site6;
 }
 // Add to the list
 ifs = addif(env, sock, ifreqP->ifr_name, ifs,
-(struct sockaddr *)&(ifreqP->ifr_addr), AF_INET6, 0);
+(struct sockaddr *)&(ifreqP->ifr_addr),
+NULL, NULL, AF_INET6, 0);
 // If an exception occurred then free the list
 if ((*env)->ExceptionOccurred(env)) {
 free(buf);
 freeif(ifs);
 NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
 "ioctl SIOCGIFNETMASK failed");
 return -1;
 }
-mask = ntohl(((struct sockaddr_in*)&(if2.ifr_addr))->sin_addr.s_addr);
+return computeMaskFromAddress(&(if2.ifr_addr));
-ret = 0;
-while (mask) {
-mask <<= 1;
-ret++;
-}
-return ret;
 }
 /*
 * Gets the Hardware address (usually MAC address) for the named interface.
 * On return puts the data in buf, and returns the length, in byte, of the
 }
 #endif
 // add to the list
 ifs = addif(env, sock,ifr->lifr_name, ifs,
-(struct sockaddr *)&(ifr->lifr_addr), family,
+(struct sockaddr *)&(ifr->lifr_addr),
-(short)ifr->lifr_addrlen);
+NULL, NULL, family, (short)ifr->lifr_addrlen);
 // If an exception occurred we return immediately
 if ((*env)->ExceptionOccurred(env)) {
 free(buf);
 return ifs;
 NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
 "ioctl SIOCGLIFNETMASK failed");
 return -1;
 }
-mask = ntohl(((struct sockaddr_in*)&(if2.lifr_addr))->sin_addr.s_addr);
+return computeMaskFromAddress(&(if2.lifr_addr));
-ret = 0;
-while (mask) {
-mask <<= 1;
-ret++;
-}
-return ret;
 }
 #define DEV_PREFIX  "/dev/"
 "getifaddrs() function failed");
 return ifs;
 }
 for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) {
+struct sockaddr* ifa_broadaddr = NULL;
 // Skip non-AF_INET entries.
 if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET)
 continue;
+// set ifa_broadaddr, if there is one
+if ((ifa->ifa_flags & IFF_POINTOPOINT) == 0 &&
+ifa->ifa_flags & IFF_BROADCAST) {
+ifa_broadaddr = ifa->ifa_broadaddr;
+}
 // Add to the list.
-ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, AF_INET, 0);
+ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr,
+ifa_broadaddr, ifa->ifa_netmask, AF_INET, 0);
 // If an exception occurred then free the list.
 if ((*env)->ExceptionOccurred(env)) {
 freeifaddrs(origifa);
 freeif(ifs);
 return NULL;
 }
 // Add to the list.
 sin6 = (struct sockaddr_in6 *)&ifr6.ifr_addr;
-ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, AF_INET6,
+ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, NULL, NULL,
-(short)prefix(&sin6->sin6_addr, sizeof(struct in6_addr)));
+AF_INET6,
+(short)prefix(&sin6->sin6_addr, sizeof(struct in6_addr)));
 // If an exception occurred then free the list.
 if ((*env)->ExceptionOccurred(env)) {
 freeifaddrs(origifa);
 freeif(ifs);
 NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
 "ioctl SIOCGIFNETMASK failed");
 return -1;
 }
-mask = ntohl(((struct sockaddr_in*)&(if2.ifr_addr))->sin_addr.s_addr);
+return computeMaskFromAddress(&(if2.ifr_addr));
-ret = 0;
-while (mask) {
-mask <<= 1;
-ret++;
-}
-return ret;
 }
 /*
 * Gets the Hardware address (usually MAC address) for the named interface.
 * return puts the data in buf, and returns the length, in byte, of the

changeset 38885	42d2c26ffdf3
parent 38563	3ab5f00bd5a3
child 39318	2006d1d41c8b