Reimplements net::AddressList without struct addrinfo.

remoting/jingle_glue/ssl_socket_adapter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/jingle_glue/ssl_socket_adapter.h"
 
 #include "base/base64.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "jingle/glue/utils.h"
 #include "net/base/address_list.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
-#include "net/base/sys_addrinfo.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
 
 namespace remoting {
 
 SSLSocketAdapter* SSLSocketAdapter::Create(AsyncSocket* socket) {
   return new SSLSocketAdapter(socket);
 }
 
 SSLSocketAdapter::SSLSocketAdapter(AsyncSocket* socket)
@@ skipping 186 matching lines @@
 }
 
 bool TransportSocket::IsConnectedAndIdle() const {
   // Not implemented.
   NOTREACHED();
   return false;
 }
 
 int TransportSocket::GetPeerAddress(net::AddressList* address) const {
   talk_base::SocketAddress socket_address = socket_->GetRemoteAddress();
-
-  // libjingle supports only IPv4 addresses.
-  sockaddr_in ipv4addr;
-  socket_address.ToSockAddr(&ipv4addr);
-
-  struct addrinfo ai;
-  memset(&ai, 0, sizeof(ai));
-  ai.ai_family = ipv4addr.sin_family;
-  ai.ai_socktype = SOCK_STREAM;
-  ai.ai_protocol = IPPROTO_TCP;
-  ai.ai_addr = reinterpret_cast<struct sockaddr*>(&ipv4addr);
-  ai.ai_addrlen = sizeof(ipv4addr);
-
-  *address = net::AddressList::CreateByCopyingFirstAddress(&ai);
-  return net::OK;
+  net::IPEndPoint endpoint;
+  if (jingle_glue::SocketAddressToIPEndPoint(socket_address, &endpoint)) {
+    *address = net::AddressList(endpoint);
+    return net::OK;
+  } else {
+    return net::ERR_FAILED;
+  }
 }
 
 int TransportSocket::GetLocalAddress(net::IPEndPoint* address) const {
   talk_base::SocketAddress socket_address = socket_->GetLocalAddress();
   if (jingle_glue::SocketAddressToIPEndPoint(socket_address, address)) {
     return net::OK;
   } else {
     return net::ERR_FAILED;
   }
 }
@@ skipping 129 matching lines @@
         write_buffer_len_ = buffer_len;
         return;
       }
     }
     was_used_to_convey_data_ = true;
     callback.Run(result);
   }
 }
 
 }  // namespace remoting