gfe-relnote: deprecate gfe2_reloadable_flag_quic_close_connection_on_wrong_offset. PiperOrigin-RevId: 284649973 Change-Id: I46b65081d1619870bfc3f7a67e3a9e21c4d7bb04
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc index afb5641..4603d6c 100644 --- a/quic/core/quic_session_test.cc +++ b/quic/core/quic_session_test.cc
@@ -2757,14 +2757,8 @@ session_.OnStreamFrame(frame); QuicStreamFrame frame1(stream->id(), false, 1, ","); - if (!GetQuicReloadableFlag(quic_close_connection_on_wrong_offset)) { - EXPECT_CALL(*connection_, SendControlFrame(_)); - EXPECT_CALL(*connection_, - OnStreamReset(stream->id(), QUIC_DATA_AFTER_CLOSE_OFFSET)); - } else { - EXPECT_CALL(*connection_, - CloseConnection(QUIC_STREAM_DATA_BEYOND_CLOSE_OFFSET, _, _)); - } + EXPECT_CALL(*connection_, + CloseConnection(QUIC_STREAM_DATA_BEYOND_CLOSE_OFFSET, _, _)); session_.OnStreamFrame(frame1); }
diff --git a/quic/core/quic_stream.cc b/quic/core/quic_stream.cc index 2037327..1c70f48 100644 --- a/quic/core/quic_stream.cc +++ b/quic/core/quic_stream.cc
@@ -422,11 +422,6 @@ } if (frame.offset + frame.data_length > sequencer_.close_offset()) { - if (!GetQuicReloadableFlag(quic_close_connection_on_wrong_offset)) { - Reset(QUIC_DATA_AFTER_CLOSE_OFFSET); - return; - } - QUIC_RELOADABLE_FLAG_COUNT_N(quic_close_connection_on_wrong_offset, 1, 2); CloseConnectionWithDetails( QUIC_STREAM_DATA_BEYOND_CLOSE_OFFSET, QuicStrCat( @@ -490,20 +485,17 @@ return; } - if (GetQuicReloadableFlag(quic_close_connection_on_wrong_offset)) { - QUIC_RELOADABLE_FLAG_COUNT_N(quic_close_connection_on_wrong_offset, 2, 2); - const QuicStreamOffset kMaxOffset = - std::numeric_limits<QuicStreamOffset>::max(); - if (sequencer()->close_offset() != kMaxOffset && - frame.byte_offset != sequencer()->close_offset()) { - CloseConnectionWithDetails( - QUIC_STREAM_MULTIPLE_OFFSET, - QuicStrCat("Stream ", id_, - " received new final offset: ", frame.byte_offset, - ", which is different from close offset: ", - sequencer_.close_offset())); - return; - } + const QuicStreamOffset kMaxOffset = + std::numeric_limits<QuicStreamOffset>::max(); + if (sequencer()->close_offset() != kMaxOffset && + frame.byte_offset != sequencer()->close_offset()) { + CloseConnectionWithDetails( + QUIC_STREAM_MULTIPLE_OFFSET, + QuicStrCat("Stream ", id_, + " received new final offset: ", frame.byte_offset, + ", which is different from close offset: ", + sequencer_.close_offset())); + return; } MaybeIncreaseHighestReceivedOffset(frame.byte_offset);
diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc index 673c7a7..9733f19 100644 --- a/quic/core/quic_stream_test.cc +++ b/quic/core/quic_stream_test.cc
@@ -1589,7 +1589,6 @@ } TEST_P(QuicStreamTest, RstStreamFrameChangesCloseOffset) { - SetQuicReloadableFlag(quic_close_connection_on_wrong_offset, true); Initialize(); QuicStreamFrame stream_frame(stream_->id(), true, 0, "abc");