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

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

Issue 1096203006: Collect all ConnectionAttempts from both sockets in TransportConnectJob. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@domrel_serverip1
Patch Set: Make requested changes; rebase Created 5 years, 7 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
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 <errno.h> 10 #include <errno.h>
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 ssl_info->handshake_type = SSL_session_reused(ssl_) ? 617 ssl_info->handshake_type = SSL_session_reused(ssl_) ?
618 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL; 618 SSLInfo::HANDSHAKE_RESUME : SSLInfo::HANDSHAKE_FULL;
619 619
620 DVLOG(3) << "Encoded connection status: cipher suite = " 620 DVLOG(3) << "Encoded connection status: cipher suite = "
621 << SSLConnectionStatusToCipherSuite(ssl_info->connection_status) 621 << SSLConnectionStatusToCipherSuite(ssl_info->connection_status)
622 << " version = " 622 << " version = "
623 << SSLConnectionStatusToVersion(ssl_info->connection_status); 623 << SSLConnectionStatusToVersion(ssl_info->connection_status);
624 return true; 624 return true;
625 } 625 }
626 626
627 void SSLClientSocketOpenSSL::GetConnectionAttempts(
628 ConnectionAttempts* out) const {
629 out->clear();
630 }
631
627 int SSLClientSocketOpenSSL::Read(IOBuffer* buf, 632 int SSLClientSocketOpenSSL::Read(IOBuffer* buf,
628 int buf_len, 633 int buf_len,
629 const CompletionCallback& callback) { 634 const CompletionCallback& callback) {
630 user_read_buf_ = buf; 635 user_read_buf_ = buf;
631 user_read_buf_len_ = buf_len; 636 user_read_buf_len_ = buf_len;
632 637
633 int rv = DoReadLoop(); 638 int rv = DoReadLoop();
634 639
635 if (rv == ERR_IO_PENDING) { 640 if (rv == ERR_IO_PENDING) {
636 user_read_callback_ = callback; 641 user_read_callback_ = callback;
(...skipping 1277 matching lines...) Expand 10 before | Expand all | Expand 10 after
1914 } 1919 }
1915 return false; 1920 return false;
1916 } 1921 }
1917 1922
1918 scoped_refptr<X509Certificate> 1923 scoped_refptr<X509Certificate>
1919 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const { 1924 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const {
1920 return server_cert_; 1925 return server_cert_;
1921 } 1926 }
1922 1927
1923 } // namespace net 1928 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698