Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_protocol.cc

 // 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.
 
 #include "net/quic/core/quic_protocol.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_utils.h"
@@ skipping 153 matching lines @@
 uint32_t MakeQuicTag(char a, char b, char c, char d) {
   return static_cast<uint32_t>(a) | static_cast<uint32_t>(b) << 8 |
          static_cast<uint32_t>(c) << 16 | static_cast<uint32_t>(d) << 24;
 }
 
 bool ContainsQuicTag(const QuicTagVector& tag_vector, QuicTag tag) {
   return std::find(tag_vector.begin(), tag_vector.end(), tag) !=
          tag_vector.end();
 }
 
-QuicVersionVector QuicSupportedVersions() {
+QuicVersionVector AllSupportedVersions() {
   QuicVersionVector supported_versions;
   for (size_t i = 0; i < arraysize(kSupportedQuicVersions); ++i) {
     supported_versions.push_back(kSupportedQuicVersions[i]);
   }
   return supported_versions;
 }
 
+QuicVersionVector CurrentSupportedVersions() {
+  return FilterSupportedVersions(AllSupportedVersions());
+}
+
 QuicVersionVector FilterSupportedVersions(QuicVersionVector versions) {
   QuicVersionVector filtered_versions(versions.size());
   filtered_versions.clear();  // Guaranteed by spec not to change capacity.
   for (QuicVersion version : versions) {
     if (version == QUIC_VERSION_35) {
       if (FLAGS_quic_enable_version_35) {
         filtered_versions.push_back(version);
       }
     } else if (version == QUIC_VERSION_36) {
-      if (FLAGS_quic_enable_version_35 && FLAGS_quic_enable_version_36) {
+      if (FLAGS_quic_enable_version_35 && FLAGS_quic_enable_version_36_v2) {
         filtered_versions.push_back(version);
       }
     } else {
       filtered_versions.push_back(version);
     }
   }
   return filtered_versions;
 }
 
+QuicVersionVector VersionOfIndex(const QuicVersionVector& versions, int index) {
+  QuicVersionVector version;
+  int version_count = versions.size();
+  if (index >= 0 && index < version_count) {
+    version.push_back(versions[index]);
+  } else {
+    version.push_back(QUIC_VERSION_UNSUPPORTED);
+  }
+  return version;
+}
+
 QuicTag QuicVersionToQuicTag(const QuicVersion version) {
   switch (version) {
     case QUIC_VERSION_30:
       return MakeQuicTag('Q', '0', '3', '0');
     case QUIC_VERSION_31:
       return MakeQuicTag('Q', '0', '3', '1');
     case QUIC_VERSION_32:
       return MakeQuicTag('Q', '0', '3', '2');
     case QUIC_VERSION_33:
       return MakeQuicTag('Q', '0', '3', '3');
@@ skipping 509 matching lines @@
 QuicGoAwayFrame::QuicGoAwayFrame(QuicErrorCode error_code,
                                  QuicStreamId last_good_stream_id,
                                  const string& reason)
     : error_code(error_code),
       last_good_stream_id(last_good_stream_id),
       reason_phrase(reason) {}
 
 QuicData::QuicData(const char* buffer, size_t length)
     : buffer_(buffer), length_(length), owns_buffer_(false) {}
 
-QuicData::QuicData(char* buffer, size_t length, bool owns_buffer)
+QuicData::QuicData(const char* buffer, size_t length, bool owns_buffer)
     : buffer_(buffer), length_(length), owns_buffer_(owns_buffer) {}
 
 QuicData::~QuicData() {
   if (owns_buffer_) {
     delete[] const_cast<char*>(buffer_);
   }
 }
 
 QuicWindowUpdateFrame::QuicWindowUpdateFrame(QuicStreamId stream_id,
                                              QuicStreamOffset byte_offset)
@@ skipping 16 matching lines @@
       buffer_(buffer),
       connection_id_length_(connection_id_length),
       includes_version_(includes_version),
       includes_path_id_(includes_path_id),
       includes_diversification_nonce_(includes_diversification_nonce),
       packet_number_length_(packet_number_length) {}
 
 QuicEncryptedPacket::QuicEncryptedPacket(const char* buffer, size_t length)
     : QuicData(buffer, length) {}
 
-QuicEncryptedPacket::QuicEncryptedPacket(char* buffer,
+QuicEncryptedPacket::QuicEncryptedPacket(const char* buffer,
                                          size_t length,
                                          bool owns_buffer)
     : QuicData(buffer, length, owns_buffer) {}
 
 QuicEncryptedPacket* QuicEncryptedPacket::Clone() const {
   char* buffer = new char[this->length()];
   memcpy(buffer, this->data(), this->length());
   return new QuicEncryptedPacket(buffer, this->length(), true);
 }
 
 ostream& operator<<(ostream& os, const QuicEncryptedPacket& s) {
   os << s.length() << "-byte data";
   return os;
 }
 
 QuicReceivedPacket::QuicReceivedPacket(const char* buffer,
                                        size_t length,
                                        QuicTime receipt_time)
-    : QuicEncryptedPacket(buffer, length), receipt_time_(receipt_time) {}
+    : QuicEncryptedPacket(buffer, length),
+      receipt_time_(receipt_time),
+      ttl_(0) {}
 
-QuicReceivedPacket::QuicReceivedPacket(char* buffer,
+QuicReceivedPacket::QuicReceivedPacket(const char* buffer,
                                        size_t length,
                                        QuicTime receipt_time,
                                        bool owns_buffer)
     : QuicEncryptedPacket(buffer, length, owns_buffer),
-      receipt_time_(receipt_time) {}
+      receipt_time_(receipt_time),
+      ttl_(0) {}
+
+QuicReceivedPacket::QuicReceivedPacket(const char* buffer,
+                                       size_t length,
+                                       QuicTime receipt_time,
+                                       bool owns_buffer,
+                                       int ttl,
+                                       bool ttl_valid)
+    : QuicEncryptedPacket(buffer, length, owns_buffer),
+      receipt_time_(receipt_time),
+      ttl_(ttl_valid ? ttl : -1) {}
 
 QuicReceivedPacket* QuicReceivedPacket::Clone() const {
   char* buffer = new char[this->length()];
   memcpy(buffer, this->data(), this->length());
-  return new QuicReceivedPacket(buffer, this->length(), receipt_time(), true);
+  return new QuicReceivedPacket(buffer, this->length(), receipt_time(), true,
+                                ttl(), ttl() >= 0);
 }
 
 ostream& operator<<(ostream& os, const QuicReceivedPacket& s) {
   os << s.length() << "-byte data";
   return os;
 }
 
 StringPiece QuicPacket::AssociatedData(QuicVersion version) const {
   return StringPiece(
       data(), GetStartOfEncryptedData(version, connection_id_length_,
                                       includes_version_, includes_path_id_,
                                       includes_diversification_nonce_,
                                       packet_number_length_));
 }
 
 StringPiece QuicPacket::Plaintext(QuicVersion version) const {
   const size_t start_of_encrypted_data = GetStartOfEncryptedData(
       version, connection_id_length_, includes_version_, includes_path_id_,
       includes_diversification_nonce_, packet_number_length_);
   return StringPiece(data() + start_of_encrypted_data,
                      length() - start_of_encrypted_data);
 }
 
-QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions) {
-  enable_quic_version_35_ = FLAGS_quic_enable_version_35;
-  enable_quic_version_36_ = FLAGS_quic_enable_version_36;
-  allowed_supported_versions_ = supported_versions;
-  filtered_supported_versions_ = FilterSupportedVersions(supported_versions);
-}
+QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions)
+    : enable_quic_version_35_(FLAGS_quic_enable_version_35),
+      enable_quic_version_36_(FLAGS_quic_enable_version_36_v2),
+      allowed_supported_versions_(supported_versions),
+      filtered_supported_versions_(
+          FilterSupportedVersions(supported_versions)) {}
 
 const QuicVersionVector& QuicVersionManager::GetSupportedVersions() {
   if (enable_quic_version_35_ != FLAGS_quic_enable_version_35 ||
-      enable_quic_version_36_ != FLAGS_quic_enable_version_36) {
+      enable_quic_version_36_ != FLAGS_quic_enable_version_36_v2) {
     enable_quic_version_35_ = FLAGS_quic_enable_version_35;
-    enable_quic_version_36_ = FLAGS_quic_enable_version_36;
+    enable_quic_version_36_ = FLAGS_quic_enable_version_36_v2;
     filtered_supported_versions_ =
         FilterSupportedVersions(allowed_supported_versions_);
   }
   return filtered_supported_versions_;
 }
 
 QuicVersionManager::~QuicVersionManager() {}
 
 AckListenerWrapper::AckListenerWrapper(QuicAckListenerInterface* listener,
                                        QuicPacketLength data_length)
@@ skipping 61 matching lines @@
       is_unackable(false),
       has_crypto_handshake(has_crypto_handshake),
       num_padding_bytes(num_padding_bytes),
       retransmission(0) {}
 
 TransmissionInfo::TransmissionInfo(const TransmissionInfo& other) = default;
 
 TransmissionInfo::~TransmissionInfo() {}
 
 }  // namespace net