Land Recent QUIC Changes until 03/15/2015.

net/quic/quic_protocol.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_QUIC_PROTOCOL_H_
 #define NET_QUIC_QUIC_PROTOCOL_H_
 
 #include <stddef.h>
 #include <limits>
 #include <list>
@@ skipping 51 matching lines @@
 const QuicByteCount kDefaultTCPMSS = 1460;
 
 // We match SPDY's use of 32 when secure (since we'd compete with SPDY).
 const QuicPacketCount kInitialCongestionWindowSecure = 32;
 // Be conservative, and just use double a typical TCP ICWND for HTTP.
 const QuicPacketCount kInitialCongestionWindowInsecure = 20;
 
 // Minimum size of initial flow control window, for both stream and session.
 const uint32 kMinimumFlowControlSendWindow = 16 * 1024;  // 16 KB
 
-// Minimum and maximum size of the CWND, in packets,
-// when doing bandwidth resumption.
+// Minimum size of the CWND, in packets, when doing bandwidth resumption.
 const QuicPacketCount kMinCongestionWindowForBandwidthResumption = 10;
-const QuicPacketCount kMaxCongestionWindowForBandwidthResumption = 200;
 
-// Maximum number of tracked packets before the connection will be closed.
-// This effectively limits the max CWND to a smaller value than this.
-const QuicPacketCount kMaxTrackedPackets = 5000;
+// Maximum size of the CWND, in packets, for TCP congestion control algorithms.
+const QuicPacketCount kMaxTcpCongestionWindow = 200;
 
 // Default size of the socket receive buffer in bytes.
 const QuicByteCount kDefaultSocketReceiveBuffer = 256 * 1024;
 // Minimum size of the socket receive buffer in bytes.
 // Smaller values are ignored.
 const QuicByteCount kMinSocketReceiveBuffer = 16 * 1024;
 
 // Don't allow a client to suggest an RTT shorter than 10ms.
 const uint32 kMinInitialRoundTripTimeUs = 10 * kNumMicrosPerMilli;
 
@@ skipping 658 matching lines @@
     QuicAckFrame* ack_frame,
     QuicPacketSequenceNumber lower,
     QuicPacketSequenceNumber higher);
 
 // Defines for all types of congestion control algorithms that can be used in
 // QUIC. Note that this is separate from the congestion feedback type -
 // some congestion control algorithms may use the same feedback type
 // (Reno and Cubic are the classic example for that).
 enum CongestionControlType {
   kCubic,
+  kCubicBytes,
   kReno,
+  kRenoBytes,
   kBBR,
 };
 
 enum LossDetectionType {
   kNack,  // Used to mimic TCP's loss detection.
   kTime,  // Time based loss detection.
 };
 
 struct NET_EXPORT_PRIVATE QuicRstStreamFrame {
   QuicRstStreamFrame();
@@ skipping 279 matching lines @@
   bool in_flight;
   // True if the packet can never be acked, so it can be removed.
   bool is_unackable;
   // True if the packet is an FEC packet.
   bool is_fec_packet;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PROTOCOL_H_