base::Bind: Convert StreamSocket::Connect.

net/socket/ssl_client_socket_mac.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.
 
 #include "net/socket/ssl_client_socket_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ skipping 513 matching lines @@
                                        const HostPortPair& host_and_port,
                                        const SSLConfig& ssl_config,
                                        const SSLClientSocketContext& context)
     : transport_read_callback_(this,
                                &SSLClientSocketMac::OnTransportReadComplete),
       transport_write_callback_(this,
                                 &SSLClientSocketMac::OnTransportWriteComplete),
       transport_(transport_socket),
       host_and_port_(host_and_port),
       ssl_config_(ssl_config),
-      user_connect_callback_(NULL),
+      old_user_connect_callback_(NULL),
       user_read_callback_(NULL),
       user_write_callback_(NULL),
       user_read_buf_len_(0),
       user_write_buf_len_(0),
       next_handshake_state_(STATE_NONE),
       cert_verifier_(context.cert_verifier),
       renegotiating_(false),
       client_cert_requested_(false),
       ssl_context_(NULL),
       bytes_read_after_renegotiation_(0),
       pending_send_error_(OK),
       net_log_(transport_socket->socket()->NetLog()) {
   // Sort the list of ciphers to disable, since disabling ciphers on Mac
   // requires subtracting from a list of enabled ciphers while maintaining
   // ordering, as opposed to merely needing to iterate them as with NSS.
   sort(ssl_config_.disabled_cipher_suites.begin(),
        ssl_config_.disabled_cipher_suites.end());
 }
 
 SSLClientSocketMac::~SSLClientSocketMac() {
   Disconnect();
 }
 
 int SSLClientSocketMac::Connect(OldCompletionCallback* callback) {
   DCHECK(transport_.get());
   DCHECK(next_handshake_state_ == STATE_NONE);
-  DCHECK(!user_connect_callback_);
+  DCHECK(!old_user_connect_callback_ && user_connect_callback_.is_null());
 
   net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL);
 
+  int rv = InitializeSSLContext();
+  if (rv != OK) {
+    net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
+    return rv;
+  }
+
+  next_handshake_state_ = STATE_HANDSHAKE;
+  rv = DoHandshakeLoop(OK);
+  if (rv == ERR_IO_PENDING) {
+    old_user_connect_callback_ = callback;
+  } else {
+    net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
+  }
+  return rv;
+}
+int SSLClientSocketMac::Connect(const CompletionCallback& callback) {
+  DCHECK(transport_.get());
+  DCHECK(next_handshake_state_ == STATE_NONE);
+  DCHECK(!old_user_connect_callback_ && user_connect_callback_.is_null());
+
+  net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL);
+
   int rv = InitializeSSLContext();
   if (rv != OK) {
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
     return rv;
   }
 
   next_handshake_state_ = STATE_HANDSHAKE;
   rv = DoHandshakeLoop(OK);
   if (rv == ERR_IO_PENDING) {
     user_connect_callback_ = callback;
@@ skipping 312 matching lines @@
   // own copy.
   status = SSLSetPeerID(ssl_context_, peer_id.data(), peer_id.length());
   if (status)
     return NetErrorFromOSStatus(status);
 
   return OK;
 }
 
 void SSLClientSocketMac::DoConnectCallback(int rv) {
   DCHECK(rv != ERR_IO_PENDING);
-  DCHECK(user_connect_callback_);
+  DCHECK(old_user_connect_callback_ || !user_connect_callback_.is_null());
 
-  OldCompletionCallback* c = user_connect_callback_;
-  user_connect_callback_ = NULL;
-  c->Run(rv > OK ? OK : rv);
+  if (old_user_connect_callback_) {
+    OldCompletionCallback* c = old_user_connect_callback_;
+    old_user_connect_callback_ = NULL;
+    c->Run(rv > OK ? OK : rv);
+  } else {
+    CompletionCallback c = user_connect_callback_;
+    user_connect_callback_.Reset();
+    c.Run(rv > OK ? OK : rv);
+  }
 }
 
 void SSLClientSocketMac::DoReadCallback(int rv) {
   DCHECK(rv != ERR_IO_PENDING);
   DCHECK(user_read_callback_);
 
   // Since Run may result in Read being called, clear user_read_callback_ up
   // front.
   OldCompletionCallback* c = user_read_callback_;
   user_read_callback_ = NULL;
@@ skipping 15 matching lines @@
   c->Run(rv);
 }
 
 void SSLClientSocketMac::OnHandshakeIOComplete(int result) {
   int rv = DoHandshakeLoop(result);
   if (rv != ERR_IO_PENDING) {
     // If there is no connect callback available to call, we are
     // renegotiating (which occurs because we are in the middle of a Read
     // when the renegotiation process starts).  So we complete the Read
     // here.
-    if (!user_connect_callback_) {
+    if (!old_user_connect_callback_ && user_connect_callback_.is_null()) {
       DoReadCallback(rv);
       return;
     }
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
     DoConnectCallback(rv);
   }
 }
 
 void SSLClientSocketMac::OnTransportReadComplete(int result) {
   if (result > 0) {
@@ skipping 317 matching lines @@
   // The user had a read in progress, which was interrupted by the
   // renegotiation. Return the application data that was processed after the
   // handshake completed.
   next_handshake_state_ = STATE_COMPLETED_HANDSHAKE;
   if (result != OK)
     return result;
   return bytes_read_after_renegotiation_;
 }
 
 void SSLClientSocketMac::DidCompleteRenegotiation() {
-  DCHECK(!user_connect_callback_);
+  DCHECK(!old_user_connect_callback_ && user_connect_callback_.is_null());
   renegotiating_ = false;
   next_handshake_state_ = STATE_COMPLETED_RENEGOTIATION;
 }
 
 int SSLClientSocketMac::DidCompleteHandshake() {
   DCHECK(!server_cert_ || renegotiating_);
   VLOG(1) << "Handshake completed, next verify cert";
 
   scoped_refptr<X509Certificate> new_server_cert(
       GetServerCert(ssl_context_));
@@ skipping 141 matching lines @@
   if (rv < 0 && rv != ERR_IO_PENDING) {
     us->write_io_buf_ = NULL;
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net