summaryrefslogtreecommitdiffstats
path: root/net/quic/quic_protocol.h
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-15 21:38:46 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-15 21:38:46 +0000
commitc519295e83ab20eb42e58e40f28493df43d3d1c4 (patch)
tree7552eb2c91d2af49831d1a4550ced17af25985bf /net/quic/quic_protocol.h
parent016af54060c480dd1473e10f86bbf67f1fce85de (diff)
downloadchromium_src-c519295e83ab20eb42e58e40f28493df43d3d1c4.zip
chromium_src-c519295e83ab20eb42e58e40f28493df43d3d1c4.tar.gz
chromium_src-c519295e83ab20eb42e58e40f28493df43d3d1c4.tar.bz2
Landing Recent QUIC Changes.
Change how QUIC negotiates pacing from congestion feedback to QUIC connection option. Merge internal change: 73061068 https://codereview.chromium.org/471613002/ Add max_bandwidth and max_bandwidth_timestamp to QUIC source address token. Merge internal change: 73055131 https://codereview.chromium.org/463093003/ Don't print (SCUP) in log message, the DebugString that follows contains this already. Merge internal change: 73054570 https://codereview.chromium.org/464893003/ Do not support Quic timestamp feedback type in the framer. Merge internal change: 72905602 https://codereview.chromium.org/467893002/ Change QUIC's delayed ack timer from 100ms to 25ms. Rationale: This delay kicks in when the receiver is waiting for a second data packet before sending an ack, and 100ms seems inordinately long for this wait. The timer fires per-packet in low-bandwidth network paths (BW < ~384 kbps), where more frequent acks helps with (i) ack clocking, and (ii) better bw estimation for BBR. Merge internal change: 72788368 https://codereview.chromium.org/461183002/ QUIC - clean up changes to keep in sync with internal source tree. https://codereview.chromium.org/454263002/ R=rch@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/471293002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/quic_protocol.h')
-rw-r--r--net/quic/quic_protocol.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index d91b55f..6b29331 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -70,7 +70,7 @@ const uint32 kDefaultFlowControlSendWindow = 16 * 1024; // 16 KB
const size_t kMaxTcpCongestionWindow = 200;
// Size of the socket receive buffer in bytes.
-const QuicByteCount kDefaultSocketReceiveBuffer = 256000;
+const QuicByteCount kDefaultSocketReceiveBuffer = 256 * 1024;
// Don't allow a client to suggest an RTT longer than 15 seconds.
const uint32 kMaxInitialRoundTripTimeUs = 15 * kNumMicrosPerSecond;
@@ -104,6 +104,9 @@ const QuicStreamId kCryptoStreamId = 1;
// Reserved ID for the headers stream.
const QuicStreamId kHeadersStreamId = 3;
+// Maximum delayed ack time, in ms.
+const int kMaxDelayedAckTime = 25;
+
// This is the default network timeout a for connection till the crypto
// handshake succeeds and the negotiated timeout from the handshake is received.
const int64 kDefaultInitialTimeoutSecs = 120; // 2 mins.