Reimplements net::AddressList without struct addrinfo.

jingle/notifier/communicator/xmpp_connection_generator.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.
 //
 // XmppConnectionGenerator does the following algorithm:
 //   proxy = ResolveProxyInformation(connection_options)
 //   for server in server_list
 //     get dns_addresses for server
 //     connection_list = (dns_addresses X connection methods X proxy).shuffle()
 //     for connection in connection_list
 //       yield connection
 
 #include "jingle/notifier/communicator/xmpp_connection_generator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 #include "jingle/notifier/base/server_information.h"
 #include "jingle/notifier/communicator/connection_options.h"
 #include "jingle/notifier/communicator/connection_settings.h"
 #include "net/base/net_errors.h"
-#include "net/base/sys_addrinfo.h"
 #include "talk/base/httpcommon-inl.h"
 #include "talk/base/task.h"
 #include "talk/base/thread.h"
 #include "talk/xmpp/prexmppauth.h"
 #include "talk/xmpp/xmppclientsettings.h"
 #include "talk/xmpp/xmppengine.h"
 
 namespace notifier {
 
 XmppConnectionGenerator::XmppConnectionGenerator(
@@ skipping 112 matching lines @@
   // Print logging info.
   VLOG(1) << "  server: " << current_server_->server.ToString()
           << ", error: " << status;
   if (status != net::OK) {
     if (first_dns_error_ == 0)
       first_dns_error_ = status;
     return;
   }
 
   // Slurp the addresses into a vector.
-  std::vector<uint32> ip_list;
-  for (const addrinfo* addr = address_list_.head();
-       addr != NULL; addr = addr->ai_next) {
-    const sockaddr_in& sockaddr =
-        *reinterpret_cast<const sockaddr_in*>(addr->ai_addr);
-    uint32 ip = talk_base::NetworkToHost32(sockaddr.sin_addr.s_addr);
+  std::vector<uint32> ip_list;  // TODO(szym): not IPv6-safe.
+  for (net::AddressList::const_iterator addr = address_list_.begin();

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

Same comment as before. I recommend using an integer index for readability. But
maybe I am just a STL/C++ hater...

+       addr != address_list_.end(); ++addr) {
+    DCHECK_EQ(addr->GetFamily(), AF_INET);
+    uint32 ip = talk_base::NetworkToHost32(
+        *reinterpret_cast<const uint32*>(&addr->address()[0]));
     ip_list.push_back(ip);
   }
   successfully_resolved_dns_ = !ip_list.empty();
 
   for (int i = 0; i < static_cast<int>(ip_list.size()); ++i) {
     VLOG(1) << "  ip " << i
             << " : " << talk_base::SocketAddress::IPToString(ip_list[i]);
   }
 
   GenerateSettingsForIPList(ip_list);
 }
 
 void XmppConnectionGenerator::GenerateSettingsForIPList(
     const std::vector<uint32>& ip_list) {
   // Build the ip list.
   DCHECK(settings_list_.get());
   settings_index_ = -1;
   settings_list_->ClearPermutations();
   settings_list_->AddPermutations(
       current_server_->server.host(),
       ip_list,
       current_server_->server.port(),
       current_server_->special_port_magic,
       try_ssltcp_first_);
 }
 
 }  // namespace notifier