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

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 869393005: Perform ClientHello padding if the field trial is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@net_connection_error_uma
Patch Set: Rebase Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_openssl.cc
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index c4af9575f1e447939f3e76fbce7f43fd4896cf92..24e3ad687e5b9524a4f1dafde6715aa674aa7e7c 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -474,12 +474,20 @@ int SSLClientSocketOpenSSL::Connect(const CompletionCallback& callback) {
if (rv != OK) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(rv));
+ if (ssl_config_.fastradio_padding_eligible)
Alexei Svitkine (slow) 2015/02/06 20:26:34 Nit: {}
jeremyim 2015/02/06 22:40:29 Done.
+ UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_ClientPadding",
+ std::abs(rv));
return rv;
}
// Set SSL to client mode. Handshake happens in the loop below.
SSL_set_connect_state(ssl_);
+ // Enable fastradio padding.
+ SSL_enable_fastradio_padding(ssl_,
+ ssl_config_.enable_fastradio_padding &&
+ ssl_config_.fastradio_padding_eligible);
+
GotoState(STATE_HANDSHAKE);
rv = DoHandshakeLoop(OK);
if (rv == ERR_IO_PENDING) {
@@ -487,6 +495,9 @@ int SSLClientSocketOpenSSL::Connect(const CompletionCallback& callback) {
} else {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(rv));
+ if (ssl_config_.fastradio_padding_eligible)
Alexei Svitkine (slow) 2015/02/06 20:26:34 Nit: {}
jeremyim 2015/02/06 22:40:29 Done.
+ UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_ClientPadding",
+ std::abs(rv));
if (rv < OK)
OnHandshakeCompletion();
}
@@ -1367,6 +1378,9 @@ void SSLClientSocketOpenSSL::OnHandshakeIOComplete(int result) {
if (rv != ERR_IO_PENDING) {
net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error", std::abs(rv));
+ if (ssl_config_.fastradio_padding_eligible)
Alexei Svitkine (slow) 2015/02/06 20:26:34 DItto.
jeremyim 2015/02/06 22:40:29 Done.
+ UMA_HISTOGRAM_SPARSE_SLOWLY("Net.SSL_Connection_Error_ClientPadding",
+ std::abs(rv));
DoConnectCallback(rv);
}
}

Powered by Google App Engine
This is Rietveld 408576698