| Index: net/socket/ssl_server_socket_nss.h
|
| diff --git a/net/socket/ssl_server_socket_nss.h b/net/socket/ssl_server_socket_nss.h
|
| index 7953c38bf2b18b89014f5f053e51f778bf3c67b8..24d60cb2be19fa3e4f755a76fbcb8fa33f776363 100644
|
| --- a/net/socket/ssl_server_socket_nss.h
|
| +++ b/net/socket/ssl_server_socket_nss.h
|
| @@ -21,27 +21,36 @@
|
|
|
| namespace net {
|
|
|
| -class SSLServerSocketNSS : public SSLServerSocket {
|
| +class SSLServerSocketNSS : public StreamSocket {
|
| public:
|
| - // This object takes ownership of the following parameters:
|
| - // |socket| - A socket that is already connected.
|
| - // |cert| - The certificate to be used by the server.
|
| - //
|
| - // The following parameters are copied in the constructor.
|
| - // |ssl_config| - Options for SSL socket.
|
| - // |key| - The private key used by the server.
|
| - SSLServerSocketNSS(Socket* transport_socket,
|
| - scoped_refptr<X509Certificate> cert,
|
| - crypto::RSAPrivateKey* key,
|
| + // See comments on CreateSSLServerSocket for details of how these
|
| + // parameters are used.
|
| + SSLServerSocketNSS(StreamSocket* socket,
|
| + scoped_refptr<X509Certificate> certificate,
|
| + const crypto::RSAPrivateKey* key,
|
| const SSLConfig& ssl_config);
|
| virtual ~SSLServerSocketNSS();
|
|
|
| - // SSLServerSocket implementation.
|
| - virtual int Accept(CompletionCallback* callback);
|
| + // StreamSocket interface.
|
| + virtual int Connect(CompletionCallback* callback);
|
| virtual int Read(IOBuffer* buf, int buf_len,
|
| CompletionCallback* callback);
|
| virtual int Write(IOBuffer* buf, int buf_len,
|
| CompletionCallback* callback);
|
| + virtual void Disconnect();
|
| + virtual bool IsConnected() const;
|
| + virtual bool IsConnectedAndIdle() const;
|
| +
|
| + // StreamSocket calls passed straight to underlying stream.
|
| + virtual int GetPeerAddress(AddressList* address) const;
|
| + virtual int GetLocalAddress(IPEndPoint* address) const;
|
| + virtual const BoundNetLog& NetLog() const;
|
| + virtual void SetSubresourceSpeculation();
|
| + virtual void SetOmniboxSpeculation();
|
| + virtual bool WasEverUsed() const;
|
| + virtual bool UsingTCPFastOpen() const;
|
| +
|
| + // SSLServerSocket specific calls.
|
| virtual bool SetReceiveBufferSize(int32 size);
|
| virtual bool SetSendBufferSize(int32 size);
|
|
|
| @@ -110,7 +119,7 @@ class SSLServerSocketNSS : public SSLServerSocket {
|
| memio_Private* nss_bufs_;
|
|
|
| // Socket for sending and receiving data.
|
| - scoped_ptr<Socket> transport_socket_;
|
| + scoped_ptr<StreamSocket> transport_socket_;
|
|
|
| // Options for the SSL socket.
|
| // TODO(hclam): This memeber is currently not used. Should make use of this
|
|
|