Add NetworkAdaptor to dart:io.

runtime/bin/socket_win.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 "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
 #include "bin/builtin.h"
 #include "bin/eventhandler.h"
 #include "bin/file.h"
 #include "bin/log.h"
 #include "bin/socket.h"
 #include "bin/utils.h"
 
 
 namespace dart {
 namespace bin {
 
-SocketAddress::SocketAddress(struct addrinfo* addrinfo) {
+SocketAddress::SocketAddress(struct sockaddr* sockaddr) {
   ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
-  RawAddr* raw = reinterpret_cast<RawAddr*>(addrinfo->ai_addr);
+  RawAddr* raw = reinterpret_cast<RawAddr*>(sockaddr);
 
   // Clear the port before calling WSAAddressToString as WSAAddressToString
   // includes the port in the formatted string.
   DWORD len = INET6_ADDRSTRLEN;
   int err = WSAAddressToStringA(&raw->addr,
                                 sizeof(RawAddr),
                                 NULL,
                                 as_string_,
                                 &len);
 
   if (err != 0) {
     as_string_[0] = 0;
   }
   memmove(reinterpret_cast<void *>(&addr_),
-          addrinfo->ai_addr,
-          addrinfo->ai_addrlen);
+          sockaddr,
+          SocketAddress::GetAddrLength(raw));
 }
 
 bool Socket::Initialize() {
   static bool socket_initialized = false;
   if (socket_initialized) return true;
   int err;
   WSADATA winsock_data;
   WORD version_requested = MAKEWORD(2, 2);
   err = WSAStartup(version_requested, &winsock_data);
   if (err == 0) {
@@ skipping 87 matching lines @@
   ClientSocket* client_socket = new ClientSocket(s);
   return reinterpret_cast<intptr_t>(client_socket);
 }
 
 
 intptr_t Socket::Connect(intptr_t fd, RawAddr addr, const intptr_t port) {
   ASSERT(reinterpret_cast<Handle*>(fd)->is_socket());
   SocketHandle* handle = reinterpret_cast<SocketHandle*>(fd);
   SOCKET s = handle->socket();
   SocketAddress::SetAddrPort(&addr, port);
-  int status = connect(s, &addr.addr, SocketAddress::GetAddrLength(addr));
+  int status = connect(s, &addr.addr, SocketAddress::GetAddrLength(&addr));
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
     ClientSocket* client_socket = reinterpret_cast<ClientSocket*>(fd);
     client_socket->Close();
     SetLastError(rc);
     return -1;
   }
   return fd;
 }
 
@@ skipping 53 matching lines @@
   ListenSocket* listen_socket = reinterpret_cast<ListenSocket*>(fd);
   ClientSocket* client_socket = listen_socket->Accept();
   if (client_socket != NULL) {
     return reinterpret_cast<intptr_t>(client_socket);
   } else {
     return -1;
   }
 }
 
 
-SocketAddresses* Socket::LookupAddress(const char* host,
-                                       int type,
-                                       OSError** os_error) {
+AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
+                                                  int type,
+                                                  OSError** os_error) {
   Initialize();
 
   // 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 = 0;
   hints.ai_protocol = IPPROTO_TCP;
   struct addrinfo* info = NULL;
   int status = getaddrinfo(host, 0, &hints, &info);
   if (status != 0) {
     ASSERT(*os_error == NULL);
     DWORD error_code = WSAGetLastError();
     SetLastError(error_code);
     *os_error = new OSError();
     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++;
   }
-  SocketAddresses* addresses = new SocketAddresses(count);
+  AddressList<SocketAddress>* addresses = new AddressList<SocketAddress>(count);
   intptr_t i = 0;
   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));
+      addresses->SetAt(i, new SocketAddress(c->ai_addr));
       i++;
     }
   }
   freeaddrinfo(info);
   return addresses;
 }
 
 
+AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
+    int type,
+    OSError** os_error) {
+  Initialize();
+
+  ULONG size = 0;
+  // Query the size needed.
+  GetAdaptersAddresses(SocketAddress::FromType(type),

[Søren Gjesse, 2013/06/20 18:22:05]

You could consider adding the flags:

GAA_FLAG_SKIP_ANYCAST
GAA_FLAG_SKIP_MULTICAST
GAA_FLAG_SKIP_DNS_SERVER

[Anders Johnsen, 2013/06/21 07:58:35]

Done.

+                       0,
+                       NULL,
+                       NULL,
+                       &size);
+  PIP_ADAPTER_ADDRESSES addrs =

[Søren Gjesse, 2013/06/20 18:22:05]

We normally use the *. That is IP_ADAPTER_ADDRESSES* instead of
PIP_ADAPTER_ADDRESSES

[Anders Johnsen, 2013/06/21 07:58:35]

Done.

+      reinterpret_cast<PIP_ADAPTER_ADDRESSES>(malloc(size));

[Søren Gjesse, 2013/06/20 18:22:05]

Ditto and more below.

[Anders Johnsen, 2013/06/21 07:58:35]

Done.

+  // Get the addresses now we have the right buffer.

[Søren Gjesse, 2013/06/20 18:22:05]

Add an if (status == ERROR_BUFFER_OVERFLOW) around the second call to
GetAdapterAddresses.

[Anders Johnsen, 2013/06/21 07:58:35]

Done.

+  int status = GetAdaptersAddresses(SocketAddress::FromType(type),
+                                    0,
+                                    NULL,
+                                    addrs,
+                                    &size);
+  if (status != NO_ERROR) {
+    ASSERT(*os_error == NULL);
+    DWORD error_code = WSAGetLastError();
+    SetLastError(error_code);
+    *os_error = new OSError();
+    return NULL;
+  }
+  intptr_t count = 0;
+  for (PIP_ADAPTER_ADDRESSES a = addrs; a != NULL; a = a->Next) {
+    for (PIP_ADAPTER_UNICAST_ADDRESS u = a->FirstUnicastAddress;
+         u != NULL; u = u->Next) {
+      count++;
+    }
+  }
+  AddressList<InterfaceSocketAddress>* addresses =
+      new AddressList<InterfaceSocketAddress>(count);
+  intptr_t i = 0;
+  for (PIP_ADAPTER_ADDRESSES a = addrs; a != NULL; a = a->Next) {
+    for (PIP_ADAPTER_UNICAST_ADDRESS u = a->FirstUnicastAddress;
+         u != NULL; u = u->Next) {
+      addresses->SetAt(i, new InterfaceSocketAddress(
+          u->Address.lpSockaddr,
+          StringUtils::WideToUtf8(a->FriendlyName)));
+      i++;
+    }
+  }
+  free(addrs);
+  return addresses;
+}
+
+
 intptr_t ServerSocket::CreateBindListen(RawAddr addr,
                                         intptr_t port,
                                         intptr_t backlog,
                                         bool v6_only) {
   SOCKET s = socket(addr.ss.ss_family, SOCK_STREAM, IPPROTO_TCP);
   if (s == INVALID_SOCKET) {
     return -1;
   }
 
   BOOL optval = true;
@@ skipping 14 matching lines @@
     setsockopt(s,
                IPPROTO_IPV6,
                IPV6_V6ONLY,
                reinterpret_cast<const char*>(&optval),
                sizeof(optval));
   }
 
   SocketAddress::SetAddrPort(&addr, port);
   status = bind(s,
                 &addr.addr,
-                SocketAddress::GetAddrLength(addr));
+                SocketAddress::GetAddrLength(&addr));
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
     closesocket(s);
     SetLastError(rc);
     return -1;
   }
 
   status = listen(s, backlog > 0 ? backlog : SOMAXCONN);
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
@@ skipping 42 matching lines @@
                     IPPROTO_TCP,
                     TCP_NODELAY,
                     reinterpret_cast<char *>(&on),
                     sizeof(on)) == 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_WINDOWS)