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

runtime/bin/socket.h

 // 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.
 
 #ifndef BIN_SOCKET_H_
 #define BIN_SOCKET_H_
 
 #include "bin/builtin.h"
 #include "bin/utils.h"
 
 #include "platform/globals.h"
 #include "platform/thread.h"
 // Declare the OS-specific types ahead of defining the generic class.
 #if defined(TARGET_OS_ANDROID)
 #include "bin/socket_android.h"
 #elif defined(TARGET_OS_LINUX)
 #include "bin/socket_linux.h"
 #elif defined(TARGET_OS_MACOS)
 #include "bin/socket_macos.h"
 #elif defined(TARGET_OS_WINDOWS)
 #include "bin/socket_win.h"
 #else
 #error Unknown target os.
 #endif
 
+class SocketAddress {
+ public:
+  enum Type {
+    IPv4 = 0,
+    IPv6 = 1,
+  };
+
+  SocketAddress(Type type,
+                const char* as_string,
+                uint8_t* data,
+                intptr_t length)
+      : type(type), as_string(as_string), data(data), length(length) {}
+
+  ~SocketAddress() {
+    delete[] as_string;
+    delete[] data;
+  }
+
+  Type type;

[Søren Gjesse, 2013/04/18 09:07:40]

Make these mempers private with _ postfix. Then add getters.

[Anders Johnsen, 2013/04/18 12:09:45]

Done.

+  const char* as_string;
+  uint8_t* data;

[Søren Gjesse, 2013/04/18 09:07:40]

can't this be

sockaddr_storage address

[Anders Johnsen, 2013/04/18 12:09:45]

Done.

+  const intptr_t length;

[Søren Gjesse, 2013/04/18 09:07:40]

Please add:

 private:
  DISALLOW_COPY_AND_ASSIGN(SocketAddress);

[Anders Johnsen, 2013/04/18 12:09:45]

Done.

+};
+
+class SocketAddresses {
+ public:
+  explicit SocketAddresses(intptr_t count)
+      : count(count),
+        addresses(new SocketAddress*[count]) {}
+
+  ~SocketAddresses() {
+    for (intptr_t i = 0; i < count; i++) {
+      delete addresses[i];
+    }
+    delete[] addresses;
+  }
+

[Søren Gjesse, 2013/04/18 09:07:40]

As above.

[Anders Johnsen, 2013/04/18 12:09:45]

Done.

+  const intptr_t count;
+  SocketAddress** addresses;
+};
 
 class Socket {
  public:
   enum SocketRequest {
     kLookupRequest = 0,
   };
 
   static bool Initialize();
   static intptr_t Available(intptr_t fd);
   static int Read(intptr_t fd, void* buffer, intptr_t num_bytes);
   static int Write(intptr_t fd, const void* buffer, intptr_t num_bytes);
-  static intptr_t CreateConnect(const char* host, const intptr_t port);
+  static intptr_t CreateConnect(SocketAddress::Type type,
+                                uint8_t* host_data,
+                                intptr_t host_length,
+                                const intptr_t port);
   static intptr_t GetPort(intptr_t fd);
   static bool GetRemotePeer(intptr_t fd, char* host, intptr_t* port);
   static void GetError(intptr_t fd, OSError* os_error);
   static int GetType(intptr_t fd);
   static intptr_t GetStdioHandle(int num);
   static void Close(intptr_t fd);
   static bool SetNonBlocking(intptr_t fd);
   static bool SetBlocking(intptr_t fd);
   static bool SetNoDelay(intptr_t fd, bool enabled);
 
-  // Perform a IPv4 hostname lookup. Returns the hostname string in
-  // IPv4 dotted-decimal format.
-  static const char* LookupIPv4Address(char* host, OSError** os_error);
+  // Perform a hostname lookup. Returns the SocketAddresses.
+  static SocketAddresses* LookupAddress(char* host, OSError** os_error);
 
   static Dart_Port GetServicePort();
 
   static Dart_Handle SetSocketIdNativeField(Dart_Handle socket, intptr_t id);
   static Dart_Handle GetSocketIdNativeField(Dart_Handle socket, intptr_t* id);
 
  private:
   static dart::Mutex mutex_;
   static int service_ports_size_;
   static Dart_Port* service_ports_;
   static int service_ports_index_;
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(Socket);
 };
 
 
 class ServerSocket {
  public:
   static const intptr_t kTemporaryFailure = -2;
 
   static intptr_t Accept(intptr_t fd);
 
   // Returns a positive integer if the call is successful. In case of failure
   // it returns:
   //
   //   -1: system error (errno set)
   //   -5: invalid bindAddress
-  static intptr_t CreateBindListen(const char* bindAddress,
+  static intptr_t CreateBindListen(SocketAddress::Type type,
+                                   uint8_t* host_data,
+                                   intptr_t host_length,
                                    intptr_t port,
                                    intptr_t backlog);
 
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(ServerSocket);
 };
 
 #endif  // BIN_SOCKET_H_