summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_client_session_base.h
diff options
context:
space:
mode:
authorrtenneti <rtenneti@chromium.org>2014-11-06 16:43:58 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-07 00:44:22 +0000
commit4a5df26254eacfd5212ec63c86b69dd5acb9d726 (patch)
treec0f265ee8c4ec5c0fa0b3ee3a081b240fcbed235 /net/quic/quic_client_session_base.h
parentd273d07cf46444c62fcc9b6242b4c82d8203a9b8 (diff)
downloadchromium_src-4a5df26254eacfd5212ec63c86b69dd5acb9d726.zip
chromium_src-4a5df26254eacfd5212ec63c86b69dd5acb9d726.tar.gz
chromium_src-4a5df26254eacfd5212ec63c86b69dd5acb9d726.tar.bz2
Land Recent QUIC Changes.
Add is_secure_ field to QuicSession. This is preparation for setting different CWND, server side, for secure vs insecure. Merge internal change: 79338358 https://codereview.chromium.org/706043003/ Change the BBRTcpSender and TCPCubicSender to return QuicBandwidth::Zero when there are no rtt samples. Also changes HasReliableBandwidthEstimate to ensure the relevant rtt measurements are initialized. Merge internal change: 79284883 https://codereview.chromium.org/708833002/ Remove unused constructor in QuicTestClient Merge internal change: 79279394 https://codereview.chromium.org/697053007/ Remove QUIC's RttStats SmoothedRtt in favor of smoothed_rtt() and checking for zero in cases when a non-zero value is required. Merge internal change: 79219848 https://codereview.chromium.org/706953002/ Fix QUIC end_to_end_test flakiness introduced by "Merge internal change: 78946498" Should affect tests only. "Merge internal change: 789464989 introduced some new tests for the "Small Red Button", a flag that, when enabled, forces QUIC to disconnect all active sessions and start rejecting traffic. Problem: The new change made the end_to_end tests extremely flaky. Many tests for the new flag would check conditions on the client after the flag had been enabled. When the flag change itself took time on the server, the client would check the conditions too prematurely, and the test would fail. In addition, one test checked that a connection ID on the time-wait list remained so after some actions had taken place. The time-wait list timeout is configured to 5 seconds, by default. Sometimes the connection ID would still be on the list, and sometimes not, depending on the timing of the test. Solution: - Made the timeout on the time-wait list configurable via flag, so that it can be controlled by the tests. - One internal test now configures the time-wait list timeout to be essentially infinite. Merge internal change: 79217544 https://codereview.chromium.org/708443004/ Remove setting of initial CWND in quic_server. The comment is wrong - this isn't setting flow control stuff at all, and we don't need to send an initial CWND as the client will use the default. Merge internal change: 79189335 https://codereview.chromium.org/697053006/ Remove redundant initial congestion window constant in QUIC. Merge internal change: 79186360 https://codereview.chromium.org/704133004/ Rename QUIC RST code QUIC_RST_FLOW_CONTROL_ACCOUNTING to QUIC_RST_ACKNOWLEDGEMENT. No behavior change. Merge internal change: 79177755 https://codereview.chromium.org/709503002/ Restore QUIC's RttStats min_rtt() and remove MinRtt. Merge internal change: 79173178 https://codereview.chromium.org/703223002/ Remove deprecated flag FLAGS_quic_timeouts_only_from_alarms. Merge internal change: 79110291 https://codereview.chromium.org/704303003/ Simplify the mechanism for converting the QUIC congestion window from bytes to number of packets or to "number of TCP MSSs". Adds GetCongestionWindowInTcpMss() and EstimateMaxPacketsInFlight() methods to QuicSentPacketManager. Removes congestion_window and slowstart_threshold fields from QuicConnectionStats. Merge internal change: 79090805 https://codereview.chromium.org/706933003/ R=rch@chromium.org Review URL: https://codereview.chromium.org/703263003 Cr-Commit-Position: refs/heads/master@{#303134}
Diffstat (limited to 'net/quic/quic_client_session_base.h')
-rw-r--r--net/quic/quic_client_session_base.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/quic/quic_client_session_base.h b/net/quic/quic_client_session_base.h
index d72996c..a7f64fb 100644
--- a/net/quic/quic_client_session_base.h
+++ b/net/quic/quic_client_session_base.h
@@ -14,7 +14,8 @@ namespace net {
class NET_EXPORT_PRIVATE QuicClientSessionBase : public QuicSession {
public:
QuicClientSessionBase(QuicConnection* connection,
- const QuicConfig& config);
+ const QuicConfig& config,
+ bool is_secure);
~QuicClientSessionBase() override;