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

equal deleted inserted replaced

-:47f8baf1fcbd
+:a7e3457672c7
 CHECK_NULL_RETURN(i_ctrID, NULL);
 i_class = (*env)->NewGlobalRef(env, c);
 CHECK_NULL_RETURN(i_class, NULL);
 }
-return ( (*env)->NewObject(env, i_class, i_ctrID, i) );
+return (*env)->NewObject(env, i_class, i_ctrID, i);
 }
 /*
 * Returns a java.lang.Boolean based on 'b'
 */
 CHECK_NULL_RETURN(b_ctrID, NULL);
 b_class = (*env)->NewGlobalRef(env, c);
 CHECK_NULL_RETURN(b_class, NULL);
 }
-return( (*env)->NewObject(env, b_class, b_ctrID, (jboolean)(b!=0)) );
+return (*env)->NewObject(env, b_class, b_ctrID, (jboolean)(b != 0));
 }
 /*
 * Returns the fd for a PlainDatagramSocketImpl or -1
 * if closed.
 */
 if (fdObj == NULL) {
 return -1;
 }
 return (*env)->GetIntField(env, fdObj, IO_fd_fdID);
 }
 /*
 * Class:     java_net_PlainDatagramSocketImpl
 * Method:    init
 * Signature: ()V
 CHECK_NULL(IO_fd_fdID);
 initInetAddressIDs(env);
 JNU_CHECK_EXCEPTION(env);
 Java_java_net_NetworkInterface_init(env, 0);
 }
 /*
 * Class:     java_net_PlainDatagramSocketImpl
 * Method:    bind
 * Signature: (ILjava/net/InetAddress;)V
 */
 JNIEXPORT void JNICALL
 Java_java_net_PlainDatagramSocketImpl_bind0(JNIEnv *env, jobject this,
 jint localport, jobject iaObj) {
 /* fdObj is the FileDescriptor field on this */
 jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
 /* fd is an int field on fdObj */
 int fd;
 int len = 0;
-SOCKETADDRESS him;
+SOCKETADDRESS sa;
 socklen_t slen = sizeof(SOCKETADDRESS);
 if (IS_NULL(fdObj)) {
 JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
 "Socket closed");
 JNU_ThrowNullPointerException(env, "iaObj is null.");
 return;
 }
 /* bind */
-if (NET_InetAddressToSockaddr(env, iaObj, localport, &him.sa, &len, JNI_TRUE) != 0) {
+if (NET_InetAddressToSockaddr(env, iaObj, localport, &sa, &len,
+JNI_TRUE) != 0) {
 return;
 }
-setDefaultScopeID(env, &him.sa);
+setDefaultScopeID(env, &sa.sa);
-if (NET_Bind(fd, &him.sa, len) < 0)  {
+if (NET_Bind(fd, &sa, len) < 0)  {
 if (errno == EADDRINUSE || errno == EADDRNOTAVAIL ||
 errno == EPERM || errno == EACCES) {
 NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "BindException",
 "Bind failed");
 } else {
 /* initialize the local port */
 if (localport == 0) {
 /* 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 (getsockname(fd, &him.sa, &slen) == -1) {
+if (getsockname(fd, &sa.sa, &slen) == -1) {
 JNU_ThrowByNameWithMessageAndLastError
 (env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
 return;
 }
-localport = NET_GetPortFromSockaddr(&him.sa);
+localport = NET_GetPortFromSockaddr(&sa);
 (*env)->SetIntField(env, this, pdsi_localPortID, localport);
 } else {
 (*env)->SetIntField(env, this, pdsi_localPortID, localport);
 }
 if (IS_NULL(address)) {
 JNU_ThrowNullPointerException(env, "address");
 return;
 }
-if (NET_InetAddressToSockaddr(env, address, port, &rmtaddr.sa, &len, JNI_TRUE) != 0) {
+if (NET_InetAddressToSockaddr(env, address, port, &rmtaddr, &len,
+JNI_TRUE) != 0) {
 return;
 }
 setDefaultScopeID(env, &rmtaddr.sa);
 jint fd;
 #if defined(__linux__) || defined(_ALLBSD_SOURCE)
 SOCKETADDRESS addr;
 socklen_t len;
+#if defined(__linux__)
+int localPort = 0;
+#endif
 #endif
 if (IS_NULL(fdObj)) {
 return;
 }
 fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
 #if defined(__linux__) || defined(_ALLBSD_SOURCE)
 memset(&addr, 0, sizeof(addr));
 if (ipv6_available()) {
 addr.sa6.sin6_family = AF_UNSPEC;
 len = sizeof(struct sockaddr_in6);
+} else {
+addr.sa4.sin_family = AF_UNSPEC;
+len = sizeof(struct sockaddr_in);
+}
+NET_Connect(fd, &addr.sa, len);
+#if defined(__linux__)
+if (getsockname(fd, &addr.sa, &len) == -1)
+return;
+localPort = NET_GetPortFromSockaddr(&addr);
+if (localPort == 0) {
+localPort = (*env)->GetIntField(env, this, pdsi_localPortID);
+if (addr.sa.sa_family == AF_INET6) {
+addr.sa6.sin6_port = htons(localPort);
 } else {
-addr.sa4.sin_family = AF_UNSPEC;
+addr.sa4.sin_port = htons(localPort);
-len = sizeof(struct sockaddr_in);
+}
-}
-NET_Connect(fd, &addr.sa, len);
+NET_Bind(fd, &addr, len);
+}
-#ifdef __linux__
-int localPort = 0;
-if (getsockname(fd, &addr.sa, &len) == -1)
-return;
-localPort = NET_GetPortFromSockaddr(&addr.sa);
-if (localPort == 0) {
-localPort = (*env)->GetIntField(env, this, pdsi_localPortID);
-if (addr.sa.sa_family == AF_INET6) {
-addr.sa6.sin6_port = htons(localPort);
-} else {
-addr.sa4.sin_port = htons(localPort);
-}
-NET_Bind(fd, &addr.sa, len);
-}
 #endif
 #else
 NET_Connect(fd, 0, 0);
 #endif
 jboolean connected;
 /* The fdObj'fd */
 jint fd;
-SOCKETADDRESS rmtaddr, *rmtaddrP = &rmtaddr;
+SOCKETADDRESS rmtaddr;
-int len;
+struct sockaddr *rmtaddrP = 0;
+int len = 0;
 if (IS_NULL(fdObj)) {
 JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
 "Socket closed");
 return;
 }
 packetBufferOffset = (*env)->GetIntField(env, packet, dp_offsetID);
 packetBufferLen = (*env)->GetIntField(env, packet, dp_lengthID);
-if (connected) {
+// arg to NET_Sendto() null, if connected
-/* arg to NET_Sendto () null in this case */
+if (!connected) {
-len = 0;
-rmtaddrP = 0;
-} else {
 packetPort = (*env)->GetIntField(env, packet, dp_portID);
-if (NET_InetAddressToSockaddr(env, packetAddress, packetPort, &rmtaddr.sa, &len, JNI_TRUE) != 0) {
+if (NET_InetAddressToSockaddr(env, packetAddress, packetPort, &rmtaddr,
+&len, JNI_TRUE) != 0) {
 return;
 }
+rmtaddrP = &rmtaddr.sa;
 }
 setDefaultScopeID(env, &rmtaddr.sa);
 if (packetBufferLen > MAX_BUFFER_LEN) {
 /* When JNI-ifying the JDK's IO routines, we turned
 }
 (*env)->GetByteArrayRegion(env, packetBuffer, packetBufferOffset, packetBufferLen,
 (jbyte *)fullPacket);
 if (trafficClass != 0 && ipv6_available()) {
-NET_SetTrafficClass(&rmtaddr.sa, trafficClass);
+NET_SetTrafficClass(&rmtaddr, trafficClass);
 }
 /*
 * Send the datagram.
 *
 * If we are connected it's possible that sendto will return
 * ECONNREFUSED indicating that an ICMP port unreachable has
 * received.
 */
-ret = NET_SendTo(fd, fullPacket, packetBufferLen, 0,
+ret = NET_SendTo(fd, fullPacket, packetBufferLen, 0, rmtaddrP, len);
-(struct sockaddr *)rmtaddrP, len);
 if (ret < 0) {
 if (errno == ECONNREFUSED) {
 JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException",
 "ICMP Port Unreachable");
 if (n == -1) {
 #ifdef __solaris__
 if (errno == ECONNREFUSED) {
 int orig_errno = errno;
-(void) recv(fd, buf, 1, 0);
+recv(fd, buf, 1, 0);
 errno = orig_errno;
 }
 #endif
 if (errno == ECONNREFUSED) {
 JNU_ThrowByName(env, JNU_JAVANETPKG "PortUnreachableException",
 }
 }
 return 0;
 }
-iaObj = NET_SockaddrToInetAddress(env, &rmtaddr.sa, &port);
+iaObj = NET_SockaddrToInetAddress(env, &rmtaddr, &port);
 family = getInetAddress_family(env, iaObj) == java_net_InetAddress_IPv4 ?
 AF_INET : AF_INET6;
 if (family == AF_INET) { /* this API can't handle IPV6 addresses */
 int address = getInetAddress_addr(env, iaObj);
 setInetAddress_addr(env, addressObj, address);
 * packet. If so we check if it is the same source address. We
 * can't update any existing InetAddress because it is immutable
 */
 packetAddress = (*env)->GetObjectField(env, packet, dp_addressID);
 if (packetAddress != NULL) {
-if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr.sa, packetAddress)) {
+if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr, packetAddress)) {
 /* force a new InetAddress to be created */
 packetAddress = NULL;
 }
 }
 if (packetAddress == NULL) {
-packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr.sa, &port);
+packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr, &port);
 /* stuff the new Inetaddress in the packet */
 (*env)->SetObjectField(env, packet, dp_addressID, packetAddress);
 } else {
 /* only get the new port number */
-port = NET_GetPortFromSockaddr(&rmtaddr.sa);
+port = NET_GetPortFromSockaddr(&rmtaddr);
 }
 /* and fill in the data, remote address/port and such */
 (*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n,
 (jbyte *)fullPacket);
 (*env)->SetIntField(env, packet, dp_portID, port);
 * packet. If so we check if it is the same source address. We
 * can't update any existing InetAddress because it is immutable
 */
 packetAddress = (*env)->GetObjectField(env, packet, dp_addressID);
 if (packetAddress != NULL) {
-if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr.sa, packetAddress)) {
+if (!NET_SockaddrEqualsInetAddress(env, &rmtaddr,
+packetAddress)) {
 /* force a new InetAddress to be created */
 packetAddress = NULL;
 }
 }
 if (packetAddress == NULL) {
-packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr.sa, &port);
+packetAddress = NET_SockaddrToInetAddress(env, &rmtaddr, &port);
 /* stuff the new Inetaddress in the packet */
 (*env)->SetObjectField(env, packet, dp_addressID, packetAddress);
 } else {
 /* only get the new port number */
-port = NET_GetPortFromSockaddr(&rmtaddr.sa);
+port = NET_GetPortFromSockaddr(&rmtaddr);
 }
 /* and fill in the data, remote address/port and such */
 (*env)->SetByteArrayRegion(env, packetBuffer, packetBufferOffset, n,
 (jbyte *)fullPacket);
 (*env)->SetIntField(env, packet, dp_portID, port);
 }
 /*
 * We need an ipv4 address here
 */
+in.s_addr = 0;
 for (i = 0; i < len; i++) {
 addr = (*env)->GetObjectArrayElement(env, addrArray, i);
 if (getInetAddress_family(env, addr) == java_net_InetAddress_IPv4) {
 in.s_addr = htonl(getInetAddress_addr(env, addr));
 break;
 }
 }
 if (setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
-(const char*)&in, sizeof(in)) < 0) {
+(const char *)&in, sizeof(in)) < 0) {
 JNU_ThrowByNameWithMessageAndLastError
 (env, JNU_JAVANETPKG "SocketException", "Error setting socket option");
 }
 }
 /*
 * SO_BINDADDR implemented using getsockname
 */
 if (opt == java_net_SocketOptions_SO_BINDADDR) {
 /* find out local IP address */
-SOCKETADDRESS him;
+SOCKETADDRESS sa;
 socklen_t len = sizeof(SOCKETADDRESS);
 int port;
 jobject iaObj;
-if (getsockname(fd, &him.sa, &len) == -1) {
+if (getsockname(fd, &sa.sa, &len) == -1) {
 JNU_ThrowByNameWithMessageAndLastError
 (env, JNU_JAVANETPKG "SocketException", "Error getting socket name");
 return NULL;
 }
-iaObj = NET_SockaddrToInetAddress(env, &him.sa, &port);
+iaObj = NET_SockaddrToInetAddress(env, &sa, &port);
 return iaObj;
 }
 /*
 addr = (*env)->GetObjectArrayElement(env, addrArray, 0);
 mname.imr_multiaddr.s_addr = htonl(getInetAddress_addr(env, iaObj));
 #ifdef __linux__
 mname.imr_address.s_addr = htonl(getInetAddress_addr(env, addr));
+mname.imr_ifindex = 0;
 #else
 mname.imr_interface.s_addr = htonl(getInetAddress_addr(env, addr));
 #endif
 mname_len = sizeof(struct ip_mreq);
 }
 return;
 }
 #ifdef __linux__
 mname.imr_address.s_addr = in.s_addr;
+mname.imr_ifindex = 0;
 #else
 mname.imr_interface.s_addr = in.s_addr;
 #endif
 mname.imr_multiaddr.s_addr = htonl(getInetAddress_addr(env, iaObj));
 mname_len = sizeof(struct ip_mreq);

changeset 43100	a7e3457672c7
parent 41834	99c4f72c0a91
child 44916	54d70322b32c