Make standalone Dart VM run on Windows XP

runtime/bin/socket_win.cc

 // Copyright (c) 2012, 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/builtin.h"
 #include "bin/eventhandler.h"
 #include "bin/socket.h"
 
 bool Socket::Initialize() {
   int err;
@@ skipping 43 matching lines @@
   ASSERT(reinterpret_cast<Handle*>(fd)->is_socket());
   SocketHandle* socket_handle = reinterpret_cast<SocketHandle*>(fd);
   struct sockaddr_in socket_address;
   socklen_t size = sizeof(socket_address);
   if (getpeername(socket_handle->socket(),
                   reinterpret_cast<struct sockaddr *>(&socket_address),
                   &size)) {
     fprintf(stderr, "Error getpeername: %s\n", strerror(errno));
     return false;
   }
-  if (inet_ntop(socket_address.sin_family,
-                reinterpret_cast<void *>(&socket_address.sin_addr),
-                host,
-                INET_ADDRSTRLEN) == NULL) {
-    fprintf(stderr, "Error inet_ntop: %s\n", strerror(errno));
-    return false;
+  *port = ntohs(socket_address.sin_port);
+  // Clear the port before calling WSAAddressToString as WSAAddressToString
+  // includes the port in the formatted string.
+  socket_address.sin_port = 0;
+  DWORD len = INET_ADDRSTRLEN;
+  int err = WSAAddressToString(reinterpret_cast<LPSOCKADDR>(&socket_address),
+                               sizeof(socket_address),
+                               NULL,
+                               host,
+                               &len);
+  if (err != 0) {
+    fprintf(stderr, "Error WSAAddressToString: %d\n", WSAGetLastError());

[Mads Ager (google), 2012/05/21 13:24:34]

Return false?

[Søren Gjesse, 2012/05/21 13:28:57]

Good catch, thanks.

   }
-  *port = ntohs(socket_address.sin_port);
   return true;
 }
 
 intptr_t Socket::CreateConnect(const char* host, const intptr_t port) {
   SOCKET s = socket(AF_INET, SOCK_STREAM, 0);
   if (s == INVALID_SOCKET) {
     return -1;
   }
 
   linger l;
@@ skipping 156 matching lines @@
   if (status == SOCKET_ERROR) {
     DWORD rc = WSAGetLastError();
     closesocket(s);
     SetLastError(rc);
     return -1;
   }
 
   ListenSocket* listen_socket = new ListenSocket(s);
   return reinterpret_cast<intptr_t>(listen_socket);
 }