Add constructor for creating an AddressList from a struct sockaddr. This is...

net/base/address_list_unittest.cc

 // Copyright (c) 2010 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/base/address_list.h"
 
 #include "base/string_util.h"
 #include "net/base/host_resolver_proc.h"
 #include "net/base/net_util.h"
 #include "net/base/sys_addrinfo.h"
@@ skipping 195 matching lines @@
     size_t sockaddr_size =
         good_ai->ai_socktype == AF_INET ? sizeof(struct sockaddr_in) :
         good_ai->ai_socktype == AF_INET6 ? sizeof(struct sockaddr_in6) : 0;
     EXPECT_EQ(memcmp(good_ai->ai_addr, test_ai->ai_addr, sockaddr_size), 0);
     EXPECT_EQ(good_ai->ai_next, test_ai->ai_next);
     EXPECT_EQ(strcmp(tests[i].canonical_ip_address.c_str(),
                      test_ai->ai_canonname), 0);
   }
 }
 
+TEST(AddressListTest, AddressFromAddrInfo) {
+  struct TestData {
+    std::string ip_address;
+    std::string canonical_ip_address;
+    bool is_ipv6;
+  } tests[] = {
+    { "127.0.00.1", "127.0.0.1", false },
+    { "192.168.1.1", "192.168.1.1", false },
+    { "::1", "::1", true },
+    { "2001:db8:0::42", "2001:db8::42", true },
+  };
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) {
+    net::AddressList expected_list;
+    int rv = CreateAddressList(tests[i].canonical_ip_address, 80,
+                               &expected_list);
+    if (tests[i].is_ipv6 && rv != 0) {
+      LOG(WARNING) << "Unable to resolve ip literal '" << tests[i].ip_address
+                   << "' test skipped.";
+      continue;
+    }
+    ASSERT_EQ(0, rv);

[eroman, 2011/03/01 02:52:33]

I wander why we aren't using net::OK throughout this file. (I realize you are
being consistent with the other test cases, so that is fine).

+    const struct addrinfo* good_ai = expected_list.head();
+
+    net::AddressList test_list(good_ai->ai_addr, good_ai->ai_addrlen,
+                               SOCK_STREAM, IPPROTO_TCP);
+    const struct addrinfo* test_ai = test_list.head();
+
+    EXPECT_EQ(good_ai->ai_family, test_ai->ai_family);
+    EXPECT_EQ(good_ai->ai_addrlen, test_ai->ai_addrlen);
+    size_t sockaddr_size =
+        good_ai->ai_socktype == AF_INET ? sizeof(struct sockaddr_in) :
+        good_ai->ai_socktype == AF_INET6 ? sizeof(struct sockaddr_in6) : 0;
+    EXPECT_EQ(memcmp(good_ai->ai_addr, test_ai->ai_addr, sockaddr_size), 0);
+    EXPECT_EQ(good_ai->ai_next, test_ai->ai_next);
+  }
+}
+
 }  // namespace