Chromium Code Reviews| Index: net/quic/quic_client_session.cc |
| diff --git a/net/quic/quic_client_session.cc b/net/quic/quic_client_session.cc |
| index 5e1e80f6911d9638a762af842a4aae75fb547f89..e925448bcad83dca3fe37e35cac7e26f86b5a0b1 100644 |
| --- a/net/quic/quic_client_session.cc |
| +++ b/net/quic/quic_client_session.cc |
| @@ -55,8 +55,8 @@ QuicClientSession::~QuicClientSession() { |
| } |
| QuicReliableClientStream* QuicClientSession::CreateOutgoingReliableStream() { |
| - if (!crypto_stream_->handshake_complete()) { |
| - DLOG(INFO) << "Crypto handshake not complete, no outgoing stream created."; |
| + if (!crypto_stream_->encryption_established()) { |
| + DLOG(INFO) << "Encryption not active so no outgoing stream created."; |
| return NULL; |
| } |
| if (GetNumOpenStreams() >= get_max_open_streams()) { |
| @@ -87,7 +87,7 @@ int QuicClientSession::CryptoConnect(const CompletionCallback& callback) { |
| return ERR_CONNECTION_FAILED; |
| } |
| - if (IsCryptoHandshakeComplete()) { |
| + if (IsCryptoHandshakeConfirmed()) { |
| return OK; |
| } |
| @@ -109,9 +109,10 @@ void QuicClientSession::CloseStream(QuicStreamId stream_id) { |
| } |
| } |
| -void QuicClientSession::OnCryptoHandshakeComplete(QuicErrorCode error) { |
| +void QuicClientSession::OnCryptoHandshakeEvent(CryptoHandshakeEvent event) { |
| if (!callback_.is_null()) { |
| - callback_.Run(error == QUIC_NO_ERROR ? OK : ERR_UNEXPECTED); |
| + // TODO(rtenneti): how should we handle ENCRYPTION_FIRST_ESTABLISHED event? |
|
wtc
2013/04/25 00:39:19
I don't understand this TODO comment. Could you el
Ryan Hamilton
2013/04/25 17:59:45
I believe we should handle this even by executing
ramant (doing other things)
2013/04/26 19:29:54
Will upload a separate CL for unit test of 0RTT.
D
|
| + callback_.Run(event == ENCRYPTION_REESTABLISHED ? ERR_UNEXPECTED : OK); |
| } |
| } |