Deprecate gfe2_reloadable_flag_quic_fix_bytes_accounting_for_buffered_coalesced_packets.
PiperOrigin-RevId: 471607136
diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index 999e174..a3c0339 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -6007,11 +6007,6 @@
}
QUIC_DVLOG(1) << ENDPOINT << "Sending coalesced packet "
<< coalesced_packet_.ToString(length);
- if (GetQuicReloadableFlag(
- quic_fix_bytes_accounting_for_buffered_coalesced_packets)) {
- QUIC_RELOADABLE_FLAG_COUNT(
- quic_fix_bytes_accounting_for_buffered_coalesced_packets);
- }
const size_t padding_size =
length - std::min<size_t>(length, coalesced_packet_.length());
// Buffer coalesced packet if padding + bytes_sent exceeds amplifcation limit.
@@ -6023,11 +6018,6 @@
buffered_packets_.emplace_back(
buffer, static_cast<QuicPacketLength>(length),
coalesced_packet_.self_address(), coalesced_packet_.peer_address());
- if (!GetQuicReloadableFlag(
- quic_fix_bytes_accounting_for_buffered_coalesced_packets) &&
- !enforce_strict_amplification_factor_) {
- return true;
- }
} else {
WriteResult result = writer_->WritePacket(
buffer, length, coalesced_packet_.self_address().host(),
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 9ff8413..33d4e72 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -15541,14 +15541,8 @@
connection_.SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
QuicConnectionPeer::SendPing(&connection_);
const QuicConnectionStats& stats = connection_.GetStats();
- if (GetQuicReloadableFlag(
- quic_fix_bytes_accounting_for_buffered_coalesced_packets) ||
- GetQuicFlag(FLAGS_quic_enforce_strict_amplification_factor)) {
- // Verify padding is accounted.
- EXPECT_EQ(stats.bytes_sent, connection_.max_packet_length());
- } else {
- EXPECT_LT(stats.bytes_sent, connection_.max_packet_length());
- }
+ // Verify padding is accounted.
+ EXPECT_EQ(stats.bytes_sent, connection_.max_packet_length());
}
TEST_P(QuicConnectionTest, StrictAntiAmplificationLimit) {
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 793237c..4059000 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -29,8 +29,6 @@
QUIC_FLAG(quic_restart_flag_quic_support_release_time_for_gso, false)
// If true, QuicSpdyStream::OnDataAvailable will check if connection is still connected after HttpDecoder::ProcessInput.
QUIC_FLAG(quic_reloadable_flag_quic_spdy_stream_check_connected_after_process_input, true)
-// If true, account added padding when coalesced packets get buffered.
-QUIC_FLAG(quic_reloadable_flag_quic_fix_bytes_accounting_for_buffered_coalesced_packets, true)
// If true, ack frequency frame can be sent from server to client.
QUIC_FLAG(quic_reloadable_flag_quic_can_send_ack_frequency, true)
// If true, allow client to enable BBRv2 on server via connection option \'B2ON\'.
