Add NetworkAdaptor to dart:io.

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"
 
@@ skipping 33 matching lines @@
 
   enum {
     ADDRESS_LOOPBACK_IP_V4,
     ADDRESS_LOOPBACK_IP_V6,
     ADDRESS_ANY_IP_V4,
     ADDRESS_ANY_IP_V6,
     ADDRESS_FIRST = ADDRESS_LOOPBACK_IP_V4,
     ADDRESS_LAST = ADDRESS_ANY_IP_V6,
   };
 
-  explicit SocketAddress(struct addrinfo* addrinfo);
+  explicit SocketAddress(struct sockaddr* sockaddr);
+
+  virtual ~SocketAddress() {}
 
   int GetType() {
     if (addr_.ss.ss_family == AF_INET6) return TYPE_IPV6;
     return TYPE_IPV4;
   }
 
   const char* as_string() const { return as_string_; }
   const RawAddr& addr() const { return addr_; }
 
   static intptr_t GetAddrLength(const RawAddr& addr) {
@@ skipping 24 matching lines @@
     }
   }
 
  private:
   char as_string_[INET6_ADDRSTRLEN];
   RawAddr addr_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketAddress);
 };
 
+class AdaptorSocketAddress : public SocketAddress {

[Søren Gjesse, 2013/06/10 12:26:38]

Instead of inheriting here why not have the SocketAddress as a member?

+ public:
+  explicit AdaptorSocketAddress(struct sockaddr* sockaddr, const char* name)
+    : SocketAddress(sockaddr), name_(name) {}

[Søren Gjesse, 2013/06/10 12:26:38]

4 space indent.

+
+  virtual ~AdaptorSocketAddress() {
+    delete name_;
+  }
+
+  const char* name() const { return name_; }
+
+ private:
+  const char* name_;
+
+  DISALLOW_COPY_AND_ASSIGN(SocketAddress);
+};
+
 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_;
   }
 
   intptr_t count() const { return count_; }
   SocketAddress* GetAt(intptr_t i) const { return addresses_[i]; }
   void SetAt(intptr_t i, SocketAddress* addr) { addresses_[i] = addr; }
 
  private:
   const intptr_t count_;
   SocketAddress** addresses_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketAddresses);
 };
 
 class Socket {
  public:
   enum SocketRequest {
     kLookupRequest = 0,
+    kListAdaptorsRequest = 1,
   };
 
   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 Create(RawAddr addr);
   static intptr_t Connect(intptr_t fd, RawAddr addr, const intptr_t port);
   static intptr_t CreateConnect(RawAddr addr,
                                 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 hostname lookup. Returns the SocketAddresses.
   static SocketAddresses* LookupAddress(const char* host,
                                         int type,
                                         OSError** os_error);
 
+  // List adaptors. Returns the SocketAddresses.
+  static SocketAddresses* ListAdaptors(bool include_loopback,
+                                       int type,
+                                       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_;
@@ skipping 12 matching lines @@
   // 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(RawAddr addr,
                                    intptr_t port,
                                    intptr_t backlog,
                                    bool v6_only = false);
 
+ private:
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(ServerSocket);
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_SOCKET_H_