Land Recent QUIC Changes.

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 <map>
@@ skipping 238 matching lines @@
 // When adding a new version to this enum you should add it to
 // kSupportedQuicVersions (if appropriate), and also add a new case to the
 // helper methods QuicVersionToQuicTag, QuicTagToQuicVersion, and
 // QuicVersionToString.
 enum QuicVersion {
   // Special case to indicate unknown/unsupported QUIC version.
   QUIC_VERSION_UNSUPPORTED = 0,
 
   QUIC_VERSION_12 = 12,
   QUIC_VERSION_13 = 13,
-  QUIC_VERSION_14 = 14,  // Current version.
+  QUIC_VERSION_14 = 14,
+  QUIC_VERSION_15 = 15,  // Current version.
 };
 
 // This vector contains QUIC versions which we currently support.
 // This should be ordered such that the highest supported version is the first
 // element, with subsequent elements in descending order (versions can be
 // skipped as necessary).
 //
 // IMPORTANT: if you are addding to this list, follow the instructions at
 // http://sites/quic/adding-and-removing-versions
-static const QuicVersion kSupportedQuicVersions[] = {QUIC_VERSION_14,
+static const QuicVersion kSupportedQuicVersions[] = {QUIC_VERSION_15,
+                                                     QUIC_VERSION_14,
                                                      QUIC_VERSION_13,
                                                      QUIC_VERSION_12};
 
 typedef std::vector<QuicVersion> QuicVersionVector;
 
 // Returns a vector of QUIC versions in kSupportedQuicVersions.
 NET_EXPORT_PRIVATE QuicVersionVector QuicSupportedVersions();
 
 // QuicTag is written to and read from the wire, but we prefer to use
 // the more readable QuicVersion at other levels.
@@ skipping 321 matching lines @@
   // sent.
   QuicTime::Delta delta_time_largest_observed;
 
   // TODO(satyamshekhar): Can be optimized using an interval set like data
   // structure.
   // The set of packets which we're expecting and have not received.
   SequenceNumberSet missing_packets;
 
   // Whether the ack had to be truncated when sent.
   bool is_truncated;
+
+  // Packets which have been revived via FEC.
+  // All of these must also be in missing_packets.
+  SequenceNumberSet revived_packets;
 };
 
 // True if the sequence number is greater than largest_observed or is listed
 // as missing.
 // Always returns false for sequence numbers less than least_unacked.
 bool NET_EXPORT_PRIVATE IsAwaitingPacket(
     const ReceivedPacketInfo& received_info,
     QuicPacketSequenceNumber sequence_number);
 
 // Inserts missing packets between [lower, higher).
@@ skipping 378 matching lines @@
   WriteStatus status;
   union {
     int bytes_written;  // only valid when status is OK
     int error_code;  // only valid when status is ERROR
   };
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_PROTOCOL_H_