Reverting until bots clear up.

runtime/bin/socket.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #if !defined(DART_IO_DISABLED)
 
 #include "bin/socket.h"
 
 #include "bin/dartutils.h"
 #include "bin/eventhandler.h"
@@ skipping 130 matching lines @@
         // the file descriptor.
         os_socket->ref_count++;
 
         // The same Socket is used by a second Dart _NativeSocket object.
         // It Retains a reference.
         os_socket->socketfd->Retain();
         // We set as a side-effect the file descriptor on the dart
         // socket_object.
         Socket::ReuseSocketIdNativeField(socket_object, os_socket->socketfd,
                                          true);
+
         return Dart_True();
       }
     }
   }
 
   // There is no socket listening on that (address, port), so we create new one.
   intptr_t fd = ServerSocket::CreateBindListen(addr, backlog, v6_only);
   if (fd == -5) {
     OSError os_error(-1, "Invalid host", OSError::kUnknown);
     return DartUtils::NewDartOSError(&os_error);
   }
   if (fd < 0) {
     OSError error;
     return DartUtils::NewDartOSError(&error);
   }
   if (!ServerSocket::StartAccept(fd)) {
     OSError os_error(-1, "Failed to start accept", OSError::kUnknown);
     return DartUtils::NewDartOSError(&os_error);
   }
-  intptr_t allocated_port = SocketBase::GetPort(fd);
+  intptr_t allocated_port = Socket::GetPort(fd);
   ASSERT(allocated_port > 0);
 
   if (allocated_port != port) {
     // There are two cases to consider:
     //
     //   a) The user requested (address, port) where port != 0 which means
     //      we re-use an existing socket if available (and it is shared) or we
     //      create a new one. The new socket is guaranteed to have that
     //      selected port.
     //
@@ skipping 79 matching lines @@
     return CloseOneSafe(os_socket, true);
   } else {
     // A finalizer may direct the event handler to close a listening socket
     // that it has never seen before. In this case, we return true to direct
     // the eventhandler to clean up the socket.
     return true;
   }
 }
 
 
+void FUNCTION_NAME(InternetAddress_Parse)(Dart_NativeArguments args) {
+  const char* address =
+      DartUtils::GetStringValue(Dart_GetNativeArgument(args, 0));
+  ASSERT(address != NULL);
+  RawAddr raw;
+  memset(&raw, 0, sizeof(raw));
+  int type = strchr(address, ':') == NULL ? SocketAddress::TYPE_IPV4
+                                          : SocketAddress::TYPE_IPV6;
+  if (type == SocketAddress::TYPE_IPV4) {
+    raw.addr.sa_family = AF_INET;
+  } else {
+    raw.addr.sa_family = AF_INET6;
+  }
+  bool ok = Socket::ParseAddress(type, address, &raw);
+  if (!ok) {
+    Dart_SetReturnValue(args, Dart_Null());
+  } else {
+    Dart_SetReturnValue(args, SocketAddress::ToTypedData(raw));
+  }
+}
+
+
+void FUNCTION_NAME(NetworkInterface_ListSupported)(Dart_NativeArguments args) {
+  Dart_SetReturnValue(args, Dart_NewBoolean(Socket::ListInterfacesSupported()));
+}
+
+
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   RawAddr addr;
   SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
   Dart_Handle port_arg = Dart_GetNativeArgument(args, 2);
   int64_t port = DartUtils::GetInt64ValueCheckRange(port_arg, 0, 65535);
   SocketAddress::SetAddrPort(&addr, static_cast<intptr_t>(port));
   intptr_t socket = Socket::CreateConnect(addr);
   OSError error;
   if (socket >= 0) {
     Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket,
@@ skipping 17 matching lines @@
   OSError error;
   if (socket >= 0) {
     Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket,
                                    false);
     Dart_SetReturnValue(args, Dart_True());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
   }
 }
 
+void FUNCTION_NAME(Socket_IsBindError)(Dart_NativeArguments args) {
+  intptr_t error_number =
+      DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
+  bool is_bind_error = Socket::IsBindError(error_number);
+  Dart_SetReturnValue(args, is_bind_error ? Dart_True() : Dart_False());
+}
 
 void FUNCTION_NAME(Socket_CreateBindDatagram)(Dart_NativeArguments args) {
   RawAddr addr;
   SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
   Dart_Handle port_arg = Dart_GetNativeArgument(args, 2);
   int64_t port = DartUtils::GetInt64ValueCheckRange(port_arg, 0, 65535);
   SocketAddress::SetAddrPort(&addr, port);
   bool reuse_addr = DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 3));
   intptr_t socket = Socket::CreateBindDatagram(addr, reuse_addr);
   if (socket >= 0) {
     Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket,
                                    false);
     Dart_SetReturnValue(args, Dart_True());
   } else {
     OSError error;
     Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
   }
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
-  intptr_t available = SocketBase::Available(socket->fd());
+  intptr_t available = Socket::Available(socket->fd());
   if (available >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(available));
   } else {
     // Available failed. Mark socket as having data, to trigger a future read
     // event where the actual error can be reported.
     Dart_SetReturnValue(args, Dart_NewInteger(1));
   }
 }
 
 
 void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   int64_t length = 0;
   if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 1), &length)) {
     if (short_socket_read) {
       length = (length + 1) / 2;
     }
     uint8_t* buffer = NULL;
     Dart_Handle result = IOBuffer::Allocate(length, &buffer);
     if (Dart_IsError(result)) {
       Dart_PropagateError(result);
     }
     ASSERT(buffer != NULL);
-    intptr_t bytes_read = SocketBase::Read(socket->fd(), buffer, length);
+    intptr_t bytes_read = Socket::Read(socket->fd(), buffer, length);
     if (bytes_read == length) {
       Dart_SetReturnValue(args, result);
     } else if (bytes_read > 0) {
       uint8_t* new_buffer = NULL;
       Dart_Handle new_result = IOBuffer::Allocate(bytes_read, &new_buffer);
       if (Dart_IsError(new_result)) {
         Dart_PropagateError(new_result);
       }
       ASSERT(new_buffer != NULL);
       memmove(new_buffer, buffer, bytes_read);
@@ skipping 19 matching lines @@
 
   // TODO(sgjesse): Use a MTU value here. Only the loopback adapter can
   // handle 64k datagrams.
   IsolateData* isolate_data =
       reinterpret_cast<IsolateData*>(Dart_CurrentIsolateData());
   if (isolate_data->udp_receive_buffer == NULL) {
     isolate_data->udp_receive_buffer =
         reinterpret_cast<uint8_t*>(malloc(65536));
   }
   RawAddr addr;
-  intptr_t bytes_read = SocketBase::RecvFrom(
+  intptr_t bytes_read = Socket::RecvFrom(
       socket->fd(), isolate_data->udp_receive_buffer, 65536, &addr);
   if (bytes_read == 0) {
     Dart_SetReturnValue(args, Dart_Null());
     return;
   }
   if (bytes_read < 0) {
     ASSERT(bytes_read == -1);
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
     return;
   }
@@ skipping 10 matching lines @@
   // Get the port and clear it in the sockaddr structure.
   int port = SocketAddress::GetAddrPort(addr);
   if (addr.addr.sa_family == AF_INET) {
     addr.in.sin_port = 0;
   } else {
     ASSERT(addr.addr.sa_family == AF_INET6);
     addr.in6.sin6_port = 0;
   }
   // Format the address to a string using the numeric format.
   char numeric_address[INET6_ADDRSTRLEN];
-  SocketBase::FormatNumericAddress(addr, numeric_address, INET6_ADDRSTRLEN);
+  Socket::FormatNumericAddress(addr, numeric_address, INET6_ADDRSTRLEN);
 
   // Create a Datagram object with the data and sender address and port.
   const int kNumArgs = 4;
   Dart_Handle dart_args[kNumArgs];
   dart_args[0] = data;
   dart_args[1] = Dart_NewStringFromCString(numeric_address);
   if (Dart_IsError(dart_args[1])) {
     Dart_PropagateError(dart_args[1]);
   }
   dart_args[2] = SocketAddress::ToTypedData(addr);
@@ skipping 29 matching lines @@
   Dart_TypedData_Type type;
   uint8_t* buffer = NULL;
   intptr_t len;
   Dart_Handle result = Dart_TypedDataAcquireData(
       buffer_obj, &type, reinterpret_cast<void**>(&buffer), &len);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   ASSERT((offset + length) <= len);
   buffer += offset;
-  intptr_t bytes_written = SocketBase::Write(socket->fd(), buffer, length);
+  intptr_t bytes_written = Socket::Write(socket->fd(), buffer, length);
   if (bytes_written >= 0) {
     Dart_TypedDataReleaseData(buffer_obj);
     if (short_write) {
       // If the write was forced 'short', indicate by returning the negative
       // number of bytes. A forced short write may not trigger a write event.
       Dart_SetReturnValue(args, Dart_NewInteger(-bytes_written));
     } else {
       Dart_SetReturnValue(args, Dart_NewInteger(bytes_written));
     }
   } else {
@@ skipping 21 matching lines @@
   Dart_TypedData_Type type;
   uint8_t* buffer = NULL;
   intptr_t len;
   Dart_Handle result = Dart_TypedDataAcquireData(
       buffer_obj, &type, reinterpret_cast<void**>(&buffer), &len);
   if (Dart_IsError(result)) {
     Dart_PropagateError(result);
   }
   ASSERT((offset + length) <= len);
   buffer += offset;
-  intptr_t bytes_written =
-      SocketBase::SendTo(socket->fd(), buffer, length, addr);
+  intptr_t bytes_written = Socket::SendTo(socket->fd(), buffer, length, addr);
   if (bytes_written >= 0) {
     Dart_TypedDataReleaseData(buffer_obj);
     Dart_SetReturnValue(args, Dart_NewInteger(bytes_written));
   } else {
     // Extract OSError before we release data, as it may override the error.
     OSError os_error;
     Dart_TypedDataReleaseData(buffer_obj);
     Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
-  intptr_t port = SocketBase::GetPort(socket->fd());
+  intptr_t port = Socket::GetPort(socket->fd());
   if (port > 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(port));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
   intptr_t port = 0;
-  SocketAddress* addr = SocketBase::GetRemotePeer(socket->fd(), &port);
+  SocketAddress* addr = Socket::GetRemotePeer(socket->fd(), &port);
   if (addr != NULL) {
     Dart_Handle list = Dart_NewList(2);
 
     Dart_Handle entry = Dart_NewList(3);
     Dart_ListSetAt(entry, 0, Dart_NewInteger(addr->GetType()));
     Dart_ListSetAt(entry, 1, Dart_NewStringFromCString(addr->as_string()));
 
     RawAddr raw = addr->addr();
     Dart_ListSetAt(entry, 2, SocketAddress::ToTypedData(raw));
 
     Dart_ListSetAt(list, 0, entry);
     Dart_ListSetAt(list, 1, Dart_NewInteger(port));
     Dart_SetReturnValue(args, list);
     delete addr;
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
-  SocketBase::GetError(socket->fd(), &os_error);
+  Socket::GetError(socket->fd(), &os_error);
   Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
 }
 
 
 void FUNCTION_NAME(Socket_GetType)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   OSError os_error;
-  intptr_t type = SocketBase::GetType(socket->fd());
+  intptr_t type = Socket::GetType(socket->fd());
   if (type >= 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(type));
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
   int64_t num =
       DartUtils::GetInt64ValueCheckRange(Dart_GetNativeArgument(args, 1), 0, 2);
-  intptr_t socket = SocketBase::GetStdioHandle(num);
+  intptr_t socket = Socket::GetStdioHandle(num);
   Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), socket,
                                  false);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
 }
 
 
 void FUNCTION_NAME(Socket_GetSocketId)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   intptr_t id = reinterpret_cast<intptr_t>(socket);
@@ skipping 42 matching lines @@
 
 
 CObject* Socket::LookupRequest(const CObjectArray& request) {
   if ((request.Length() == 2) && request[0]->IsString() &&
       request[1]->IsInt32()) {
     CObjectString host(request[0]);
     CObjectInt32 type(request[1]);
     CObject* result = NULL;
     OSError* os_error = NULL;
     AddressList<SocketAddress>* addresses =
-        SocketBase::LookupAddress(host.CString(), type.Value(), &os_error);
+        Socket::LookupAddress(host.CString(), type.Value(), &os_error);
     if (addresses != NULL) {
       CObjectArray* array =
           new CObjectArray(CObject::NewArray(addresses->count() + 1));
       array->SetAt(0, new CObjectInt32(CObject::NewInt32(0)));
       for (intptr_t i = 0; i < addresses->count(); i++) {
         SocketAddress* addr = addresses->GetAt(i);
         CObjectArray* entry = new CObjectArray(CObject::NewArray(3));
 
         CObjectInt32* type =
             new CObjectInt32(CObject::NewInt32(addr->GetType()));
@@ skipping 34 matching lines @@
     } else {
       ASSERT(len == sizeof(in6_addr));
       addr.in6.sin6_family = AF_INET6;
       memmove(reinterpret_cast<void*>(&addr.in6.sin6_addr),
               addr_object.Buffer(), len);
     }
 
     OSError* os_error = NULL;
     const intptr_t kMaxHostLength = 1025;
     char host[kMaxHostLength];
-    if (SocketBase::ReverseLookup(addr, host, kMaxHostLength, &os_error)) {
+    if (Socket::ReverseLookup(addr, host, kMaxHostLength, &os_error)) {
       return new CObjectString(CObject::NewString(host));
     } else {
       CObject* result = CObject::NewOSError(os_error);
       delete os_error;
       return result;
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
 CObject* Socket::ListInterfacesRequest(const CObjectArray& request) {
   if ((request.Length() == 1) && request[0]->IsInt32()) {
     CObjectInt32 type(request[0]);
     CObject* result = NULL;
     OSError* os_error = NULL;
     AddressList<InterfaceSocketAddress>* addresses =
-        SocketBase::ListInterfaces(type.Value(), &os_error);
+        Socket::ListInterfaces(type.Value(), &os_error);
     if (addresses != NULL) {
       CObjectArray* array =
           new CObjectArray(CObject::NewArray(addresses->count() + 1));
       array->SetAt(0, new CObjectInt32(CObject::NewInt32(0)));
       for (intptr_t i = 0; i < addresses->count(); i++) {
         InterfaceSocketAddress* interface = addresses->GetAt(i);
         SocketAddress* addr = interface->socket_address();
         CObjectArray* entry = new CObjectArray(CObject::NewArray(5));
 
         CObjectInt32* type =
@@ skipping 33 matching lines @@
 void FUNCTION_NAME(Socket_GetOption)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   int64_t option = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   intptr_t protocol = static_cast<intptr_t>(
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2)));
   bool ok = false;
   switch (option) {
     case 0: {  // TCP_NODELAY.
       bool enabled;
-      ok = SocketBase::GetNoDelay(socket->fd(), &enabled);
+      ok = Socket::GetNoDelay(socket->fd(), &enabled);
       if (ok) {
         Dart_SetReturnValue(args, enabled ? Dart_True() : Dart_False());
       }
       break;
     }
     case 1: {  // IP_MULTICAST_LOOP.
       bool enabled;
-      ok = SocketBase::GetMulticastLoop(socket->fd(), protocol, &enabled);
+      ok = Socket::GetMulticastLoop(socket->fd(), protocol, &enabled);
       if (ok) {
         Dart_SetReturnValue(args, enabled ? Dart_True() : Dart_False());
       }
       break;
     }
     case 2: {  // IP_MULTICAST_TTL.
       int value;
-      ok = SocketBase::GetMulticastHops(socket->fd(), protocol, &value);
+      ok = Socket::GetMulticastHops(socket->fd(), protocol, &value);
       if (ok) {
         Dart_SetReturnValue(args, Dart_NewInteger(value));
       }
       break;
     }
     case 3: {  // IP_MULTICAST_IF.
       UNIMPLEMENTED();
       break;
     }
     case 4: {  // IP_BROADCAST.
       bool enabled;
-      ok = SocketBase::GetBroadcast(socket->fd(), &enabled);
+      ok = Socket::GetBroadcast(socket->fd(), &enabled);
       if (ok) {
         Dart_SetReturnValue(args, enabled ? Dart_True() : Dart_False());
       }
       break;
     }
     default:
       UNREACHABLE();
       break;
   }
   // In case of failure the return value is not set above.
   if (!ok) {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
   bool result = false;
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   int64_t option = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   int64_t protocol = DartUtils::GetInt64ValueCheckRange(
       Dart_GetNativeArgument(args, 2), SocketAddress::TYPE_IPV4,
       SocketAddress::TYPE_IPV6);
   switch (option) {
     case 0:  // TCP_NODELAY.
-      result = SocketBase::SetNoDelay(
+      result = Socket::SetNoDelay(
           socket->fd(),
           DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 3)));
       break;
     case 1:  // IP_MULTICAST_LOOP.
-      result = SocketBase::SetMulticastLoop(
+      result = Socket::SetMulticastLoop(
           socket->fd(), protocol,
           DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 3)));
       break;
     case 2:  // IP_MULTICAST_TTL.
-      result = SocketBase::SetMulticastHops(
+      result = Socket::SetMulticastHops(
           socket->fd(), protocol,
           DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3)));
       break;
     case 3: {  // IP_MULTICAST_IF.
       UNIMPLEMENTED();
       break;
     }
     case 4:  // IP_BROADCAST.
-      result = SocketBase::SetBroadcast(
+      result = Socket::SetBroadcast(
           socket->fd(),
           DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 3)));
       break;
     default:
       Dart_PropagateError(Dart_NewApiError("Value outside expected range"));
       break;
   }
   if (result) {
     Dart_SetReturnValue(args, Dart_Null());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_JoinMulticast)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   RawAddr addr;
   SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
   RawAddr interface;
   if (Dart_GetNativeArgument(args, 2) != Dart_Null()) {
     SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 2), &interface);
   }
   int interfaceIndex =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
-  if (SocketBase::JoinMulticast(socket->fd(), addr, interface,
-                                interfaceIndex)) {
+  if (Socket::JoinMulticast(socket->fd(), addr, interface, interfaceIndex)) {
     Dart_SetReturnValue(args, Dart_Null());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 void FUNCTION_NAME(Socket_LeaveMulticast)(Dart_NativeArguments args) {
   Socket* socket =
       Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
   RawAddr addr;
   SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
   RawAddr interface;
   if (Dart_GetNativeArgument(args, 2) != Dart_Null()) {
     SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 2), &interface);
   }
   int interfaceIndex =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
-  if (SocketBase::LeaveMulticast(socket->fd(), addr, interface,
-                                 interfaceIndex)) {
+  if (Socket::LeaveMulticast(socket->fd(), addr, interface, interfaceIndex)) {
     Dart_SetReturnValue(args, Dart_Null());
   } else {
     Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
 }
 
 
 static void SocketFinalizer(void* isolate_data,
                             Dart_WeakPersistentHandle handle,
                             void* data) {
@@ skipping 56 matching lines @@
     Dart_PropagateError(err);
   }
   Socket* socket = reinterpret_cast<Socket*>(id);
   return socket;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // !defined(DART_IO_DISABLED)