Landing Recent QUIC changes until Thu Mar 16 17:24:53 2017 +0000

net/quic/core/quic_data_reader.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_data_reader.h"
 
 #include "net/base/int128.h"
+#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_packets.h"
+#include "net/quic/platform/api/quic_endian.h"
 
 namespace net {
 
 QuicDataReader::QuicDataReader(const char* data, const size_t len)
     : data_(data), len_(len), pos_(0) {}
 
 bool QuicDataReader::ReadUInt16(uint16_t* result) {
   return ReadBytes(result, sizeof(*result));
 }
 
@@ skipping 58 matching lines @@
 
   // Set result.
   *result = QuicStringPiece(data_ + pos_, size);
 
   // Iterate.
   pos_ += size;
 
   return true;
 }
 
+bool QuicDataReader::ReadConnectionId(uint64_t* connection_id) {
+  if (!ReadUInt64(connection_id)) {
+    return false;
+  }
+
+  if (FLAGS_quic_restart_flag_quic_big_endian_connection_id) {
+    *connection_id = QuicEndian::NetToHost64(*connection_id);
+  }
+
+  return true;
+}
+
 QuicStringPiece QuicDataReader::ReadRemainingPayload() {
   QuicStringPiece payload = PeekRemainingPayload();
   pos_ = len_;
   return payload;
 }
 
 QuicStringPiece QuicDataReader::PeekRemainingPayload() {
   return QuicStringPiece(data_ + pos_, len_ - pos_);
 }
 
@@ skipping 25 matching lines @@
   return bytes <= (len_ - pos_);
 }
 
 void QuicDataReader::OnFailure() {
   // Set our iterator to the end of the buffer so that further reads fail
   // immediately.
   pos_ = len_;
 }
 
 }  // namespace net