diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-27 03:40:44 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-27 03:40:44 +0000 |
| commit | 2cfc6bb8891f4eaac2146c97fe562ca698a9883c (patch) | |
| tree | 064ab3652329edc1a33845aa58c0aef2f8322a7b /net/quic/quic_session.cc | |
| parent | a9f5730af67a9838ea3e68efa5beb54f861f02cb (diff) | |
| download | chromium_src-2cfc6bb8891f4eaac2146c97fe562ca698a9883c.zip chromium_src-2cfc6bb8891f4eaac2146c97fe562ca698a9883c.tar.gz chromium_src-2cfc6bb8891f4eaac2146c97fe562ca698a9883c.tar.bz2 | |
Land Recent QUIC changes.
Rename ambiquious ConnectionClose method to OnConnectionClosed.
Merge internal change: 54774694
Change TCP cubic's max packet size used to calculate the initial and
subsequent congestion window in bytes to the default of 1460 from QUIC's
artificially low 1200.
Merge internal change: 54772582
QUIC: make the SCID a hash of the rest of the server config.
We need to ensure that the SCID changes whenever the rest of the server
config does. For example, cl/54004815 changed the server config, but not
the SCID. This could lead to bad 0-RTT handshakes where the server
believes the handshake is good, but will derive different keys than the
client.
The easiest change to ensure that the SCID is changed is to make it a
hash of the rest of the message.
Merge internal change: 54659325
EndToEndTest to fix TSAN.
Merge internal change: 54090381
Don't add a zero-length public key to kPUBS if P-256 support is
disabled. kKEXS and kPUBS should have the same number of elements.
Merge internal change: 54004815
Make the QuicConnectionHelper no longer owned by the QuicConnection.
Instead a single helper is owned by the Dispatcher or Client, and shared
among each Connection.
Merge internal change: 53974968
R=rch@chromium.org
Review URL: https://codereview.chromium.org/45733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_session.cc')
| -rw-r--r-- | net/quic/quic_session.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc index 9389af4..4a487d2 100644 --- a/net/quic/quic_session.cc +++ b/net/quic/quic_session.cc @@ -59,8 +59,9 @@ class VisitorShim : public QuicConnectionVisitorInterface { session_->OnSuccessfulVersionNegotiation(version); } - virtual void ConnectionClose(QuicErrorCode error, bool from_peer) OVERRIDE { - session_->ConnectionClose(error, from_peer); + virtual void OnConnectionClosed(QuicErrorCode error, + bool from_peer) OVERRIDE { + session_->OnConnectionClosed(error, from_peer); // The session will go away, so don't bother with cleanup. } @@ -183,7 +184,7 @@ void QuicSession::OnGoAway(const QuicGoAwayFrame& frame) { goaway_received_ = true; } -void QuicSession::ConnectionClose(QuicErrorCode error, bool from_peer) { +void QuicSession::OnConnectionClosed(QuicErrorCode error, bool from_peer) { DCHECK(!connection_->connected()); if (error_ == QUIC_NO_ERROR) { error_ = error; @@ -192,10 +193,11 @@ void QuicSession::ConnectionClose(QuicErrorCode error, bool from_peer) { while (stream_map_.size() != 0) { ReliableStreamMap::iterator it = stream_map_.begin(); QuicStreamId id = it->first; - it->second->ConnectionClose(error, from_peer); - // The stream should call CloseStream as part of ConnectionClose. + it->second->OnConnectionClosed(error, from_peer); + // The stream should call CloseStream as part of OnConnectionClosed. if (stream_map_.find(id) != stream_map_.end()) { - LOG(DFATAL) << ENDPOINT << "Stream failed to close under ConnectionClose"; + LOG(DFATAL) << ENDPOINT + << "Stream failed to close under OnConnectionClosed"; CloseStream(id); } } |