Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/quic/quic_stream_sequencer_buffer.cc

 // Copyright (c) 2015 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/quic_stream_sequencer_buffer.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_bug_tracker.h"
 
@@ skipping 88 matching lines @@
       offset + size <= current_gap->begin_offset) {
     DVLOG(1) << "Duplicated data at offset: " << offset << " length: " << size;
     return QUIC_NO_ERROR;
   }
   if (offset < current_gap->begin_offset &&
       offset + size > current_gap->begin_offset) {
     // Beginning of new data overlaps data before current gap.
     *error_details =
         string("Beginning of received data overlaps with buffered data.\n") +
         "New frame range " + RangeDebugString(offset, offset + size) +
-        "\n"
-        "Currently received frames: " +
-        ReceivedFramesDebugString() +
-        "\n"
-        "Current gaps: " +
-        GapsDebugString() + "\n";
+        " with first 128 bytes: " +
+        string(data.data(), data.length() < 128 ? data.length() : 128) +
+        "\nCurrently received frames: " + ReceivedFramesDebugString() +
+        "\nCurrent gaps: " + GapsDebugString();
     return QUIC_OVERLAPPING_STREAM_DATA;
   }
   if (offset + size > current_gap->end_offset) {
     // End of new data overlaps with data after current gap.
     *error_details =
-        "End of received data overlaps with buffered data.\n"
-        "New frame range " +
-        RangeDebugString(offset, offset + size) +
-        "\n"
-        "Currently received frames: " +
-        ReceivedFramesDebugString() +
-        "\n"
-        "Current gaps: " +
-        GapsDebugString() + "\n";
+        string("End of received data overlaps with buffered data.\n") +
+        "New frame range " + RangeDebugString(offset, offset + size) +
+        " with first 128 bytes: " +
+        string(data.data(), data.length() < 128 ? data.length() : 128) +
+        "\nCurrently received frames: " + ReceivedFramesDebugString() +
+        "\nCurrent gaps: " + GapsDebugString();
     return QUIC_OVERLAPPING_STREAM_DATA;
   }
 
   // Write beyond the current range this buffer is covering.
   if (offset + size > total_bytes_read_ + max_buffer_capacity_bytes_) {
     *error_details = "Received data beyond available range.";
     return QUIC_INTERNAL_ERROR;
   }
 
   size_t total_written = 0;
@@ skipping 362 matching lines @@
     QuicStreamOffset current_frame_begin_offset = it.first;
     QuicStreamOffset current_frame_end_offset =
         it.second.length + current_frame_begin_offset;
     current_frames_string +=
         RangeDebugString(current_frame_begin_offset, current_frame_end_offset);
   }
   return current_frames_string;
 }
 
 }  //  namespace net