Reimplements net::AddressList without struct addrinfo.

net/socket/tcp_server_socket_win.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 "net/socket/tcp_server_socket_win.h"
 
 #include <mstcpip.h>
 
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
@@ skipping 38 matching lines @@
     PLOG(ERROR) << "socket() returned an error";
     return MapSystemError(WSAGetLastError());
   }
 
   if (SetNonBlocking(socket_)) {
     int result = MapSystemError(WSAGetLastError());
     Close();
     return result;
   }
 
-  struct sockaddr_storage addr_storage;
-  size_t addr_len = sizeof(addr_storage);
-  struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(&addr_storage);
-  if (!address.ToSockAddr(addr, &addr_len))
+  SockaddrStorage storage;
+  if (!address.ToSockAddr(storage.addr, &storage.addr_len))
     return ERR_INVALID_ARGUMENT;
 
-  int result = bind(socket_, addr, addr_len);
+  int result = bind(socket_, storage.addr, storage.addr_len);
   if (result < 0) {
     PLOG(ERROR) << "bind() returned an error";
     result = MapSystemError(WSAGetLastError());
     Close();
     return result;
   }
 
   result = listen(socket_, backlog);
   if (result < 0) {
     PLOG(ERROR) << "listen() returned an error";
     result = MapSystemError(WSAGetLastError());
     Close();
     return result;
   }
 
   return OK;
 }
 
 int TCPServerSocketWin::GetLocalAddress(IPEndPoint* address) const {
   DCHECK(CalledOnValidThread());
   DCHECK(address);
 
-  struct sockaddr_storage addr_storage;
-  socklen_t addr_len = sizeof(addr_storage);
-  struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(&addr_storage);
-  if (getsockname(socket_, addr, &addr_len))
+  SockaddrStorage storage;
+  if (getsockname(socket_, storage.addr, &storage.addr_len))
     return MapSystemError(WSAGetLastError());
-  if (!address->FromSockAddr(addr, addr_len))
+  if (!address->FromSockAddr(storage.addr, storage.addr_len))
     return ERR_FAILED;
 
   return OK;
 }
 
 int TCPServerSocketWin::Accept(
     scoped_ptr<StreamSocket>* socket, const CompletionCallback& callback) {
   DCHECK(CalledOnValidThread());
   DCHECK(socket);
   DCHECK(!callback.is_null());
   DCHECK(accept_callback_.is_null());
 
   net_log_.BeginEvent(NetLog::TYPE_TCP_ACCEPT, NULL);
 
   int result = AcceptInternal(socket);
 
   if (result == ERR_IO_PENDING) {
     // Start watching
     WSAEventSelect(socket_, socket_event_, FD_ACCEPT);
     accept_watcher_.StartWatching(socket_event_, this);
 
     accept_socket_ = socket;
     accept_callback_ = callback;
   }
 
   return result;
 }
 
 int TCPServerSocketWin::AcceptInternal(scoped_ptr<StreamSocket>* socket) {
-  struct sockaddr_storage addr_storage;
-  socklen_t addr_len = sizeof(addr_storage);
-  struct sockaddr* addr = reinterpret_cast<struct sockaddr*>(&addr_storage);
-
-  int new_socket = accept(socket_, addr, &addr_len);
+  SockaddrStorage storage;
+  int new_socket = accept(socket_, storage.addr, &storage.addr_len);
   if (new_socket < 0) {
     int net_error = MapSystemError(WSAGetLastError());
     if (net_error != ERR_IO_PENDING)
       net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, net_error);
     return net_error;
   }
 
   IPEndPoint address;
-  if (!address.FromSockAddr(addr, addr_len)) {
+  if (!address.FromSockAddr(storage.addr, storage.addr_len)) {
     NOTREACHED();
     if (closesocket(new_socket) < 0)
       PLOG(ERROR) << "closesocket";
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, ERR_FAILED);
     return ERR_FAILED;
   }
   scoped_ptr<TCPClientSocket> tcp_socket(new TCPClientSocket(
-      AddressList::CreateFromIPAddress(address.address(), address.port()),
+      AddressList(address),
       net_log_.net_log(), net_log_.source()));
   int adopt_result = tcp_socket->AdoptSocket(new_socket);
   if (adopt_result != OK) {
     if (closesocket(new_socket) < 0)
       PLOG(ERROR) << "closesocket";
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_TCP_ACCEPT, adopt_result);
     return adopt_result;
   }
   socket->reset(tcp_socket.release());
   net_log_.EndEvent(NetLog::TYPE_TCP_ACCEPT,
@@ skipping 27 matching lines @@
     if (result != ERR_IO_PENDING) {
       accept_socket_ = NULL;
       CompletionCallback callback = accept_callback_;
       accept_callback_.Reset();
       callback.Run(result);
     }
   }
 }
 
 }  // namespace net