base::Bind: Convert Socket::Read.

net/socket/ssl_client_socket_nss.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.
 
 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
 // from AuthCertificateCallback() in
 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ skipping 428 matching lines @@
       transport_send_busy_(false),
       transport_recv_busy_(false),
       corked_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(handshake_io_callback_(
           base::Bind(&SSLClientSocketNSS::OnHandshakeIOComplete,
                      base::Unretained(this)))),
       transport_(transport_socket),
       host_and_port_(host_and_port),
       ssl_config_(ssl_config),
       old_user_connect_callback_(NULL),
-      user_read_callback_(NULL),
+      old_user_read_callback_(NULL),
       user_write_callback_(NULL),
       user_read_buf_len_(0),
       user_write_buf_len_(0),
       server_cert_nss_(NULL),
       server_cert_verify_result_(NULL),
       ssl_connection_status_(0),
       client_auth_cert_needed_(false),
       cert_verifier_(context.cert_verifier),
       ob_cert_xtn_negotiated_(false),
       origin_bound_cert_service_(context.origin_bound_cert_service),
@@ skipping 100 matching lines @@
 SSLClientSocket::NextProtoStatus
 SSLClientSocketNSS::GetNextProto(std::string* proto) {
   *proto = next_proto_;
   return next_proto_status_;
 }
 
 int SSLClientSocketNSS::Connect(OldCompletionCallback* callback) {
   EnterFunction("");
   DCHECK(transport_.get());
   DCHECK(next_handshake_state_ == STATE_NONE);
-  DCHECK(!user_read_callback_);
+  DCHECK(!old_user_read_callback_);

[csilv, 2011/12/07 00:03:48]

this should probably also check user_read_callback_

[James Hawkins, 2011/12/07 00:19:37]

Done.

   DCHECK(!user_write_callback_);
   DCHECK(!old_user_connect_callback_);

[csilv, 2011/12/07 00:03:48]

this should probably also check user_connect_callback_

[James Hawkins, 2011/12/07 00:19:37]

Done.

   DCHECK(!user_read_buf_);
   DCHECK(!user_write_buf_);
 
   EnsureThreadIdAssigned();
 
   net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL);
 
   int rv = Init();
   if (rv != OK) {
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
@@ skipping 25 matching lines @@
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
   }
 
   LeaveFunction("");
   return rv > OK ? OK : rv;
 }
 int SSLClientSocketNSS::Connect(const CompletionCallback& callback) {
   EnterFunction("");
   DCHECK(transport_.get());
   DCHECK(next_handshake_state_ == STATE_NONE);
-  DCHECK(!user_read_callback_);
+  DCHECK(!old_user_read_callback_);

[csilv, 2011/12/07 00:03:48]

this should probably also check user_read_callback_

[James Hawkins, 2011/12/07 00:19:37]

Done.

   DCHECK(!user_write_callback_);
   DCHECK(!old_user_connect_callback_ && user_connect_callback_.is_null());
   DCHECK(!user_read_buf_);
   DCHECK(!user_write_buf_);
 
   EnsureThreadIdAssigned();
 
   net_log_.BeginEvent(NetLog::TYPE_SSL_CONNECT, NULL);
 
   int rv = Init();
@@ skipping 50 matching lines @@
   if (nss_fd_ != NULL) {
     PR_Close(nss_fd_);
     nss_fd_ = NULL;
   }
 
   // Reset object state
   transport_send_busy_   = false;
   transport_recv_busy_   = false;
   old_user_connect_callback_ = NULL;
   user_connect_callback_.Reset();
-  user_read_callback_    = NULL;
+  old_user_read_callback_    = NULL;
+  user_read_callback_.Reset();
   user_write_callback_   = NULL;
   user_read_buf_         = NULL;
   user_read_buf_len_     = 0;
   user_write_buf_        = NULL;
   user_write_buf_len_    = 0;
   server_cert_           = NULL;
   if (server_cert_nss_) {
     CERT_DestroyCertificate(server_cert_nss_);
     server_cert_nss_     = NULL;
   }
@@ skipping 99 matching lines @@
   }
   NOTREACHED();
   return base::TimeDelta::FromMicroseconds(-1);
 }
 
 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
                              OldCompletionCallback* callback) {
   EnterFunction(buf_len);
   DCHECK(completed_handshake_);
   DCHECK(next_handshake_state_ == STATE_NONE);
-  DCHECK(!user_read_callback_);
+  DCHECK(!old_user_read_callback_ && user_read_callback_.is_null());
   DCHECK(!old_user_connect_callback_);

[csilv, 2011/12/07 00:03:48]

this should probabably also check user_connect_callback_

[James Hawkins, 2011/12/07 00:19:37]

Done.

   DCHECK(!user_read_buf_);
   DCHECK(nss_bufs_);
+
+  user_read_buf_ = buf;
+  user_read_buf_len_ = buf_len;
+
+  int rv = DoReadLoop(OK);
+
+  if (rv == ERR_IO_PENDING) {
+    old_user_read_callback_ = callback;
+  } else {
+    user_read_buf_ = NULL;
+    user_read_buf_len_ = 0;
+  }
+  LeaveFunction(rv);
+  return rv;
+}
+int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
+                             const CompletionCallback& callback) {
+  EnterFunction(buf_len);
+  DCHECK(completed_handshake_);
+  DCHECK(next_handshake_state_ == STATE_NONE);
+  DCHECK(!old_user_read_callback_ && user_read_callback_.is_null());
+  DCHECK(!old_user_connect_callback_);

[csilv, 2011/12/07 00:03:48]

this should probabably also check user_connect_callback_

[James Hawkins, 2011/12/07 00:19:37]

Done.

+  DCHECK(!user_read_buf_);
+  DCHECK(nss_bufs_);
 
   user_read_buf_ = buf;
   user_read_buf_len_ = buf_len;
 
   int rv = DoReadLoop(OK);
 
   if (rv == ERR_IO_PENDING) {
     user_read_callback_ = callback;
   } else {
     user_read_buf_ = NULL;
@@ skipping 361 matching lines @@
   }
 #endif
 
   if (ssl_config_.ssl3_fallback)
     ssl_connection_status_ |= SSL_CONNECTION_SSL3_FALLBACK;
 }
 
 void SSLClientSocketNSS::DoReadCallback(int rv) {
   EnterFunction(rv);
   DCHECK(rv != ERR_IO_PENDING);
-  DCHECK(user_read_callback_);
+  DCHECK(old_user_read_callback_ || user_read_callback_.is_null());
 
-  // Since Run may result in Read being called, clear |user_read_callback_|
+  // Since Run may result in Read being called, clear |old_user_read_callback_|
   // up front.
-  OldCompletionCallback* c = user_read_callback_;
-  user_read_callback_ = NULL;
-  user_read_buf_ = NULL;
-  user_read_buf_len_ = 0;
-  c->Run(rv);
+  if (old_user_read_callback_) {
+    OldCompletionCallback* c = old_user_read_callback_;
+    old_user_read_callback_ = NULL;
+    user_read_buf_ = NULL;
+    user_read_buf_len_ = 0;
+    c->Run(rv);
+  } else {
+    CompletionCallback c = user_read_callback_;
+    user_read_callback_.Reset();
+    user_read_buf_ = NULL;
+    user_read_buf_len_ = 0;
+    c.Run(rv);
+  }
   LeaveFunction("");
 }
 
 void SSLClientSocketNSS::DoWriteCallback(int rv) {
   EnterFunction(rv);
   DCHECK(rv != ERR_IO_PENDING);
   DCHECK(user_write_callback_);
 
   // Since Run may result in Write being called, clear |user_write_callback_|
   // up front.
@@ skipping 607 matching lines @@
   // http://crbug.com/15630 for more info.
 
   // TODO(hclam): Skip logging if server cert was expected to be bad because
   // |server_cert_verify_results_| doesn't contain all the information about
   // the cert.
   if (result == OK)
     LogConnectionTypeMetrics();
 
   completed_handshake_ = true;
 
-  if (user_read_callback_) {
+  if (old_user_read_callback_ || !user_read_callback_.is_null()) {
     int rv = DoReadLoop(OK);
     if (rv != ERR_IO_PENDING)
       DoReadCallback(rv);
   }
 
   // Exit DoHandshakeLoop and return the result to the caller to Connect.
   DCHECK(next_handshake_state_ == STATE_NONE);
   return result;
 }
 
@@ skipping 832 matching lines @@
   valid_thread_id_ = base::PlatformThread::CurrentId();
 }
 
 bool SSLClientSocketNSS::CalledOnValidThread() const {
   EnsureThreadIdAssigned();
   base::AutoLock auto_lock(lock_);
   return valid_thread_id_ == base::PlatformThread::CurrentId();
 }
 
 }  // namespace net