Update SSLServerSocket to provide the net::StreamSocket interface.

net/socket/ssl_server_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.
 
 #include "net/socket/ssl_server_socket_nss.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>
 #endif
 
@@ skipping 28 matching lines @@
 #include "net/socket/nss_ssl_util.h"
 #include "net/socket/ssl_error_params.h"
 
 static const int kRecvBufferSize = 4096;
 
 #define GotoState(s) next_handshake_state_ = s
 
 namespace net {
 
 SSLServerSocket* CreateSSLServerSocket(
-    Socket* socket, X509Certificate* cert, crypto::RSAPrivateKey* key,
+    StreamSocket* socket,
+    X509Certificate* cert,
+    crypto::RSAPrivateKey* key,
     const SSLConfig& ssl_config) {
   return new SSLServerSocketNSS(socket, cert, key, ssl_config);
 }
 
 SSLServerSocketNSS::SSLServerSocketNSS(
-    Socket* transport_socket,
+    StreamSocket* transport_socket,
     scoped_refptr<X509Certificate> cert,
     crypto::RSAPrivateKey* key,
     const SSLConfig& ssl_config)
     : ALLOW_THIS_IN_INITIALIZER_LIST(buffer_send_callback_(
           this, &SSLServerSocketNSS::BufferSendComplete)),
       ALLOW_THIS_IN_INITIALIZER_LIST(buffer_recv_callback_(
           this, &SSLServerSocketNSS::BufferRecvComplete)),
       transport_send_busy_(false),
       transport_recv_busy_(false),
-      user_accept_callback_(NULL),
+      user_handshake_callback_(NULL),
       user_read_callback_(NULL),
       user_write_callback_(NULL),
       nss_fd_(NULL),
       nss_bufs_(NULL),
       transport_socket_(transport_socket),
       ssl_config_(ssl_config),
       cert_(cert),
       next_handshake_state_(STATE_NONE),
       completed_handshake_(false) {
   ssl_config_.false_start_enabled = false;
   ssl_config_.ssl3_enabled = true;
   ssl_config_.tls1_enabled = true;
 
   // TODO(hclam): Need a better way to clone a key.
   std::vector<uint8> key_bytes;
   CHECK(key->ExportPrivateKey(&key_bytes));
   key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes));
   CHECK(key_.get());
 }
 
 SSLServerSocketNSS::~SSLServerSocketNSS() {
   if (nss_fd_ != NULL) {
     PR_Close(nss_fd_);
     nss_fd_ = NULL;
   }
 }
 
-int SSLServerSocketNSS::Accept(CompletionCallback* callback) {
+int SSLServerSocketNSS::Handshake(CompletionCallback* callback) {
   net_log_.BeginEvent(NetLog::TYPE_SSL_ACCEPT, NULL);

[wtc, 2011/06/16 21:35:07]

NetLog::TYPE_SSL_ACCEPT probably should be renamed
NetLog::TYPE_SSL_HANDSHAKE or NetLog::TYPE_SSL_SERVER_HANDSHAKE.

[Wez, 2011/06/17 04:53:38]

Done.

I've renamed to SSL_SERVER_HANDSHAKE, and updated the comment.  I've also
updated the comment on SSL_CONNECT, and will re-name that in the follow-up CL.

 
   int rv = Init();
   if (rv != OK) {
     LOG(ERROR) << "Failed to initialize NSS";
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_ACCEPT, rv);
     return rv;
   }
 
   rv = InitializeSSLOptions();
   if (rv != OK) {
     LOG(ERROR) << "Failed to initialize SSL options";
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_ACCEPT, rv);
     return rv;
   }
 
   // Set peer address. TODO(hclam): This should be in a separate method.
   PRNetAddr peername;
   memset(&peername, 0, sizeof(peername));
   peername.raw.family = AF_INET;
   memio_SetPeerName(nss_fd_, &peername);
 
   GotoState(STATE_HANDSHAKE);
   rv = DoHandshakeLoop(net::OK);
   if (rv == ERR_IO_PENDING) {
-    user_accept_callback_ = callback;
+    user_handshake_callback_ = callback;
   } else {
     net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_ACCEPT, rv);
   }
 
   return rv > OK ? OK : rv;
 }
 
+int SSLServerSocketNSS::Connect(CompletionCallback* callback) {
+  NOTIMPLEMENTED();
+  return ERR_NOT_IMPLEMENTED;
+}
+
 int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
                              CompletionCallback* callback) {
   DCHECK(!user_read_callback_);
-  DCHECK(!user_accept_callback_);
+  DCHECK(!user_handshake_callback_);
   DCHECK(!user_read_buf_);
   DCHECK(nss_bufs_);
 
   user_read_buf_ = buf;
   user_read_buf_len_ = buf_len;
 
   DCHECK(completed_handshake_);
 
   int rv = DoReadLoop(OK);
 
@@ skipping 20 matching lines @@
   if (rv == ERR_IO_PENDING) {
     user_write_callback_ = callback;
   } else {
     user_write_buf_ = NULL;
     user_write_buf_len_ = 0;
   }
   return rv;
 }
 
 bool SSLServerSocketNSS::SetReceiveBufferSize(int32 size) {
-  return false;
+  return transport_socket_->SetReceiveBufferSize(size);
 }
 
 bool SSLServerSocketNSS::SetSendBufferSize(int32 size) {
-  return false;
+  return transport_socket_->SetSendBufferSize(size);
+}
+
+bool SSLServerSocketNSS::IsConnected() const {
+  return completed_handshake_;
+}
+
+void SSLServerSocketNSS::Disconnect() {
+  transport_socket_->Disconnect();
+}
+
+bool SSLServerSocketNSS::IsConnectedAndIdle() const {
+  return completed_handshake_ && transport_socket_->IsConnectedAndIdle();
+}
+
+int SSLServerSocketNSS::GetPeerAddress(AddressList* address) const {
+  if (!IsConnected())
+    return ERR_SOCKET_NOT_CONNECTED;
+  return transport_socket_->GetPeerAddress(address);
+}
+
+int SSLServerSocketNSS::GetLocalAddress(IPEndPoint* address) const {
+  if (!IsConnected())
+    return ERR_SOCKET_NOT_CONNECTED;
+  return transport_socket_->GetLocalAddress(address);
+}
+
+const BoundNetLog& SSLServerSocketNSS::NetLog() const {
+  return net_log_;
+}
+
+void SSLServerSocketNSS::SetSubresourceSpeculation() {
+  transport_socket_->SetSubresourceSpeculation();
+}
+
+void SSLServerSocketNSS::SetOmniboxSpeculation() {
+  transport_socket_->SetOmniboxSpeculation();
+}
+
+bool SSLServerSocketNSS::WasEverUsed() const {
+  return transport_socket_->WasEverUsed();
+}
+
+bool SSLServerSocketNSS::UsingTCPFastOpen() const {
+  return transport_socket_->UsingTCPFastOpen();
 }
 
 int SSLServerSocketNSS::InitializeSSLOptions() {
   // Transport connected, now hook it up to nss
   // TODO(port): specify rx and tx buffer sizes separately
   nss_fd_ = memio_CreateIOLayer(kRecvBufferSize);
   if (nss_fd_ == NULL) {
     return ERR_OUT_OF_MEMORY;  // TODO(port): map NSPR error code.
   }
 
@@ skipping 193 matching lines @@
 
   int rv = DoReadLoop(result);
   if (rv != ERR_IO_PENDING)
     DoReadCallback(rv);
 }
 
 void SSLServerSocketNSS::OnHandshakeIOComplete(int result) {
   int rv = DoHandshakeLoop(result);
   if (rv != ERR_IO_PENDING) {
     net_log_.EndEventWithNetErrorCode(net::NetLog::TYPE_SSL_ACCEPT, rv);
-    if (user_accept_callback_)
-      DoAcceptCallback(rv);
+    if (user_handshake_callback_)
+      DoHandshakeCallback(rv);
   }
 }
 
 // Return 0 for EOF,
 // > 0 for bytes transferred immediately,
 // < 0 for error (or the non-error ERR_IO_PENDING).
 int SSLServerSocketNSS::BufferSend(void) {
   if (transport_send_busy_)
     return ERR_IO_PENDING;
 
@@ skipping 201 matching lines @@
       LOG(ERROR) << "handshake failed; NSS error code " << prerr
                  << ", net_error " << net_error;
       net_log_.AddEvent(
           NetLog::TYPE_SSL_HANDSHAKE_ERROR,
           make_scoped_refptr(new SSLErrorParams(net_error, prerr)));
     }
   }
   return net_error;
 }
 
-void SSLServerSocketNSS::DoAcceptCallback(int rv) {
+void SSLServerSocketNSS::DoHandshakeCallback(int rv) {
   DCHECK_NE(rv, ERR_IO_PENDING);
 
-  CompletionCallback* c = user_accept_callback_;
-  user_accept_callback_ = NULL;
+  CompletionCallback* c = user_handshake_callback_;
+  user_handshake_callback_ = NULL;
   c->Run(rv > OK ? OK : rv);
 }
 
 void SSLServerSocketNSS::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.
   CompletionCallback* c = user_read_callback_;
@@ skipping 49 matching lines @@
   // We must call EnsureOCSPInit() here, on the IO thread, to get the IO loop
   // by MessageLoopForIO::current().
   // X509Certificate::Verify() runs on a worker thread of CertVerifier.
   EnsureOCSPInit();
 #endif
 
   return OK;
 }
 
 }  // namespace net