summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_connection_logger.h
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 11:13:49 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 11:15:20 +0000
commit9693157b613011ae67a34bd954f87b9afe24039e (patch)
tree9c3c2af865947fe2e2766c0cb7d102c4ec8d2446 /net/quic/quic_connection_logger.h
parentf250fa5dd72b9f7368f7853a02382f0d6f971bc7 (diff)
downloadchromium_src-9693157b613011ae67a34bd954f87b9afe24039e.zip
chromium_src-9693157b613011ae67a34bd954f87b9afe24039e.tar.gz
chromium_src-9693157b613011ae67a34bd954f87b9afe24039e.tar.bz2
Land Recent QUIC Changes.
A fix to QUIC's test only SendAlgorithmSimulator to ensure it treats lost packets correctly. Merge internal change: 72754445 https://codereview.chromium.org/450043002/ Check return value of GetStringPiece for (optional) kCCRT/kCCS in QuicCryptoServerConfig. Merge internal change: 72727018 https://codereview.chromium.org/453693002/ Store client cert hashes as strings instead of StringPieces. Avoids use-after-free (detected by ASAN) when the CHLO callback deletes the CHLO request, and subsequently we try to access the stored StringPieces. Bug introduced in CL: https://codereview.chromium.org/449273002/ Merge internal change: 72724874 https://codereview.chromium.org/453663002/ Deprecate rolled out flag: FLAGS_quic_allow_port_migration. Merge internal change: 72668120 https://codereview.chromium.org/451903002/ Along with sending the SCUP message, this CL includes small fixes which allow messages to be sent on the crypto stream after handshake has completed. This includes disabling HANDSHAKE_MODE in the sent packet manager after the handshake is confirmed, and stopping processing of handshake packets once we switch to forward secure and can no longer decrypt them in crypto_test_utils. Without a version bump, out of date clients will tear down the connection if they get a SCUP message from the server. QUIC_VERSION_22. Send a new source-address token when crypto handshake completes. Merge internal change: 72652054 https://codereview.chromium.org/449273002/ Trigger internal QUIC "trace graph" trace dumping also in cases where connection termination is initiated by the server. Protected by existing debug flag. This CL adds a new OnConnectionClosed method to the ConnectionDebugVisitor interface, which is called when the connection is closed irrespective of how the connection is closed. Merge internal change: 72571464 https://codereview.chromium.org/454563002/ Close a QUIC connection if there are too many unfinished streams being tracked in the locally closed map. Protected behind FLAGS_close_quic_connection_unfinished_streams (defaults to false). Merge internal change: 72561976 https://codereview.chromium.org/448973002/ Remove unused version argument from QuicFramerTest's GetMinStreamFrameSize. Merge internal change: 72559549 https://codereview.chromium.org/447103002/ Fix typo in comment in QuicFramer. creation_time_ is the creation time of the framer, not the frames. Comment only change. Merge internal change: 72558804 https://codereview.chromium.org/444323002/ Deprecate rolled out FLAGS_enable_quic_connection_flow_control_2. Merge internal change: 72345333 https://codereview.chromium.org/444313002/ R=rch@chromium.org Review URL: https://codereview.chromium.org/448313003 Cr-Commit-Position: refs/heads/master@{#288331} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288331 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_connection_logger.h')
-rw-r--r--net/quic/quic_connection_logger.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/quic/quic_connection_logger.h b/net/quic/quic_connection_logger.h
index d020a61..bbb87e0 100644
--- a/net/quic/quic_connection_logger.h
+++ b/net/quic/quic_connection_logger.h
@@ -62,12 +62,12 @@ class NET_EXPORT_PRIVATE QuicConnectionLogger
const QuicVersionNegotiationPacket& packet) OVERRIDE;
virtual void OnRevivedPacket(const QuicPacketHeader& revived_header,
base::StringPiece payload) OVERRIDE;
+ virtual void OnConnectionClosed(QuicErrorCode error, bool from_peer) OVERRIDE;
void OnCryptoHandshakeMessageReceived(
const CryptoHandshakeMessage& message);
void OnCryptoHandshakeMessageSent(
const CryptoHandshakeMessage& message);
- void OnConnectionClosed(QuicErrorCode error, bool from_peer);
void OnSuccessfulVersionNegotiation(const QuicVersion& version);
void UpdateReceivedFrameCounts(QuicStreamId stream_id,
int num_frames_received,