Fixes for OpenSSL

net/socket/ssl_client_socket_openssl.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.
 
 // OpenSSL binding for SSLClientSocket. The class layout and general principle
 // of operation is derived from SSLClientSocketNSS.
 
 #include "net/socket/ssl_client_socket_openssl.h"
 
 #include <openssl/ssl.h>
@@ skipping 1076 matching lines @@
 }
 
 bool SSLClientSocketOpenSSL::UsingTCPFastOpen() const {
   if (transport_.get() && transport_->socket())
     return transport_->socket()->UsingTCPFastOpen();
 
   NOTREACHED();
   return false;
 }
 
+int64 SSLClientSocketOpenSSL::NumBytesRead() const {
+  if (transport_.get() && transport_->socket())
+    return transport_->socket()->NumBytesRead();
+
+  NOTREACHED();
+  return -1;

[wtc, 2011/07/01 16:41:17]

I think returning 0 here and in GetConnectTimeMicros
is better.  0 is the initial values used by
TCPClientSocketWin and TCPClientSocketLibevent.

I am especially worried about returning a TimeDelta of -1.
That may confuse code.

I know you copied the -1 value from ssl_client_socket_nss.cc.
So this is fine for now.

[bulach, 2011/07/05 10:06:55]

I'll keep this as is now for consistency.
joth pointed out that it'd be cleaner to have:

CHECK(transport_.get() && transport_->socked());
return transport_->socket()->FooBar();

or even better, have some adapter / base class that we could re-use across all
platform rather than duplicate this code..
if you agree with either suggestions, I'm happy to follow up!

On 2011/07/01 16:41:17, wtc wrote:

+}
+
+base::TimeDelta SSLClientSocketOpenSSL::GetConnectTimeMicros() const {
+  if (transport_.get() && transport_->socket())
+    return transport_->socket()->GetConnectTimeMicros();
+
+  NOTREACHED();
+  return base::TimeDelta::FromMicroseconds(-1);
+}
+
 // Socket methods
 
 int SSLClientSocketOpenSSL::Read(IOBuffer* buf,
                                  int buf_len,
                                  CompletionCallback* callback) {
   user_read_buf_ = buf;
   user_read_buf_len_ = buf_len;
 
   int rv = DoReadLoop(OK);
 
@@ skipping 87 matching lines @@
     net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
                                   user_write_buf_->data());
     return rv;
   }
 
   int err = SSL_get_error(ssl_, rv);
   return MapOpenSSLError(err, err_tracer);
 }
 
 }  // namespace net