Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(883)

Side by Side Diff: net/socket/ssl_client_socket_openssl.cc

Issue 12886034: Remove experimental code to pick the "warmest" socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync, fix conflict Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // OpenSSL binding for SSLClientSocket. The class layout and general principle 5 // OpenSSL binding for SSLClientSocket. The class layout and general principle
6 // of operation is derived from SSLClientSocketNSS. 6 // of operation is derived from SSLClientSocketNSS.
7 7
8 #include "net/socket/ssl_client_socket_openssl.h" 8 #include "net/socket/ssl_client_socket_openssl.h"
9 9
10 #include <openssl/err.h> 10 #include <openssl/err.h>
(...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 } 1250 }
1251 1251
1252 bool SSLClientSocketOpenSSL::UsingTCPFastOpen() const { 1252 bool SSLClientSocketOpenSSL::UsingTCPFastOpen() const {
1253 if (transport_.get() && transport_->socket()) 1253 if (transport_.get() && transport_->socket())
1254 return transport_->socket()->UsingTCPFastOpen(); 1254 return transport_->socket()->UsingTCPFastOpen();
1255 1255
1256 NOTREACHED(); 1256 NOTREACHED();
1257 return false; 1257 return false;
1258 } 1258 }
1259 1259
1260 int64 SSLClientSocketOpenSSL::NumBytesRead() const {
1261 if (transport_.get() && transport_->socket())
1262 return transport_->socket()->NumBytesRead();
1263
1264 NOTREACHED();
1265 return -1;
1266 }
1267
1268 base::TimeDelta SSLClientSocketOpenSSL::GetConnectTimeMicros() const {
1269 if (transport_.get() && transport_->socket())
1270 return transport_->socket()->GetConnectTimeMicros();
1271
1272 NOTREACHED();
1273 return base::TimeDelta::FromMicroseconds(-1);
1274 }
1275
1276 // Socket methods 1260 // Socket methods
1277 1261
1278 int SSLClientSocketOpenSSL::Read(IOBuffer* buf, 1262 int SSLClientSocketOpenSSL::Read(IOBuffer* buf,
1279 int buf_len, 1263 int buf_len,
1280 const CompletionCallback& callback) { 1264 const CompletionCallback& callback) {
1281 user_read_buf_ = buf; 1265 user_read_buf_ = buf;
1282 user_read_buf_len_ = buf_len; 1266 user_read_buf_len_ = buf_len;
1283 1267
1284 int rv = DoReadLoop(OK); 1268 int rv = DoReadLoop(OK);
1285 1269
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1422 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, 1406 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
1423 user_write_buf_->data()); 1407 user_write_buf_->data());
1424 return rv; 1408 return rv;
1425 } 1409 }
1426 1410
1427 int err = SSL_get_error(ssl_, rv); 1411 int err = SSL_get_error(ssl_, rv);
1428 return MapOpenSSLError(err, err_tracer); 1412 return MapOpenSSLError(err, err_tracer);
1429 } 1413 }
1430 1414
1431 } // namespace net 1415 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698