src/java.base/unix/native/libnet/PlainSocketImpl.c

rev 59383 : [mq]: final

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 264,312 ****
          NET_SetTrafficClass(&sa, trafficClass);
      }
  
      if (timeout <= 0) {
          connect_rv = NET_Connect(fd, &sa.sa, len);
- #ifdef __solaris__
-         if (connect_rv == -1 && errno == EINPROGRESS ) {
- 
-             /* This can happen if a blocking connect is interrupted by a signal.
-              * See 6343810.
-              */
-             while (1) {
-                 struct pollfd pfd;
-                 pfd.fd = fd;
-                 pfd.events = POLLOUT;
- 
-                 connect_rv = NET_Poll(&pfd, 1, -1);
- 
-                 if (connect_rv == -1) {
-                     if (errno == EINTR) {
-                         continue;
-                     } else {
-                         break;
-                     }
-                 }
-                 if (connect_rv > 0) {
-                     socklen_t optlen;
-                     /* has connection been established */
-                     optlen = sizeof(connect_rv);
-                     if (getsockopt(fd, SOL_SOCKET, SO_ERROR,
-                                    (void*)&connect_rv, &optlen) <0) {
-                         connect_rv = errno;
-                     }
- 
-                     if (connect_rv != 0) {
-                         /* restore errno */
-                         errno = connect_rv;
-                         connect_rv = -1;
-                     }
-                     break;
-                 }
-             }
-         }
- #endif
      } else {
          /*
           * A timeout was specified. We put the socket into non-blocking
           * mode, connect, and then wait for the connection to be
           * established, fail, or timeout.
--- 264,273 ----
*** 891,910 ****
              optlen = sizeof(optval.i);
  
      }
  
      if (NET_SetSockOpt(fd, level, optname, (const void *)&optval, optlen) < 0) {
! #if defined(__solaris__) || defined(_AIX)
          if (errno == EINVAL) {
!             // On Solaris setsockopt will set errno to EINVAL if the socket
              // is closed. The default error message is then confusing
              char fullMsg[128];
              jio_snprintf(fullMsg, sizeof(fullMsg), "Invalid option or socket reset by remote peer");
              JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", fullMsg);
              return;
          }
! #endif /* __solaris__ */
          JNU_ThrowByNameWithMessageAndLastError
              (env, JNU_JAVANETPKG "SocketException", "Error setting socket option");
      }
  }
  
--- 852,871 ----
              optlen = sizeof(optval.i);
  
      }
  
      if (NET_SetSockOpt(fd, level, optname, (const void *)&optval, optlen) < 0) {
! #if defined(_AIX)
          if (errno == EINVAL) {
!             // On AIX setsockopt will set errno to EINVAL if the socket
              // is closed. The default error message is then confusing
              char fullMsg[128];
              jio_snprintf(fullMsg, sizeof(fullMsg), "Invalid option or socket reset by remote peer");
              JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", fullMsg);
              return;
          }
! #endif /* _AIX */
          JNU_ThrowByNameWithMessageAndLastError
              (env, JNU_JAVANETPKG "SocketException", "Error setting socket option");
      }
  }