Changed the jingle network code in ChromeAsyncSocket to use the client socket pool. This also all...

jingle/notifier/communicator/xmpp_connection_generator.cc

 // Copyright (c) 2011 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
@@ skipping 38 matching lines @@
           ALLOW_THIS_IN_INITIALIZER_LIST(
               NewCallback(this,
                           &XmppConnectionGenerator::OnServerDNSResolved))),
       settings_list_(new ConnectionSettingsList()),
       settings_index_(0),
       servers_(servers),
       current_server_(servers_.end()),
       try_ssltcp_first_(try_ssltcp_first),
       successfully_resolved_dns_(false),
       first_dns_error_(0),
+      should_resolve_dns_(true),
       options_(options) {
   DCHECK(delegate_);
   DCHECK(host_resolver);
   DCHECK(options_);
   DCHECK_GT(servers_.size(), 0u);
 }
 
 XmppConnectionGenerator::~XmppConnectionGenerator() {
   VLOG(1) << "XmppConnectionGenerator::~XmppConnectionGenerator";
 }
@@ skipping 43 matching lines @@
     }
     if (current_server_ == servers_.end()) {
       // All out of possibilities.
       VLOG(1) << "(" << buzz::XmppEngine::ERROR_SOCKET
               << ", " << first_dns_error_ << ")";
       delegate_->OnExhaustedSettings(
           successfully_resolved_dns_, first_dns_error_);
       return;
     }
 
-    // Resolve the server.
-    const net::HostPortPair& server = current_server_->server;
-    net::HostResolver::RequestInfo request_info(server);
-    int status =
-        host_resolver_.Resolve(
-            request_info, &address_list_, resolve_callback_.get(),
-            bound_net_log_);
-    if (status == net::ERR_IO_PENDING) {
-      // resolve_callback_ will call us when it's called.
-      return;
+    if (should_resolve_dns_) {
+      // Resolve the server.
+      const net::HostPortPair& server = current_server_->server;
+      net::HostResolver::RequestInfo request_info(server);
+      int status =
+          host_resolver_.Resolve(
+              request_info, &address_list_, resolve_callback_.get(),
+              bound_net_log_);
+      if (status == net::ERR_IO_PENDING) {
+        // resolve_callback_ will call us when it's called.
+        return;
+      }
+      HandleServerDNSResolved(status);
+    } else {
+      // We are not resolving DNS here (DNS will be resolved by a lower layer).
+      // Generate settings using an empty IP list (which will just use the
+      // host name for the current server).
+      std::vector<uint32> ip_list;
+      GenerateSettingsForIPList(ip_list);
     }
-    HandleServerDNSResolved(status);
   }
 }
 
 void XmppConnectionGenerator::OnServerDNSResolved(int status) {
   DCHECK_NE(status, net::ERR_IO_PENDING);
   HandleServerDNSResolved(status);
   // Reenter loop.
   UseNextConnection();
 }
 
@@ skipping 18 matching lines @@
     uint32 ip = ntohl(sockaddr.sin_addr.s_addr);
     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