Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/ssl_client_socket_openssl.h

 // 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.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 37 matching lines @@
   SSLClientSocketOpenSSL(scoped_ptr<ClientSocketHandle> transport_socket,
                          const HostPortPair& host_and_port,
                          const SSLConfig& ssl_config,
                          const SSLClientSocketContext& context);
   virtual ~SSLClientSocketOpenSSL();
 
   const HostPortPair& host_and_port() const { return host_and_port_; }
   const std::string& ssl_session_cache_shard() const {
     return ssl_session_cache_shard_;
   }
+  std::string GetSessionCacheKey() const;

[wtc, 2014/07/11 00:48:54]

This method should be private because it is only called by
SSLClientSocketOpenSSL and SSLClientSocketOpenSSL::SSLContext (which is marked
as a friend class).

[mshelley, 2014/07/11 23:26:27]

Done.

 
   // SSLClientSocket implementation.
+  virtual bool InSessionCache() const OVERRIDE;
+  virtual void WatchSessionForCompletion(
+      const base::Closure& callback) OVERRIDE;
+  virtual void SetSocketFailureCallback(const base::Closure& callback) OVERRIDE;
+  virtual void SetIsLeader() OVERRIDE;
+  virtual void OnSocketFailure() OVERRIDE;
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) OVERRIDE;
   virtual NextProtoStatus GetNextProto(std::string* proto,
                                        std::string* server_protos) OVERRIDE;
   virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
 
   // SSLSocket implementation.
   virtual int ExportKeyingMaterial(const base::StringPiece& label,
                                    bool has_context,
                                    const base::StringPiece& context,
@@ skipping 76 matching lines @@
   int CertVerifyCallback(X509_STORE_CTX *store_ctx);
 
   // Callback from the SSL layer to check which NPN protocol we are supporting
   int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen,
                               const unsigned char* in, unsigned int inlen);
 
   bool transport_send_busy_;
   bool transport_recv_busy_;
   bool transport_recv_eof_;
 
+  // True if the socket has been read from before.
+  bool has_read_;
+
+  // Counts how many times the socket has been written to.
+  int has_written_;

[wtc, 2014/07/11 00:48:54]

The has_read_ and has_written_ members should have the same type. Alternatively,
rename has_written_, for example, num_times_written_.

[mshelley, 2014/07/11 23:26:27]

Done.

+
   scoped_refptr<DrainableIOBuffer> send_buffer_;
   scoped_refptr<IOBuffer> recv_buffer_;
 
   CompletionCallback user_connect_callback_;
   CompletionCallback user_read_callback_;
   CompletionCallback user_write_callback_;
 
   base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_;
 
   // Used by Read function.
@@ skipping 35 matching lines @@
   // List of SSLClientCertType values for client certificates allowed by the
   // server.
   std::vector<SSLClientCertType> cert_key_types_;
 
   CertVerifier* const cert_verifier_;
   scoped_ptr<SingleRequestCertVerifier> verifier_;
 
   // The service for retrieving Channel ID keys.  May be NULL.
   ServerBoundCertService* server_bound_cert_service_;
 
+  // Callback that is invoked when the connection encounters an error.
+  base::Closure error_callback_;
+
+  // True if there may be pending sockets waiting for this socket to connect.
+  bool is_leader_;

[wtc, 2014/07/11 00:48:54]

Delete this member. It is equivalent to !error_callback_.is_null().

[mshelley, 2014/07/11 23:26:27]

Done.

+
   // OpenSSL stuff
   SSL* ssl_;
   BIO* transport_bio_;
 
   scoped_ptr<ClientSocketHandle> transport_;
   const HostPortPair host_and_port_;
   SSLConfig ssl_config_;
   // ssl_session_cache_shard_ is an opaque string that partitions the SSL
   // session cache. i.e. sessions created with one value will not attempt to
   // resume on the socket with a different value.
@@ skipping 20 matching lines @@
   // True if channel ID extension was negotiated.
   bool channel_id_xtn_negotiated_;
   // The request handle for |server_bound_cert_service_|.
   ServerBoundCertService::RequestHandle channel_id_request_handle_;
   BoundNetLog net_log_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_