Make libjingle resolve DNS synchronously to avoid crashes.

jingle/notifier/communicator/login.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 <string>
 
 #include "jingle/notifier/communicator/login.h"
 
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 296 matching lines @@
 }
 
 void Login::CheckConnection() {
   // We don't check the connection if we're using ChromeAsyncSocket,
   // as this code requires a libjingle thread to be running.  This
   // code will go away in a future cleanup CL, anyway.
   if (!use_chrome_async_socket_) {
     LOG(INFO) << "Checking connection";
     talk_base::PhysicalSocketServer physical;
     scoped_ptr<talk_base::Socket> socket(physical.CreateSocket(SOCK_STREAM));
-    bool alive =
-        !socket->Connect(talk_base::SocketAddress("talk.google.com", 5222));
+    talk_base::SocketAddress addr("talk.google.com", 5222);
+    // Resolve synchronously to avoid weirdness with libjingle's async
+    // DNS resolver.
+    bool alive = addr.ResolveIP() && (socket->Connect(addr) == 0);
     LOG(INFO) << "Network is " << (alive ? "alive" : "not alive");
     if (alive) {
       // Our connection is up. If we have a disconnect timer going,
       // stop it so we don't disconnect.
       disconnect_timer_.Stop();
     } else {
       // Our network connection is down. Start the disconnect timer if
       // it's not already going.  Don't disconnect immediately to avoid
       // constant connection/disconnection due to flaky network
       // interfaces.
@@ skipping 14 matching lines @@
 
   if (single_attempt_) {
     single_attempt_->Abort();
     single_attempt_ = NULL;
   }
 
   StartConnection();
 }
 
 }  // namespace notifier