commit 7eb51a742ee7b30799a2ecbebaf1336e919f3107
author renjietang <renjietang@google.com> Mon Jan 06 10:45:43 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Jan 06 10:46:20 2020 -0800
tree 16797cb34eb500f1d966947bd6ff5da9e3b1a405
parent c97eba6776c58a8ecbd2855734bcce52e5666d2a

gfe-relnote: deprecate gfe2_reloadable_flag_quic_close_connection_and_discard_data_on_wrong_offset

PiperOrigin-RevId: 288330466
Change-Id: I6ad17ca9127e9e2da2c925d128db719dce11fc53

quic/core/quic_stream_sequencer.cc

diff --git a/quic/core/quic_stream_sequencer.cc b/quic/core/quic_stream_sequencer.cc
index 845803d..f5849f6 100644
--- a/quic/core/quic_stream_sequencer.cc
+++ b/quic/core/quic_stream_sequencer.cc
@@ -33,9 +33,7 @@
       num_frames_received_(0),
       num_duplicate_frames_received_(0),
       ignore_read_data_(false),
-      level_triggered_(false),
-      close_connection_and_discard_data_on_wrong_offset_(GetQuicReloadableFlag(
-          quic_close_connection_and_discard_data_on_wrong_offset)) {}
+      level_triggered_(false) {}
 
 QuicStreamSequencer::~QuicStreamSequencer() {}
 
@@ -50,12 +48,8 @@
     if (data_len == 0) {
       return;
     }
-    if (close_connection_and_discard_data_on_wrong_offset_) {
-      QUIC_RELOADABLE_FLAG_COUNT_N(
-          quic_close_connection_and_discard_data_on_wrong_offset, 1, 3);
-      if (!should_process_data) {
-        return;
-      }
+    if (!should_process_data) {
+      return;
     }
   }
   OnFrameData(byte_offset, data_len, frame.data_buffer);
@@ -126,12 +120,6 @@
 
   // If there is a scheduled close, the new offset should match it.
   if (close_offset_ != kMaxOffset && offset != close_offset_) {
-    if (!close_connection_and_discard_data_on_wrong_offset_) {
-      stream_->Reset(QUIC_MULTIPLE_TERMINATION_OFFSETS);
-      return false;
-    }
-    QUIC_RELOADABLE_FLAG_COUNT_N(
-        quic_close_connection_and_discard_data_on_wrong_offset, 2, 3);
     stream_->CloseConnectionWithDetails(
         QUIC_STREAM_SEQUENCER_INVALID_STATE,
         quiche::QuicheStrCat(
@@ -142,10 +130,7 @@
 
   // The final offset should be no less than the highest offset that is
   // received.
-  if (close_connection_and_discard_data_on_wrong_offset_ &&
-      offset < highest_offset_) {
-    QUIC_RELOADABLE_FLAG_COUNT_N(
-        quic_close_connection_and_discard_data_on_wrong_offset, 3, 3);
+  if (offset < highest_offset_) {
     stream_->CloseConnectionWithDetails(
         QUIC_STREAM_SEQUENCER_INVALID_STATE,
         quiche::QuicheStrCat(