[Sync] Make ChromeAsyncSocket use only the hostname on connect

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>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "jingle/notifier/base/resolving_client_socket_factory.h"
 #include "net/base/address_list.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_util.h"
 #include "net/base/ssl_config_service.h"
-#include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
 #include "talk/base/socketaddress.h"
 
 namespace notifier {
 
 ChromeAsyncSocket::ChromeAsyncSocket(
-    ResolvingClientSocketFactory* client_socket_factory,
+    ResolvingClientSocketFactory* resolving_client_socket_factory,
     size_t read_buf_size,
     size_t write_buf_size)
-    : client_socket_factory_(client_socket_factory),
+    : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
+      resolving_client_socket_factory_(resolving_client_socket_factory),
       state_(STATE_CLOSED),
       error_(ERROR_NONE),
       net_error_(net::OK),
-      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
       read_state_(IDLE),
       read_buf_(new net::IOBufferWithSize(read_buf_size)),
       read_start_(0U),
       read_end_(0U),
       write_state_(IDLE),
       write_buf_(new net::IOBufferWithSize(write_buf_size)),
       write_end_(0U) {
-  DCHECK(client_socket_factory_.get());
+  DCHECK(resolving_client_socket_factory_.get());
   DCHECK_GT(read_buf_size, 0U);
   DCHECK_GT(write_buf_size, 0U);
 }
 
 ChromeAsyncSocket::~ChromeAsyncSocket() {}
 
 ChromeAsyncSocket::State ChromeAsyncSocket::state() {
   return state_;
 }
 
@@ skipping 27 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.
-  if (address.hostname().empty() && (address.ip() == 0)) {
+  if (address.hostname().empty() || address.port() == 0) {
     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());
+  DCHECK(!weak_ptr_factory_.HasWeakPtrs());
+  weak_ptr_factory_.InvalidateWeakPtrs();
 
-  net::HostPortPair dest_host_port_pair(address.IPAsString(), address.port());
+  net::HostPortPair dest_host_port_pair(address.hostname(), address.port());
 
   transport_socket_.reset(
-      client_socket_factory_->CreateTransportClientSocket(
+      resolving_client_socket_factory_->CreateTransportClientSocket(
           dest_host_port_pair));
   int status = transport_socket_->Connect(
       base::Bind(&ChromeAsyncSocket::ProcessConnectDone,
-                 base::Unretained(this)));
+                 weak_ptr_factory_.GetWeakPtr()));
   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
     // happen here.  This is okay, as from the caller's point of view,
     // the connect always happens asynchronously.
     MessageLoop* message_loop = MessageLoop::current();
     CHECK(message_loop);
-    message_loop->PostTask(FROM_HERE,
-                           base::Bind(&ChromeAsyncSocket::ProcessConnectDone,
-                                      weak_factory_.GetWeakPtr(), status));
+    message_loop->PostTask(
+        FROM_HERE,
+        base::Bind(&ChromeAsyncSocket::ProcessConnectDone,
+                   weak_ptr_factory_.GetWeakPtr(), status));
   }
   return true;
 }
 
 // STATE_CONNECTING -> STATE_OPEN
 // read_state_ == IDLE -> read_state_ == POSTED (via PostDoRead())
 
 void ChromeAsyncSocket::ProcessConnectDone(int status) {
   DCHECK_NE(status, net::ERR_IO_PENDING);
   DCHECK_EQ(read_state_, IDLE);
@@ skipping 15 matching lines @@
 
 void ChromeAsyncSocket::PostDoRead() {
   DCHECK(IsOpen());
   DCHECK_EQ(read_state_, IDLE);
   DCHECK_EQ(read_start_, 0U);
   DCHECK_EQ(read_end_, 0U);
   MessageLoop* message_loop = MessageLoop::current();
   CHECK(message_loop);
   message_loop->PostTask(
       FROM_HERE,
-      base::Bind(&ChromeAsyncSocket::DoRead, weak_factory_.GetWeakPtr()));
+      base::Bind(&ChromeAsyncSocket::DoRead,
+                 weak_ptr_factory_.GetWeakPtr()));
   read_state_ = POSTED;
 }
 
 // read_state_ == POSTED -> read_state_ == PENDING
 
 void ChromeAsyncSocket::DoRead() {
   DCHECK(IsOpen());
   DCHECK_EQ(read_state_, POSTED);
   DCHECK_EQ(read_start_, 0U);
   DCHECK_EQ(read_end_, 0U);
   // Once we call Read(), we cannot call StartTls() until the read
   // finishes.  This is okay, as StartTls() is called only from a read
   // handler (i.e., after a read finishes and before another read is
   // done).
   int status =
       transport_socket_->Read(
           read_buf_.get(), read_buf_->size(),
           base::Bind(&ChromeAsyncSocket::ProcessReadDone,
-                     base::Unretained(this)));
+                     weak_ptr_factory_.GetWeakPtr()));
   read_state_ = PENDING;
   if (status != net::ERR_IO_PENDING) {
     ProcessReadDone(status);
   }
 }
 
 // read_state_ == PENDING -> read_state_ == IDLE
 
 void ChromeAsyncSocket::ProcessReadDone(int status) {
   DCHECK_NE(status, net::ERR_IO_PENDING);
@@ skipping 93 matching lines @@
 // write_state_ == IDLE -> write_state_ == POSTED
 
 void ChromeAsyncSocket::PostDoWrite() {
   DCHECK(IsOpen());
   DCHECK_EQ(write_state_, IDLE);
   DCHECK_GT(write_end_, 0U);
   MessageLoop* message_loop = MessageLoop::current();
   CHECK(message_loop);
   message_loop->PostTask(
       FROM_HERE,
-      base::Bind(&ChromeAsyncSocket::DoWrite, weak_factory_.GetWeakPtr()));
+      base::Bind(&ChromeAsyncSocket::DoWrite,
+                 weak_ptr_factory_.GetWeakPtr()));
   write_state_ = POSTED;
 }
 
 // write_state_ == POSTED -> write_state_ == PENDING
 
 void ChromeAsyncSocket::DoWrite() {
   DCHECK(IsOpen());
   DCHECK_EQ(write_state_, POSTED);
   DCHECK_GT(write_end_, 0U);
   // Once we call Write(), we cannot call StartTls() until the write
   // finishes.  This is okay, as StartTls() is called only after we
   // have received a reply to a message we sent to the server and
   // before we send the next message.
   int status =
       transport_socket_->Write(
           write_buf_.get(), write_end_,
           base::Bind(&ChromeAsyncSocket::ProcessWriteDone,
-                     base::Unretained(this)));
+                     weak_ptr_factory_.GetWeakPtr()));
   write_state_ = PENDING;
   if (status != net::ERR_IO_PENDING) {
     ProcessWriteDone(status);
   }
 }
 
 // write_state_ == PENDING -> write_state_ == IDLE or POSTED (the
 // latter via PostDoWrite())
 
 void ChromeAsyncSocket::ProcessWriteDone(int status) {
@@ skipping 30 matching lines @@
 // * -> STATE_CLOSED
 
 bool ChromeAsyncSocket::Close() {
   DoClose();
   return true;
 }
 
 // (not STATE_CLOSED) -> STATE_CLOSED
 
 void ChromeAsyncSocket::DoClose() {
-  weak_factory_.InvalidateWeakPtrs();
+  weak_ptr_factory_.InvalidateWeakPtrs();
   if (transport_socket_.get()) {
     transport_socket_->Disconnect();
   }
   transport_socket_.reset();
   read_state_ = IDLE;
   read_start_ = 0U;
   read_end_ = 0U;
   write_state_ = IDLE;
   write_end_ = 0U;
   if (state_ != STATE_CLOSED) {
@@ skipping 16 matching lines @@
     return false;
   }
 
   state_ = STATE_TLS_CONNECTING;
   read_state_ = IDLE;
   read_start_ = 0U;
   read_end_ = 0U;
   DCHECK_EQ(write_end_, 0U);
 
   // Clear out any posted DoRead() tasks.
-  weak_factory_.InvalidateWeakPtrs();
+  weak_ptr_factory_.InvalidateWeakPtrs();
 
   DCHECK(transport_socket_.get());
-  net::ClientSocketHandle* socket_handle = new net::ClientSocketHandle();
+  scoped_ptr<net::ClientSocketHandle> socket_handle(
+      new net::ClientSocketHandle());
   socket_handle->set_socket(transport_socket_.release());
   transport_socket_.reset(
-      client_socket_factory_->CreateSSLClientSocket(
-          socket_handle, net::HostPortPair(domain_name, 443)));
+      resolving_client_socket_factory_->CreateSSLClientSocket(
+          socket_handle.release(), net::HostPortPair(domain_name, 443)));
   int status = transport_socket_->Connect(
       base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone,
-                 base::Unretained(this)));
+                 weak_ptr_factory_.GetWeakPtr()));
   if (status != net::ERR_IO_PENDING) {
     MessageLoop* message_loop = MessageLoop::current();
     CHECK(message_loop);
-    message_loop->PostTask(FROM_HERE,
-                           base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone,
-                                      weak_factory_.GetWeakPtr(), status));
+    message_loop->PostTask(
+        FROM_HERE,
+        base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone,
+                   weak_ptr_factory_.GetWeakPtr(), status));
   }
   return true;
 }
 
 // STATE_TLS_CONNECTING -> STATE_TLS_OPEN
 // read_state_ == IDLE -> read_state_ == POSTED (via PostDoRead())
 // (maybe) write_state_ == IDLE -> write_state_ == POSTED (via
 // PostDoWrite())
 
 void ChromeAsyncSocket::ProcessSSLConnectDone(int status) {
@@ skipping 10 matching lines @@
   }
   state_ = STATE_TLS_OPEN;
   PostDoRead();
   if (write_end_ > 0U) {
     PostDoWrite();
   }
   SignalSSLConnected();
 }
 
 }  // namespace notifier