Add new InternetAddress class with a static lookup function (including IPv6 results).

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.
 
 #include "bin/io_buffer.h"
 #include "bin/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
 #include "platform/globals.h"
 #include "platform/thread.h"
 #include "platform/utils.h"
 
 #include "include/dart_api.h"
 
 static const int kSocketIdNativeField = 0;
 
 dart::Mutex Socket::mutex_;
 int Socket::service_ports_size_ = 0;
 Dart_Port* Socket::service_ports_ = NULL;
 int Socket::service_ports_index_ = 0;
 
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  const char* host = DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
+  int type = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
+  Dart_Handle host_obj = Dart_GetNativeArgument(args, 2);
+  Dart_TypedData_Type data_type;
+  uint8_t* data = NULL;
+  intptr_t len;
+  Dart_Handle result = Dart_TypedDataAcquireData(
+      host_obj, &data_type, reinterpret_cast<void**>(&data), &len);
   int64_t port = 0;
-  if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 2), &port)) {
-    intptr_t socket = Socket::CreateConnect(host, port);
+  if (!Dart_IsError(result) &&
+      DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 3), &port)) {
+    intptr_t socket = Socket::CreateConnect(
+        type == 1 ? SocketAddress::IPv6 : SocketAddress::IPv4,
+        data,
+        len,
+        port);
+    Dart_TypedDataReleaseData(host_obj);
     if (socket >= 0) {
       Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
       if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       Dart_SetReturnValue(args, DartUtils::NewDartOSError());
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
@@ skipping 262 matching lines @@
   Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
   if (Dart_IsError(err)) Dart_PropagateError(err);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
-  Dart_Handle bind_address_obj = Dart_GetNativeArgument(args, 1);
-  Dart_Handle port_obj = Dart_GetNativeArgument(args, 2);
-  Dart_Handle backlog_obj = Dart_GetNativeArgument(args, 3);
+  int type = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
+  Dart_Handle host_obj = Dart_GetNativeArgument(args, 2);
+  Dart_TypedData_Type data_type;
+  uint8_t* data = NULL;
+  intptr_t len;
+  Dart_Handle result = Dart_TypedDataAcquireData(
+      host_obj, &data_type, reinterpret_cast<void**>(&data), &len);
+  Dart_Handle port_obj = Dart_GetNativeArgument(args, 3);
+  Dart_Handle backlog_obj = Dart_GetNativeArgument(args, 4);
   int64_t port = 0;
   int64_t backlog = 0;
-  if (Dart_IsString(bind_address_obj) &&
+  if (!Dart_IsError(result) &&
       DartUtils::GetInt64Value(port_obj, &port) &&
       DartUtils::GetInt64Value(backlog_obj, &backlog)) {
-    const char* bind_address = DartUtils::GetStringValue(bind_address_obj);
-    intptr_t socket =
-        ServerSocket::CreateBindListen(bind_address, port, backlog);
+    intptr_t socket = ServerSocket::CreateBindListen(
+        type == 1 ? SocketAddress::IPv6 : SocketAddress::IPv4,
+        data,
+        len,
+        port,
+        backlog);
+    Dart_TypedDataReleaseData(host_obj);
     if (socket >= 0) {
       Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
       if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, Dart_True());
     } else {
       if (socket == -5) {
         OSError os_error(-1, "Invalid host", OSError::kUnknown);
         Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
       } else {
         Dart_SetReturnValue(args, DartUtils::NewDartOSError());
@@ skipping 29 matching lines @@
   }
   Dart_ExitScope();
 }
 
 
 static CObject* LookupRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString host(request[1]);
     CObject* result = NULL;
     OSError* os_error = NULL;
-    const char* ip_address =
-        Socket::LookupIPv4Address(host.CString(), &os_error);
-    if (ip_address != NULL) {
-      result = new CObjectString(CObject::NewString(ip_address));
-      free(const_cast<char*>(ip_address));
+    SocketAddresses* addresses =
+        Socket::LookupAddress(host.CString(), &os_error);
+    if (addresses != NULL) {
+      CObjectArray* array = new CObjectArray(
+          CObject::NewArray(addresses->count));
+      for (intptr_t i = 0; i < addresses->count; i++) {
+        CObjectArray* entry = new CObjectArray(CObject::NewArray(3));
+
+        CObjectInt32* type = new CObjectInt32(CObject::NewInt32(
+            static_cast<int>(addresses->addresses[i]->type)));
+        entry->SetAt(0, type);
+
+        CObjectString* as_string = new CObjectString(CObject::NewString(
+            addresses->addresses[i]->as_string));
+        entry->SetAt(1, as_string);
+
+        CObjectUint8Array* data = new CObjectUint8Array(CObject::NewUint8Array(
+            addresses->addresses[i]->length));
+        memmove(data->Buffer(),
+                addresses->addresses[i]->data,
+                addresses->addresses[i]->length);
+
+        entry->SetAt(2, data);
+        array->SetAt(i, entry);
+      }
+      result = array;
+      delete addresses;
     } else {
       result = CObject::NewOSError(os_error);
       delete os_error;
     }
     return result;
   }
   return CObject::IllegalArgumentError();
 }
 
 
@@ skipping 85 matching lines @@
 
 
 Dart_Handle Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
   return Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
 }
 
 
 Dart_Handle Socket::GetSocketIdNativeField(Dart_Handle socket, intptr_t* id) {
   return Dart_GetNativeInstanceField(socket, kSocketIdNativeField, id);
 }