Changes needed to roll libjingle r141

jingle/notifier/base/chrome_async_socket.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 "jingle/notifier/base/chrome_async_socket.h"
 
 #include <algorithm>
 #include <cstring>
 #include <cstdlib>
 
@@ skipping 73 matching lines @@
 }
 
 // STATE_CLOSED -> STATE_CONNECTING
 
 bool ChromeAsyncSocket::Connect(const talk_base::SocketAddress& address) {
   if (state_ != STATE_CLOSED) {
     LOG(DFATAL) << "Connect() called on non-closed socket";
     DoNonNetError(ERROR_WRONGSTATE);
     return false;
   }
   // We can't work with an empty hostname and IP address.

[akalin, 2012/05/11 18:13:02]

"hostname and IP address." -> "hostname.  We don't use the IP address even if
it's provided as we let the client_socket_factory_ handle DNS resolution (which
may go through a proxy)."

[Mallinath (Gone from Chromium), 2012/05/11 20:52:45]

Done.

   if (address.hostname().empty() && (address.ip() == 0)) {

[akalin, 2012/05/11 18:13:02]

remove the check for ip()

[Mallinath (Gone from Chromium), 2012/05/11 20:52:45]

Done.

     DoNonNetError(ERROR_DNS);
     return false;
   }
 
   DCHECK_EQ(state_, buzz::AsyncSocket::STATE_CLOSED);
   DCHECK_EQ(read_state_, IDLE);
   DCHECK_EQ(write_state_, IDLE);
 
   state_ = STATE_CONNECTING;
 
   DCHECK_EQ(false, weak_factory_.HasWeakPtrs());
 
-  net::HostPortPair dest_host_port_pair(address.IPAsString(), address.port());
+  net::HostPortPair dest_host_port_pair((address.hostname().empty() ?

[akalin, 2012/05/11 18:04:05]

this should actually be:

... dest_host_port_pair(address.hostname(), address.port());

as the IP isn't expected to be resolved at this point -- the proxy resolution
process does the DNS resolution also. (Unfortunately, this looks like a
long-standing bug :/ )

I think that should fix the crashes.  I'm not sure if the other uses of address
suffer from the same proxy-related issue.

[Mallinath (Gone from Chromium), 2012/05/11 18:10:40]

What should happen if hostname is empty? As talk_base::SocketAddress can contain
empty hostname and valid IP.
On 2012/05/11 18:04:05, akalin wrote:

[akalin, 2012/05/11 18:13:02]

Actually, this doesn't look like it was a bug before.  It looks like
IPAsString() printed the hostname first.

But yeah, definitely address.hostname() shouldn't be empty and should be used.

[Mallinath (Gone from Chromium), 2012/05/11 20:52:45]

Done.

+      address.ipaddr().ToString() : address.hostname()), address.port());
 
   transport_socket_.reset(
       client_socket_factory_->CreateTransportClientSocket(
           dest_host_port_pair));
   int status = transport_socket_->Connect(
       base::Bind(&ChromeAsyncSocket::ProcessConnectDone,
                  base::Unretained(this)));
   if (status != net::ERR_IO_PENDING) {
     // We defer execution of ProcessConnectDone instead of calling it
     // directly here as the caller may not expect an error/close to
@@ skipping 318 matching lines @@
   }
   state_ = STATE_TLS_OPEN;
   PostDoRead();
   if (write_end_ > 0U) {
     PostDoWrite();
   }
   SignalSSLConnected();
 }
 
 }  // namespace notifier