base::Bind: Convert StreamSocket::Connect.

net/socket/ssl_client_socket_win.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_win.h"
 
 #include <schnlsp.h>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 379 matching lines @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(
         handshake_io_callback_(this,
                                &SSLClientSocketWin::OnHandshakeIOComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
         read_callback_(this, &SSLClientSocketWin::OnReadComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(
         write_callback_(this, &SSLClientSocketWin::OnWriteComplete)),
       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_read_buf_len_(0),
       user_write_callback_(NULL),
       user_write_buf_len_(0),
       next_state_(STATE_NONE),
       cert_verifier_(context.cert_verifier),
       creds_(NULL),
       isc_status_(SEC_E_OK),
       payload_send_buffer_len_(0),
       bytes_sent_(0),
@@ skipping 145 matching lines @@
 
 SSLClientSocket::NextProtoStatus
 SSLClientSocketWin::GetNextProto(std::string* proto) {
   proto->clear();
   return kNextProtoUnsupported;
 }
 
 int SSLClientSocketWin::Connect(OldCompletionCallback* callback) {
   DCHECK(transport_.get());
   DCHECK(next_state_ == STATE_NONE);
-  DCHECK(!user_connect_callback_);
+  DCHECK(!old_user_connect_callback_);

[csilv, 2011/12/06 21:03:18]

make this check match line 589

[James Hawkins, 2011/12/06 22:19:30]

Done.

 
   net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL);
 
+  int rv = InitializeSSLContext();
+  if (rv != OK) {
+    net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL);
+    return rv;
+  }
+
+  writing_first_token_ = true;
+  next_state_ = STATE_HANDSHAKE_WRITE;
+  rv = DoLoop(OK);
+  if (rv == ERR_IO_PENDING) {
+    old_user_connect_callback_ = callback;
+  } else {
+    net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL);
+  }
+  return rv;
+}
+int SSLClientSocketWin::Connect(const CompletionCallback& callback) {
+  DCHECK(transport_.get());
+  DCHECK(next_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_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL);
     return rv;
   }
 
   writing_first_token_ = true;
   next_state_ = STATE_HANDSHAKE_WRITE;
   rv = DoLoop(OK);
   if (rv == ERR_IO_PENDING) {
@@ skipping 253 matching lines @@
 
 void SSLClientSocketWin::OnHandshakeIOComplete(int result) {
   int rv = DoLoop(result);
 
   // The SSL handshake has some round trips.  We need to notify the caller of
   // success or any error, other than waiting for IO.
   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()) {
       OldCompletionCallback* c = user_read_callback_;
       user_read_callback_ = NULL;
       user_read_buf_ = NULL;
       user_read_buf_len_ = 0;
       c->Run(rv);
       return;
     }
     net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, NULL);
-    OldCompletionCallback* c = user_connect_callback_;
-    user_connect_callback_ = NULL;
-    c->Run(rv);
+    if (old_user_connect_callback_) {
+      OldCompletionCallback* c = old_user_connect_callback_;
+      old_user_connect_callback_ = NULL;
+      c->Run(rv);
+    } else {
+      CompletionCallback c = user_connect_callback_;
+      user_connect_callback_.Reset();
+      c.Run(rv);
+    }
   }
 }
 
 void SSLClientSocketWin::OnReadComplete(int result) {
   DCHECK(completed_handshake());
 
   result = DoPayloadReadComplete(result);
   if (result > 0)
     result = DoPayloadDecrypt();
   if (result != ERR_IO_PENDING) {
@@ skipping 675 matching lines @@
     server_cert_ = new_server_cert;
     next_state_ = STATE_VERIFY_CERT;
   }
   CertFreeCertificateContext(server_cert_handle);
   return OK;
 }
 
 // Called when a renegotiation is completed.  |result| is the verification
 // result of the server certificate received during renegotiation.
 void SSLClientSocketWin::DidCompleteRenegotiation() {
-  DCHECK(!user_connect_callback_);
+  DCHECK(!old_user_connect_callback_ && user_connect_callback_.is_null());
   DCHECK(user_read_callback_);
   renegotiating_ = false;
   next_state_ = STATE_COMPLETED_RENEGOTIATION;
 }
 
 void SSLClientSocketWin::LogConnectionTypeMetrics() const {
   UpdateConnectionTypeHistograms(CONNECTION_SSL);
   if (server_cert_verify_result_.has_md5)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5);
   if (server_cert_verify_result_.has_md2)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2);
   if (server_cert_verify_result_.has_md4)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD4);
   if (server_cert_verify_result_.has_md5_ca)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD5_CA);
   if (server_cert_verify_result_.has_md2_ca)
     UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA);
 }
 
 void SSLClientSocketWin::FreeSendBuffer() {
   SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
   DCHECK(status == SEC_E_OK);
   memset(&send_buffer_, 0, sizeof(send_buffer_));
 }
 
 }  // namespace net