Reimplements net::AddressList without struct addrinfo.

content/browser/renderer_host/p2p/socket_host_tcp_server.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 #include "content/common/p2p_messages.h"
 #include "net/base/address_list.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
 #include "net/socket/stream_socket.h"
 
 namespace {
 const int kListenBacklog = 5;
 }  // namespace
 
 namespace content {
 
 P2PSocketHostTcpServer::P2PSocketHostTcpServer(
     IPC::Message::Sender* message_sender,
@@ skipping 62 matching lines @@
   }
 }
 
 void P2PSocketHostTcpServer::HandleAcceptResult(int result) {
   if (result < 0) {
     if (result != net::ERR_IO_PENDING)
       OnError();
     return;
   }
 
-  net::IPEndPoint address;
   net::AddressList addr_list;
-  if (accept_socket_->GetPeerAddress(&addr_list) != net::OK ||
-      !address.FromSockAddr(addr_list.head()->ai_addr,
-                            addr_list.head()->ai_addrlen)) {
+  if (accept_socket_->GetPeerAddress(&addr_list) != net::OK) {
     LOG(ERROR) << "Failed to get address of an accepted socket.";
     accept_socket_.reset();
     return;
   }
+  const net::IPEndPoint& address = addr_list.front();
   AcceptedSocketsMap::iterator it = accepted_sockets_.find(address);
-  if (it != accepted_sockets_.end()) {
+  if (it != accepted_sockets_.end())
     delete it->second;
-    }
+
   accepted_sockets_[address] = accept_socket_.release();
   message_sender_->Send(
       new P2PMsg_OnIncomingTcpConnection(routing_id_, id_, address));
 }
 
 void P2PSocketHostTcpServer::OnAccepted(int result) {
   HandleAcceptResult(result);
   if (result == net::OK)
     DoAccept();
 }
@@ skipping 14 matching lines @@
   accepted_sockets_.erase(it);
   scoped_ptr<P2PSocketHostTcp> result(
       new P2PSocketHostTcp(message_sender_, routing_id_, id));
   if (!result->InitAccepted(remote_address, socket))
     return NULL;
 
   return result.release();
 }
 
 }  // namespace content