Landing Recent QUIC changes until Sun Apr 9 16:12:55

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/core/quic_utils.h"
+#include "net/quic/platform/api/quic_bug_tracker.h"
 #include "net/quic/platform/api/quic_endian.h"
 #include "net/quic/platform/api/quic_logging.h"
 
 namespace net {
 
 #define ENDPOINT \
   (perspective_ == Perspective::IS_SERVER ? "Server: " : "Client: ")
 
 QuicDataReader::QuicDataReader(const char* data,
                                const size_t len,
@@ skipping 72 matching lines @@
   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) {
+  if (QuicUtils::IsConnectionIdWireFormatBigEndian(perspective_)) {
     *connection_id = QuicEndian::NetToHost64(*connection_id);
   }
 
   return true;
 }
 
 bool QuicDataReader::ReadTag(uint32_t* tag) {
   return ReadBytes(tag, sizeof(*tag));
 }
 
@@ skipping 34 matching lines @@
 bool QuicDataReader::CanRead(size_t bytes) const {
   return bytes <= (len_ - pos_);
 }
 
 void QuicDataReader::OnFailure() {
   // Set our iterator to the end of the buffer so that further reads fail
   // immediately.
   pos_ = len_;
 }
 
+uint8_t QuicDataReader::PeekByte() const {
+  if (pos_ >= len_) {
+    QUIC_BUG << "Reading is done, cannot peek next byte. Tried to read pos = "
+             << pos_ << " buffer length = " << len_;
+    return 0;
+  }
+  return data_[pos_];
+}
+
 }  // namespace net