diff options
| author | rtenneti <rtenneti@chromium.org> | 2014-09-29 11:16:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 18:16:47 +0000 |
| commit | a4dcff92312b99670e9a19657f881b00a0404e69 (patch) | |
| tree | 6c24c55b4edd2ca7e5fa75de131111b64651e21e /net/tools | |
| parent | 608e1a19df52b2c50015ace4fccbea0a3a4173cd (diff) | |
| download | chromium_src-a4dcff92312b99670e9a19657f881b00a0404e69.zip chromium_src-a4dcff92312b99670e9a19657f881b00a0404e69.tar.gz chromium_src-a4dcff92312b99670e9a19657f881b00a0404e69.tar.bz2 | |
Land Recent QUIC Changes.
Remove loss detection from QuicConfig now that connection options has
replaced it.
Merge internal change: 75952172
Chromium specific changes:
+ Deleted enable_quic_time_based_loss_detection from
NetworkSession params.
+ Deleted enable-quic-time-based-loss-detection and
disable-quic-time-based-loss-detection command line
switches.
https://codereview.chromium.org/591323003/
Do not timeout QUIC connections when settings the timeouts from
InitializeSession(). Protected by FLAG_quic_timeouts_only_from_alarms
Removes FLAG_quic_timeouts_require_activity which was somewhat broken.
Merge internal change: 75927669
https://codereview.chromium.org/605903002/
Factor out the QUIC timeout alarm setting logic from the CheckForTimeout
method into a new SetTimeout method.
- no behavior change, simply moving QUIC timeout alarm code.
Merge internal change: 75915264
https://codereview.chromium.org/593193005/
Add a timestamp field to QUIC's CachedNetworkParams proto message.
Context in b/17357338, follow-up CL will store CachedNetworkParams and
copy into newly created STKs.
Merge internal change: 75897792
https://codereview.chromium.org/604173002/
Call QuicSentPacketManager's OnPacketSent method and make
OnRetransmittedPacket and OnSerializedPacket private.
Merge internal change: 75830237
https://codereview.chromium.org/593193004/
Change the return type of QuicConnection::CheckForTimeout from bool to
void since it is unused.
Merge internal change: 75724127
https://codereview.chromium.org/604163002/
Test-only. Remove calls to OnSerializedPacket from
QuicSentPacketManagerTest, in preparation for OnSerializedPacket to be
removed.
Merge internal change: 75716236
https://codereview.chromium.org/600823006/
R=rch@chromium.org, sky@chromium.org
Added sky@ for OWNERS approval for chrome/browser and chrome/common
changes
Review URL: https://codereview.chromium.org/605733006
Cr-Commit-Position: refs/heads/master@{#297208}
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/quic/quic_server_session.cc | 2 | ||||
| -rw-r--r-- | net/tools/quic/quic_server_session_test.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc index 64ac110..e2245ae 100644 --- a/net/tools/quic/quic_server_session.cc +++ b/net/tools/quic/quic_server_session.cc @@ -128,6 +128,8 @@ void QuicServerSession::OnCongestionWindowChange(QuicTime now) { bandwidth_recorder.EstimateRecordedDuringSlowStart() ? CachedNetworkParameters::SLOW_START : CachedNetworkParameters::CONGESTION_AVOIDANCE); + cached_network_params.set_timestamp( + connection()->clock()->WallNow().ToUNIXSeconds()); if (!serving_region_.empty()) { cached_network_params.set_serving_region(serving_region_); } diff --git a/net/tools/quic/quic_server_session_test.cc b/net/tools/quic/quic_server_session_test.cc index 887c0b1..a2e55cb 100644 --- a/net/tools/quic/quic_server_session_test.cc +++ b/net/tools/quic/quic_server_session_test.cc @@ -352,6 +352,8 @@ TEST_P(QuicServerSessionTest, BandwidthEstimates) { .ToMilliseconds()); expected_network_params.set_previous_connection_state( CachedNetworkParameters::CONGESTION_AVOIDANCE); + expected_network_params.set_timestamp( + session_->connection()->clock()->WallNow().ToUNIXSeconds()); expected_network_params.set_serving_region(serving_region); EXPECT_CALL(*crypto_stream, |