Re-land socket refactor with fixes for Windows.

runtime/bin/socket_base_android.cc

Index: runtime/bin/socket_base_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_base_android.cc
similarity index 56%
copy from runtime/bin/socket_android.cc
copy to runtime/bin/socket_base_android.cc
index b2be713480a6fda28ebc29324383aab88d156e27..1f4feb803a15cd339c692ed388089d9acb2d33c9 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_base_android.cc
@@ -7,8 +7,7 @@
 #include "platform/globals.h"
 #if defined(HOST_OS_ANDROID)
 
-#include "bin/socket.h"
-#include "bin/socket_android.h"
+#include "bin/socket_base.h"
 
 #include <errno.h>        // NOLINT
 #include <netinet/tcp.h>  // NOLINT
@@ -20,6 +19,7 @@
 
 #include "bin/fdutils.h"
 #include "bin/file.h"
+#include "bin/socket_base_android.h"
 #include "platform/signal_blocker.h"
 
 namespace dart {
@@ -27,8 +27,8 @@ namespace bin {
 
 SocketAddress::SocketAddress(struct sockaddr* sa) {
   ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
-  if (!Socket::FormatNumericAddress(*reinterpret_cast<RawAddr*>(sa), as_string_,
-                                    INET6_ADDRSTRLEN)) {
+  if (!SocketBase::FormatNumericAddress(*reinterpret_cast<RawAddr*>(sa),
+                                        as_string_, INET6_ADDRSTRLEN)) {
     as_string_[0] = 0;
   }
   socklen_t salen = GetAddrLength(*reinterpret_cast<RawAddr*>(sa));
@@ -36,97 +36,33 @@ SocketAddress::SocketAddress(struct sockaddr* sa) {
 }
 
 
-bool Socket::FormatNumericAddress(const RawAddr& addr, char* address, int len) {
-  socklen_t salen = SocketAddress::GetAddrLength(addr);
-  return (NO_RETRY_EXPECTED(getnameinfo(&addr.addr, salen, address, len, NULL,
-                                        0, NI_NUMERICHOST)) == 0);
-}
-
-
-Socket::Socket(intptr_t fd)
-    : ReferenceCounted(), fd_(fd), port_(ILLEGAL_PORT) {}
-
-
-void Socket::SetClosedFd() {
-  fd_ = kClosedFd;
-}
-
-
-bool Socket::Initialize() {
+bool SocketBase::Initialize() {
   // Nothing to do on Android.
   return true;
 }
 
 
-static intptr_t Create(const RawAddr& addr) {
-  intptr_t fd;
-  fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, SOCK_STREAM, 0));
-  if (fd < 0) {
-    return -1;
-  }
-  if (!FDUtils::SetCloseOnExec(fd)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-  return fd;
-}
-
-
-static intptr_t Connect(intptr_t fd, const RawAddr& addr) {
-  intptr_t result = TEMP_FAILURE_RETRY(
-      connect(fd, &addr.addr, SocketAddress::GetAddrLength(addr)));
-  if ((result == 0) || (errno == EINPROGRESS)) {
-    return fd;
-  }
-  FDUtils::SaveErrorAndClose(fd);
-  return -1;
-}
-
-
-intptr_t Socket::CreateConnect(const RawAddr& addr) {
-  intptr_t fd = Create(addr);
-  if (fd < 0) {
-    return fd;
-  }
-
-  if (!FDUtils::SetNonBlocking(fd)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-  return Connect(fd, addr);
-}
-
-
-intptr_t Socket::CreateBindConnect(const RawAddr& addr,
-                                   const RawAddr& source_addr) {
-  intptr_t fd = Create(addr);
-  if (fd < 0) {
-    return fd;
-  }
-
-  intptr_t result = TEMP_FAILURE_RETRY(
-      bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(source_addr)));
-  if ((result != 0) && (errno != EINPROGRESS)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-
-  return Connect(fd, addr);
+bool SocketBase::FormatNumericAddress(const RawAddr& addr,
+                                      char* address,
+                                      int len) {
+  socklen_t salen = SocketAddress::GetAddrLength(addr);
+  return (NO_RETRY_EXPECTED(getnameinfo(&addr.addr, salen, address, len, NULL,
+                                        0, NI_NUMERICHOST)) == 0);
 }
 
 
-bool Socket::IsBindError(intptr_t error_number) {
+bool SocketBase::IsBindError(intptr_t error_number) {
   return error_number == EADDRINUSE || error_number == EADDRNOTAVAIL ||
          error_number == EINVAL;
 }
 
 
-intptr_t Socket::Available(intptr_t fd) {
+intptr_t SocketBase::Available(intptr_t fd) {
   return FDUtils::AvailableBytes(fd);
 }
 
 
-intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
+intptr_t SocketBase::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
   ssize_t read_bytes = TEMP_FAILURE_RETRY(read(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
@@ -139,10 +75,10 @@ intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
 }
 
 
-intptr_t Socket::RecvFrom(intptr_t fd,
-                          void* buffer,
-                          intptr_t num_bytes,
-                          RawAddr* addr) {
+intptr_t SocketBase::RecvFrom(intptr_t fd,
+                              void* buffer,
+                              intptr_t num_bytes,
+                              RawAddr* addr) {
   ASSERT(fd >= 0);
   socklen_t addr_len = sizeof(addr->ss);
   ssize_t read_bytes = TEMP_FAILURE_RETRY(
@@ -156,7 +92,9 @@ intptr_t Socket::RecvFrom(intptr_t fd,
 }
 
 
-intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
+intptr_t SocketBase::Write(intptr_t fd,
+                           const void* buffer,
+                           intptr_t num_bytes) {
   ASSERT(fd >= 0);
   ssize_t written_bytes = TEMP_FAILURE_RETRY(write(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
@@ -169,10 +107,10 @@ intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
 }
 
 
-intptr_t Socket::SendTo(intptr_t fd,
-                        const void* buffer,
-                        intptr_t num_bytes,
-                        const RawAddr& addr) {
+intptr_t SocketBase::SendTo(intptr_t fd,
+                            const void* buffer,
+                            intptr_t num_bytes,
+                            const RawAddr& addr) {
   ASSERT(fd >= 0);
   ssize_t written_bytes =
       TEMP_FAILURE_RETRY(sendto(fd, buffer, num_bytes, 0, &addr.addr,
@@ -187,7 +125,7 @@ intptr_t Socket::SendTo(intptr_t fd,
 }
 
 
-intptr_t Socket::GetPort(intptr_t fd) {
+intptr_t SocketBase::GetPort(intptr_t fd) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
@@ -198,7 +136,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
 }
 
 
-SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
+SocketAddress* SocketBase::GetRemotePeer(intptr_t fd, intptr_t* port) {
   ASSERT(fd >= 0);
   RawAddr raw;
   socklen_t size = sizeof(raw);
@@ -210,7 +148,7 @@ SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
 }
 
 
-void Socket::GetError(intptr_t fd, OSError* os_error) {
+void SocketBase::GetError(intptr_t fd, OSError* os_error) {
   int errorNumber;
   socklen_t len = sizeof(errorNumber);
   getsockopt(fd, SOL_SOCKET, SO_ERROR, reinterpret_cast<void*>(&errorNumber),
@@ -219,7 +157,7 @@ void Socket::GetError(intptr_t fd, OSError* os_error) {
 }
 
 
-int Socket::GetType(intptr_t fd) {
+int SocketBase::GetType(intptr_t fd) {
   struct stat buf;
   int result = fstat(fd, &buf);
   if (result == -1) {
@@ -238,14 +176,14 @@ int Socket::GetType(intptr_t fd) {
 }
 
 
-intptr_t Socket::GetStdioHandle(intptr_t num) {
+intptr_t SocketBase::GetStdioHandle(intptr_t num) {
   return num;
 }
 
 
-AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
-                                                  int type,
-                                                  OSError** os_error) {
+AddressList<SocketAddress>* SocketBase::LookupAddress(const char* host,
+                                                      int type,
+                                                      OSError** os_error) {
   // Perform a name lookup for a host name.
   struct addrinfo hints;
   memset(&hints, 0, sizeof(hints));
@@ -286,10 +224,10 @@ AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
 }
 
 
-bool Socket::ReverseLookup(const RawAddr& addr,
-                           char* host,
-                           intptr_t host_len,
-                           OSError** os_error) {
+bool SocketBase::ReverseLookup(const RawAddr& addr,
+                               char* host,
+                               intptr_t host_len,
+                               OSError** os_error) {
   ASSERT(host_len >= NI_MAXHOST);
   int status = NO_RETRY_EXPECTED(
       getnameinfo(&addr.addr, SocketAddress::GetAddrLength(addr), host,
@@ -304,7 +242,7 @@ bool Socket::ReverseLookup(const RawAddr& addr,
 }
 
 
-bool Socket::ParseAddress(int type, const char* address, RawAddr* addr) {
+bool SocketBase::ParseAddress(int type, const char* address, RawAddr* addr) {
   int result;
   if (type == SocketAddress::TYPE_IPV4) {
     result = inet_pton(AF_INET, address, &addr->in.sin_addr);
@@ -316,45 +254,12 @@ bool Socket::ParseAddress(int type, const char* address, RawAddr* addr) {
 }
 
 
-intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) {
-  intptr_t fd;
-
-  fd = NO_RETRY_EXPECTED(socket(addr.addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
-  if (fd < 0) {
-    return -1;
-  }
-
-  if (!FDUtils::SetCloseOnExec(fd)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-
-  if (reuseAddress) {
-    int optval = 1;
-    VOID_NO_RETRY_EXPECTED(
-        setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
-  }
-
-  if (NO_RETRY_EXPECTED(
-          bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-
-  if (!FDUtils::SetNonBlocking(fd)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-  return fd;
-}
-
-
-bool Socket::ListInterfacesSupported() {
+bool SocketBase::ListInterfacesSupported() {
   return false;
 }
 
 
-AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
+AddressList<InterfaceSocketAddress>* SocketBase::ListInterfaces(
     int type,
     OSError** os_error) {
   // The ifaddrs.h header is not provided on Android.  An Android
@@ -368,110 +273,13 @@ AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
 }
 
 
-intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
-                                        intptr_t backlog,
-                                        bool v6_only) {
-  intptr_t fd;
-
-  fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, SOCK_STREAM, 0));
-  if (fd < 0) {
-    return -1;
-  }
-
-  if (!FDUtils::SetCloseOnExec(fd)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-
-  int optval = 1;
-  VOID_NO_RETRY_EXPECTED(
-      setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
-
-  if (addr.ss.ss_family == AF_INET6) {
-    optval = v6_only ? 1 : 0;
-    VOID_NO_RETRY_EXPECTED(
-        setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
-  }
-
-  if (NO_RETRY_EXPECTED(
-          bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-
-  // Test for invalid socket port 65535 (some browsers disallow it).
-  if ((SocketAddress::GetAddrPort(addr)) == 0 &&
-      (Socket::GetPort(fd) == 65535)) {
-    // Don't close the socket until we have created a new socket, ensuring
-    // that we do not get the bad port number again.
-    intptr_t new_fd = CreateBindListen(addr, backlog, v6_only);
-    FDUtils::SaveErrorAndClose(fd);
-    return new_fd;
-  }
-
-  if (NO_RETRY_EXPECTED(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-
-  if (!FDUtils::SetNonBlocking(fd)) {
-    FDUtils::SaveErrorAndClose(fd);
-    return -1;
-  }
-  return fd;
-}
-
-
-bool ServerSocket::StartAccept(intptr_t fd) {
-  USE(fd);
-  return true;
-}
-
-
-static bool IsTemporaryAcceptError(int error) {
-  // On Android a number of protocol errors should be treated as EAGAIN.
-  // These are the ones for TCP/IP.
-  return (error == EAGAIN) || (error == ENETDOWN) || (error == EPROTO) ||
-         (error == ENOPROTOOPT) || (error == EHOSTDOWN) || (error == ENONET) ||
-         (error == EHOSTUNREACH) || (error == EOPNOTSUPP) ||
-         (error == ENETUNREACH);
-}
-
-
-intptr_t ServerSocket::Accept(intptr_t fd) {
-  intptr_t socket;
-  struct sockaddr clientaddr;
-  socklen_t addrlen = sizeof(clientaddr);
-  socket = TEMP_FAILURE_RETRY(accept(fd, &clientaddr, &addrlen));
-  if (socket == -1) {
-    if (IsTemporaryAcceptError(errno)) {
-      // We need to signal to the caller that this is actually not an
-      // error. We got woken up from the poll on the listening socket,
-      // but there is no connection ready to be accepted.
-      ASSERT(kTemporaryFailure != -1);
-      socket = kTemporaryFailure;
-    }
-  } else {
-    if (!FDUtils::SetCloseOnExec(socket)) {
-      FDUtils::SaveErrorAndClose(socket);
-      return -1;
-    }
-    if (!FDUtils::SetNonBlocking(socket)) {
-      FDUtils::SaveErrorAndClose(socket);
-      return -1;
-    }
-  }
-  return socket;
-}
-
-
-void Socket::Close(intptr_t fd) {
+void SocketBase::Close(intptr_t fd) {
   ASSERT(fd >= 0);
   VOID_TEMP_FAILURE_RETRY(close(fd));
 }
 
 
-bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
+bool SocketBase::GetNoDelay(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
   int err = NO_RETRY_EXPECTED(getsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
@@ -483,7 +291,7 @@ bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
 }
 
 
-bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
+bool SocketBase::SetNoDelay(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
   return NO_RETRY_EXPECTED(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
                                       reinterpret_cast<char*>(&on),
@@ -491,7 +299,9 @@ bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
 }
 
 
-bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
+bool SocketBase::GetMulticastLoop(intptr_t fd,
+                                  intptr_t protocol,
+                                  bool* enabled) {
   uint8_t on;
   socklen_t len = sizeof(on);
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
@@ -506,7 +316,9 @@ bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
 }
 
 
-bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
+bool SocketBase::SetMulticastLoop(intptr_t fd,
+                                  intptr_t protocol,
+                                  bool enabled) {
   int on = enabled ? 1 : 0;
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4 ? IP_MULTICAST_LOOP
@@ -516,7 +328,7 @@ bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
          0;
 }
 
-bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
+bool SocketBase::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
   uint8_t v;
   socklen_t len = sizeof(v);
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
@@ -531,7 +343,7 @@ bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
 }
 
 
-bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
+bool SocketBase::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
   int v = value;
   int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
   int optname = protocol == SocketAddress::TYPE_IPV4 ? IP_MULTICAST_TTL
@@ -541,7 +353,7 @@ bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
 }
 
 
-bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
+bool SocketBase::GetBroadcast(intptr_t fd, bool* enabled) {
   int on;
   socklen_t len = sizeof(on);
   int err = NO_RETRY_EXPECTED(getsockopt(fd, SOL_SOCKET, SO_BROADCAST,
@@ -553,7 +365,7 @@ bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
 }
 
 
-bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
+bool SocketBase::SetBroadcast(intptr_t fd, bool enabled) {
   int on = enabled ? 1 : 0;
   return NO_RETRY_EXPECTED(setsockopt(fd, SOL_SOCKET, SO_BROADCAST,
                                       reinterpret_cast<char*>(&on),
@@ -561,10 +373,10 @@ bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
 }
 
 
-bool Socket::JoinMulticast(intptr_t fd,
-                           const RawAddr& addr,
-                           const RawAddr&,
-                           int interfaceIndex) {
+bool SocketBase::JoinMulticast(intptr_t fd,
+                               const RawAddr& addr,
+                               const RawAddr&,
+                               int interfaceIndex) {
   int proto = (addr.addr.sa_family == AF_INET) ? IPPROTO_IP : IPPROTO_IPV6;
   struct group_req mreq;
   mreq.gr_interface = interfaceIndex;
@@ -574,10 +386,10 @@ bool Socket::JoinMulticast(intptr_t fd,
 }
 
 
-bool Socket::LeaveMulticast(intptr_t fd,
-                            const RawAddr& addr,
-                            const RawAddr&,
-                            int interfaceIndex) {
+bool SocketBase::LeaveMulticast(intptr_t fd,
+                                const RawAddr& addr,
+                                const RawAddr&,
+                                int interfaceIndex) {
   int proto = (addr.addr.sa_family == AF_INET) ? IPPROTO_IP : IPPROTO_IPV6;
   struct group_req mreq;
   mreq.gr_interface = interfaceIndex;