Deprecate gfe2_reloadable_flag_quic_reset_per_packet_state_for_undecryptable_packets. PiperOrigin-RevId: 432993732
diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc index b955d66..5387535 100644 --- a/quic/core/quic_connection.cc +++ b/quic/core/quic_connection.cc
@@ -1279,10 +1279,7 @@ // Record packet receipt to populate ack info before processing stream // frames, since the processing may result in sending a bundled ack. QuicTime receipt_time = idle_network_detector_.time_of_last_received_packet(); - if (reset_per_packet_state_for_undecryptable_packets_ && - SupportsMultiplePacketNumberSpaces()) { - QUIC_RELOADABLE_FLAG_COUNT_N( - quic_reset_per_packet_state_for_undecryptable_packets, 2, 2); + if (SupportsMultiplePacketNumberSpaces()) { receipt_time = last_received_packet_info_.receipt_time; } uber_received_packet_manager_.RecordPacketReceived( @@ -4374,18 +4371,12 @@ debug_visitor_->OnAttemptingToProcessUndecryptablePacket( undecryptable_packet->encryption_level); } - bool processed = false; - if (reset_per_packet_state_for_undecryptable_packets_) { - QUIC_RELOADABLE_FLAG_COUNT_N( - quic_reset_per_packet_state_for_undecryptable_packets, 1, 2); - last_received_packet_info_ = undecryptable_packet->packet_info; - last_size_ = undecryptable_packet->packet->length(); - current_packet_data_ = undecryptable_packet->packet->data(); - processed = framer_.ProcessPacket(*undecryptable_packet->packet); - current_packet_data_ = nullptr; - } else { - processed = framer_.ProcessPacket(*undecryptable_packet->packet); - } + last_received_packet_info_ = undecryptable_packet->packet_info; + last_size_ = undecryptable_packet->packet->length(); + current_packet_data_ = undecryptable_packet->packet->data(); + const bool processed = framer_.ProcessPacket(*undecryptable_packet->packet); + current_packet_data_ = nullptr; + if (processed) { QUIC_DVLOG(1) << ENDPOINT << "Processed undecryptable packet!"; iter = undecryptable_packets_.erase(iter);
diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h index 40c55a3..ebeed1c 100644 --- a/quic/core/quic_connection.h +++ b/quic/core/quic_connection.h
@@ -2269,10 +2269,6 @@ // Enable this via reloadable flag once this feature is complete. bool connection_migration_use_new_cid_ = false; - const bool reset_per_packet_state_for_undecryptable_packets_ = - GetQuicReloadableFlag( - quic_reset_per_packet_state_for_undecryptable_packets); - // TODO(b/205023946) Debug-only fields, to be deprecated after the bug is // fixed. absl::optional<QuicWallTime> quic_bug_10511_43_timestamp_;
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index 84f0bce..fb3c509 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -11499,17 +11499,10 @@ auto packet = writer_->coalesced_packet()->Clone(); writer_->framer()->ProcessPacket(*packet); ASSERT_FALSE(writer_->ack_frames().empty()); - if (GetQuicReloadableFlag( - quic_reset_per_packet_state_for_undecryptable_packets)) { - // Verify the ack_delay_time in the HANDSHAKE ACK frame includes the - // buffering time. - EXPECT_EQ(QuicTime::Delta::FromMilliseconds(101), - writer_->ack_frames()[0].ack_delay_time); - } else { - // This ack_delay_time is wrong. - EXPECT_EQ(QuicTime::Delta::FromMilliseconds(1), - writer_->ack_frames()[0].ack_delay_time); - } + // Verify the ack_delay_time in the HANDSHAKE ACK frame includes the + // buffering time. + EXPECT_EQ(QuicTime::Delta::FromMilliseconds(101), + writer_->ack_frames()[0].ack_delay_time); ASSERT_TRUE(writer_->coalesced_packet() == nullptr); }
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h index 6e3ce64..96e0882 100644 --- a/quic/core/quic_flags_list.h +++ b/quic/core/quic_flags_list.h
@@ -83,8 +83,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_act_upon_invalid_header, false) // If true, require handshake confirmation for QUIC connections, functionally disabling 0-rtt handshakes. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_require_handshake_confirmation, false) -// If true, reset per packet state before processing undecryptable packets. -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_reset_per_packet_state_for_undecryptable_packets, true) // If true, server proactively retires client issued connection ID on reverse path validation failure. QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_retire_cid_on_reverse_path_validation_failure, false) // If true, set burst token to 2 in cwnd bootstrapping experiment.