Pulled a significant portion of Socket implementation into BaseSocket in order to prepare for the s…

runtime/bin/socket_android.cc

Index: runtime/bin/socket_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index b2be713480a6fda28ebc29324383aab88d156e27..4d3997a2f67f076d066f2a77de61b17f0d476a6b 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -8,7 +8,7 @@
 #if defined(HOST_OS_ANDROID)
 
 #include "bin/socket.h"
-#include "bin/socket_android.h"
+#include "bin/socket_base_android.h"

[zra, 2017/04/02 21:39:27]

This should go down with the other bin/ includes.

[bkonyi, 2017/04/02 22:09:28]

Done.

 
 #include <errno.h>        // NOLINT
 #include <netinet/tcp.h>  // NOLINT
@@ -25,24 +25,6 @@
 namespace dart {
 namespace bin {
 
-SocketAddress::SocketAddress(struct sockaddr* sa) {
-  ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
-  if (!Socket::FormatNumericAddress(*reinterpret_cast<RawAddr*>(sa), as_string_,
-                                    INET6_ADDRSTRLEN)) {
-    as_string_[0] = 0;
-  }
-  socklen_t salen = GetAddrLength(*reinterpret_cast<RawAddr*>(sa));
-  memmove(reinterpret_cast<void*>(&addr_), sa, salen);
-}
-
-
-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) {}
 
@@ -115,207 +97,6 @@ intptr_t Socket::CreateBindConnect(const RawAddr& addr,
 }
 
 
-bool Socket::IsBindError(intptr_t error_number) {
-  return error_number == EADDRINUSE || error_number == EADDRNOTAVAIL ||
-         error_number == EINVAL;
-}
-
-
-intptr_t Socket::Available(intptr_t fd) {
-  return FDUtils::AvailableBytes(fd);
-}
-
-
-intptr_t Socket::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);
-  if ((read_bytes == -1) && (errno == EWOULDBLOCK)) {
-    // If the read would block we need to retry and therefore return 0
-    // as the number of bytes written.
-    read_bytes = 0;
-  }
-  return read_bytes;
-}
-
-
-intptr_t Socket::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(
-      recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
-  if ((read_bytes == -1) && (errno == EWOULDBLOCK)) {
-    // If the read would block we need to retry and therefore return 0
-    // as the number of bytes written.
-    read_bytes = 0;
-  }
-  return read_bytes;
-}
-
-
-intptr_t Socket::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);
-  if ((written_bytes == -1) && (errno == EWOULDBLOCK)) {
-    // If the would block we need to retry and therefore return 0 as
-    // the number of bytes written.
-    written_bytes = 0;
-  }
-  return written_bytes;
-}
-
-
-intptr_t Socket::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,
-                                SocketAddress::GetAddrLength(addr)));
-  ASSERT(EAGAIN == EWOULDBLOCK);
-  if ((written_bytes == -1) && (errno == EWOULDBLOCK)) {
-    // If the would block we need to retry and therefore return 0 as
-    // the number of bytes written.
-    written_bytes = 0;
-  }
-  return written_bytes;
-}
-
-
-intptr_t Socket::GetPort(intptr_t fd) {
-  ASSERT(fd >= 0);
-  RawAddr raw;
-  socklen_t size = sizeof(raw);
-  if (NO_RETRY_EXPECTED(getsockname(fd, &raw.addr, &size))) {
-    return 0;
-  }
-  return SocketAddress::GetAddrPort(raw);
-}
-
-
-SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
-  ASSERT(fd >= 0);
-  RawAddr raw;
-  socklen_t size = sizeof(raw);
-  if (NO_RETRY_EXPECTED(getpeername(fd, &raw.addr, &size))) {
-    return NULL;
-  }
-  *port = SocketAddress::GetAddrPort(raw);
-  return new SocketAddress(&raw.addr);
-}
-
-
-void Socket::GetError(intptr_t fd, OSError* os_error) {
-  int errorNumber;
-  socklen_t len = sizeof(errorNumber);
-  getsockopt(fd, SOL_SOCKET, SO_ERROR, reinterpret_cast<void*>(&errorNumber),
-             &len);
-  os_error->SetCodeAndMessage(OSError::kSystem, errorNumber);
-}
-
-
-int Socket::GetType(intptr_t fd) {
-  struct stat buf;
-  int result = fstat(fd, &buf);
-  if (result == -1) {
-    return -1;
-  }
-  if (S_ISCHR(buf.st_mode)) {
-    return File::kTerminal;
-  }
-  if (S_ISFIFO(buf.st_mode)) {
-    return File::kPipe;
-  }
-  if (S_ISREG(buf.st_mode)) {
-    return File::kFile;
-  }
-  return File::kOther;
-}
-
-
-intptr_t Socket::GetStdioHandle(intptr_t num) {
-  return num;
-}
-
-
-AddressList<SocketAddress>* Socket::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));
-  hints.ai_family = SocketAddress::FromType(type);
-  hints.ai_socktype = SOCK_STREAM;
-  hints.ai_flags = AI_ADDRCONFIG;
-  hints.ai_protocol = IPPROTO_TCP;
-  struct addrinfo* info = NULL;
-  int status = getaddrinfo(host, 0, &hints, &info);
-  if (status != 0) {
-    // We failed, try without AI_ADDRCONFIG. This can happen when looking up
-    // e.g. '::1', when there are no IPv6 addresses.
-    hints.ai_flags = 0;
-    status = getaddrinfo(host, 0, &hints, &info);
-    if (status != 0) {
-      ASSERT(*os_error == NULL);
-      *os_error =
-          new OSError(status, gai_strerror(status), OSError::kGetAddressInfo);
-      return NULL;
-    }
-  }
-  intptr_t count = 0;
-  for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
-    if ((c->ai_family == AF_INET) || (c->ai_family == AF_INET6)) {
-      count++;
-    }
-  }
-  intptr_t i = 0;
-  AddressList<SocketAddress>* addresses = new AddressList<SocketAddress>(count);
-  for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
-    if ((c->ai_family == AF_INET) || (c->ai_family == AF_INET6)) {
-      addresses->SetAt(i, new SocketAddress(c->ai_addr));
-      i++;
-    }
-  }
-  freeaddrinfo(info);
-  return addresses;
-}
-
-
-bool Socket::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,
-                  host_len, NULL, 0, NI_NAMEREQD));
-  if (status != 0) {
-    ASSERT(*os_error == NULL);
-    *os_error =
-        new OSError(status, gai_strerror(status), OSError::kGetAddressInfo);
-    return false;
-  }
-  return true;
-}
-
-
-bool Socket::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);
-  } else {
-    ASSERT(type == SocketAddress::TYPE_IPV6);
-    result = inet_pton(AF_INET6, address, &addr->in6.sin6_addr);
-  }
-  return (result == 1);
-}
-
-
 intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) {
   intptr_t fd;
 
@@ -349,25 +130,6 @@ intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) {
 }
 
 
-bool Socket::ListInterfacesSupported() {
-  return false;
-}
-
-
-AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
-    int type,
-    OSError** os_error) {
-  // The ifaddrs.h header is not provided on Android.  An Android
-  // implementation would have to use IOCTL or netlink.
-  ASSERT(*os_error == NULL);
-  *os_error = new OSError(-1,
-                          "Listing interfaces is not supported "
-                          "on this platform",
-                          OSError::kSystem);
-  return NULL;
-}
-
-
 intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
                                         intptr_t backlog,
                                         bool v6_only) {
@@ -401,7 +163,7 @@ intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
 
   // Test for invalid socket port 65535 (some browsers disallow it).
   if ((SocketAddress::GetAddrPort(addr)) == 0 &&
-      (Socket::GetPort(fd) == 65535)) {
+      (SocketBase::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);
@@ -464,128 +226,6 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
   return socket;
 }
 
-
-void Socket::Close(intptr_t fd) {
-  ASSERT(fd >= 0);
-  VOID_TEMP_FAILURE_RETRY(close(fd));
-}
-
-
-bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
-  int on;
-  socklen_t len = sizeof(on);
-  int err = NO_RETRY_EXPECTED(getsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
-                                         reinterpret_cast<void*>(&on), &len));
-  if (err == 0) {
-    *enabled = (on == 1);
-  }
-  return (err == 0);
-}
-
-
-bool Socket::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),
-                                      sizeof(on))) == 0;
-}
-
-
-bool Socket::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;
-  int optname = protocol == SocketAddress::TYPE_IPV4 ? IP_MULTICAST_LOOP
-                                                     : IPV6_MULTICAST_LOOP;
-  if (NO_RETRY_EXPECTED(getsockopt(fd, level, optname,
-                                   reinterpret_cast<char*>(&on), &len)) == 0) {
-    *enabled = (on == 1);
-    return true;
-  }
-  return false;
-}
-
-
-bool Socket::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
-                                                     : IPV6_MULTICAST_LOOP;
-  return NO_RETRY_EXPECTED(setsockopt(
-             fd, level, optname, reinterpret_cast<char*>(&on), sizeof(on))) ==
-         0;
-}
-
-bool Socket::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;
-  int optname = protocol == SocketAddress::TYPE_IPV4 ? IP_MULTICAST_TTL
-                                                     : IPV6_MULTICAST_HOPS;
-  if (NO_RETRY_EXPECTED(getsockopt(fd, level, optname,
-                                   reinterpret_cast<char*>(&v), &len)) == 0) {
-    *value = v;
-    return true;
-  }
-  return false;
-}
-
-
-bool Socket::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
-                                                     : IPV6_MULTICAST_HOPS;
-  return NO_RETRY_EXPECTED(setsockopt(
-             fd, level, optname, reinterpret_cast<char*>(&v), sizeof(v))) == 0;
-}
-
-
-bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
-  int on;
-  socklen_t len = sizeof(on);
-  int err = NO_RETRY_EXPECTED(getsockopt(fd, SOL_SOCKET, SO_BROADCAST,
-                                         reinterpret_cast<char*>(&on), &len));
-  if (err == 0) {
-    *enabled = (on == 1);
-  }
-  return (err == 0);
-}
-
-
-bool Socket::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),
-                                      sizeof(on))) == 0;
-}
-
-
-bool Socket::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;
-  memmove(&mreq.gr_group, &addr.ss, SocketAddress::GetAddrLength(addr));
-  return NO_RETRY_EXPECTED(
-             setsockopt(fd, proto, MCAST_JOIN_GROUP, &mreq, sizeof(mreq))) == 0;
-}
-
-
-bool Socket::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;
-  memmove(&mreq.gr_group, &addr.ss, SocketAddress::GetAddrLength(addr));
-  return NO_RETRY_EXPECTED(setsockopt(fd, proto, MCAST_LEAVE_GROUP, &mreq,
-                                      sizeof(mreq))) == 0;
-}
-
 }  // namespace bin
 }  // namespace dart