Reimplements net::AddressList without struct addrinfo.

net/socket/transport_client_socket_pool_unittest.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 "net/socket/transport_client_socket_pool.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
-#include "net/base/sys_addrinfo.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/client_socket_pool_histograms.h"
 #include "net/socket/socket_test_util.h"
 #include "net/socket/ssl_host_info.h"
 #include "net/socket/stream_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ skipping 37 matching lines @@
   }
   virtual bool IsConnectedAndIdle() const {
     return connected_;
   }
   virtual int GetPeerAddress(AddressList* address) const {
     return ERR_UNEXPECTED;
   }
   virtual int GetLocalAddress(IPEndPoint* address) const {
     if (!connected_)
       return ERR_SOCKET_NOT_CONNECTED;
-    if (addrlist_.head()->ai_family == AF_INET)
+    if (addrlist_.front().GetFamily() == AF_INET)
       SetIPv4Address(address);
     else
       SetIPv6Address(address);
     return OK;
   }
   virtual const BoundNetLog& NetLog() const {
     return net_log_;
   }
 
   virtual void SetSubresourceSpeculation() {}
@@ skipping 118 matching lines @@
   }
   virtual bool IsConnectedAndIdle() const {
     return is_connected_;
   }
   virtual int GetPeerAddress(AddressList* address) const {
     return ERR_UNEXPECTED;
   }
   virtual int GetLocalAddress(IPEndPoint* address) const {
     if (!is_connected_)
       return ERR_SOCKET_NOT_CONNECTED;
-    if (addrlist_.head()->ai_family == AF_INET)
+    if (addrlist_.front().GetFamily() == AF_INET)
       SetIPv4Address(address);
     else
       SetIPv6Address(address);
     return OK;
   }
   virtual const BoundNetLog& NetLog() const {
     return net_log_;
   }
 
   virtual void SetSubresourceSpeculation() {}
@@ skipping 202 matching lines @@
   scoped_ptr<ClientSocketPoolHistograms> histograms_;
   scoped_ptr<MockHostResolver> host_resolver_;
   MockClientSocketFactory client_socket_factory_;
   TransportClientSocketPool pool_;
   ClientSocketPoolTest test_base_;
 };
 
 TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
   IPAddressNumber ip_number;
   ASSERT_TRUE(ParseIPLiteralToNumber("192.168.1.1", &ip_number));
-  AddressList addrlist_v4_1 = AddressList::CreateFromIPAddress(ip_number, 80);
+  IPEndPoint addrlist_v4_1(ip_number, 80);
   ASSERT_TRUE(ParseIPLiteralToNumber("192.168.1.2", &ip_number));
-  AddressList addrlist_v4_2 = AddressList::CreateFromIPAddress(ip_number, 80);
+  IPEndPoint addrlist_v4_2(ip_number, 80);
   ASSERT_TRUE(ParseIPLiteralToNumber("2001:4860:b006::64", &ip_number));
-  AddressList addrlist_v6_1 = AddressList::CreateFromIPAddress(ip_number, 80);
+  IPEndPoint addrlist_v6_1(ip_number, 80);
   ASSERT_TRUE(ParseIPLiteralToNumber("2001:4860:b006::66", &ip_number));
-  AddressList addrlist_v6_2 = AddressList::CreateFromIPAddress(ip_number, 80);
+  IPEndPoint addrlist_v6_2(ip_number, 80);
 
   AddressList addrlist;
-  const struct addrinfo* ai;
 
   // Test 1: IPv4 only.  Expect no change.
-  addrlist = addrlist_v4_1;
-  addrlist.Append(addrlist_v4_2.head());
-  TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
-  ai = addrlist.head();
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  EXPECT_TRUE(ai->ai_next == NULL);
+  addrlist.clear();
+  addrlist.push_back(addrlist_v4_1);
+  addrlist.push_back(addrlist_v4_2);
+  TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+  ASSERT_EQ(2u, addrlist.size());
+  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+  EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
 
   // Test 2: IPv6 only.  Expect no change.
-  addrlist = addrlist_v6_1;
-  addrlist.Append(addrlist_v6_2.head());
-  TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
-  ai = addrlist.head();
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  EXPECT_TRUE(ai->ai_next == NULL);
+  addrlist.clear();
+  addrlist.push_back(addrlist_v6_1);
+  addrlist.push_back(addrlist_v6_2);
+  TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+  ASSERT_EQ(2u, addrlist.size());
+  EXPECT_EQ(AF_INET6, addrlist[0].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
 
   // Test 3: IPv4 then IPv6.  Expect no change.
-  addrlist = addrlist_v4_1;
-  addrlist.Append(addrlist_v4_2.head());
-  addrlist.Append(addrlist_v6_1.head());
-  addrlist.Append(addrlist_v6_2.head());
-  TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
-  ai = addrlist.head();
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  EXPECT_TRUE(ai->ai_next == NULL);
+  addrlist.clear();
+  addrlist.push_back(addrlist_v4_1);
+  addrlist.push_back(addrlist_v4_2);
+  addrlist.push_back(addrlist_v6_1);
+  addrlist.push_back(addrlist_v6_2);
+  TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+  ASSERT_EQ(4u, addrlist.size());
+  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+  EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
 
   // Test 4: IPv6, IPv4, IPv6, IPv4.  Expect first IPv6 moved to the end.
-  addrlist = addrlist_v6_1;
-  addrlist.Append(addrlist_v4_1.head());
-  addrlist.Append(addrlist_v6_2.head());
-  addrlist.Append(addrlist_v4_2.head());
-  TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
-  ai = addrlist.head();
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  EXPECT_TRUE(ai->ai_next == NULL);
+  addrlist.clear();
+  addrlist.push_back(addrlist_v6_1);

[eroman, 2012/05/04 01:08:41]

I very quickly skimmed through this file... will try to read it fully later.

+  addrlist.push_back(addrlist_v4_1);
+  addrlist.push_back(addrlist_v6_2);
+  addrlist.push_back(addrlist_v4_2);
+  TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+  ASSERT_EQ(4u, addrlist.size());
+  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
+  EXPECT_EQ(AF_INET, addrlist[2].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
 
   // Test 5: IPv6, IPv6, IPv4, IPv4.  Expect first two IPv6's moved to the end.
-  addrlist = addrlist_v6_1;
-  addrlist.Append(addrlist_v6_2.head());
-  addrlist.Append(addrlist_v4_1.head());
-  addrlist.Append(addrlist_v4_2.head());
-  TransportConnectJob::MakeAddrListStartWithIPv4(&addrlist);
-  ai = addrlist.head();
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  ai = ai->ai_next;
-  EXPECT_EQ(AF_INET6, ai->ai_family);
-  EXPECT_TRUE(ai->ai_next == NULL);
+  addrlist.clear();
+  addrlist.push_back(addrlist_v6_1);
+  addrlist.push_back(addrlist_v6_2);
+  addrlist.push_back(addrlist_v4_1);
+  addrlist.push_back(addrlist_v4_2);
+  TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
+  ASSERT_EQ(4u, addrlist.size());
+  EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
+  EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
+  EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
 }
 
 TEST_F(TransportClientSocketPoolTest, Basic) {
   TestCompletionCallback callback;
   ClientSocketHandle handle;
   int rv = handle.Init("a", low_params_, LOW, callback.callback(), &pool_,
                        BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
   EXPECT_FALSE(handle.is_initialized());
   EXPECT_FALSE(handle.socket());
@@ skipping 740 matching lines @@
   EXPECT_TRUE(handle.socket());
   IPEndPoint endpoint;
   handle.socket()->GetLocalAddress(&endpoint);
   EXPECT_EQ(kIPv4AddressSize, endpoint.address().size());
   EXPECT_EQ(1, client_socket_factory_.allocation_count());
 }
 
 }  // namespace
 
 }  // namespace net