Deprecate --gfe2_reloadable_flag_quic_ignore_duplicate_new_cid_frame.
PiperOrigin-RevId: 576960194
diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index d9f48cc..4f00a84 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -394,9 +394,6 @@
AddKnownServerAddress(initial_peer_address);
}
packet_creator_.SetDefaultPeerAddress(initial_peer_address);
- if (ignore_duplicate_new_cid_frame_) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_ignore_duplicate_new_cid_frame);
- }
}
void QuicConnection::InstallInitialCrypters(QuicConnectionId connection_id) {
@@ -1941,7 +1938,7 @@
ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
return NewConnectionIdResult::kProtocolViolation;
}
- if (duplicate_new_connection_id && ignore_duplicate_new_cid_frame_) {
+ if (duplicate_new_connection_id) {
return NewConnectionIdResult::kDuplicateFrame;
}
if (perspective_ == Perspective::IS_SERVER) {
diff --git a/quiche/quic/core/quic_connection.h b/quiche/quic/core/quic_connection.h
index 0108c76..8420255 100644
--- a/quiche/quic/core/quic_connection.h
+++ b/quiche/quic/core/quic_connection.h
@@ -2367,9 +2367,6 @@
const bool ignore_gquic_probing_ =
GetQuicReloadableFlag(quic_ignore_gquic_probing);
- const bool ignore_duplicate_new_cid_frame_ =
- GetQuicReloadableFlag(quic_ignore_duplicate_new_cid_frame);
-
RetransmittableOnWireBehavior retransmittable_on_wire_behavior_ = DEFAULT;
// Server addresses that are known to the client.
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index e3a526c..b7f6e1a 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -13136,10 +13136,8 @@
stats->rtt_stats_when_default_path_degrading.latest_rtt());
// Receiving the retransmitted NEW_CID frame now should still have no effect.
- if (GetQuicReloadableFlag(quic_ignore_duplicate_new_cid_frame)) {
- EXPECT_CALL(visitor_, CreateContextForMultiPortPath).Times(0);
- connection_.OnNewConnectionIdFrame(frame);
- }
+ EXPECT_CALL(visitor_, CreateContextForMultiPortPath).Times(0);
+ connection_.OnNewConnectionIdFrame(frame);
// When there's no active request, the probing shouldn't happen. But the
// probing context should be saved.
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 28d3c80..4974585 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -43,8 +43,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false)
// If true, QuicGsoBatchWriter will support release time if it is available and the process has the permission to do so.
QUIC_FLAG(quic_restart_flag_quic_support_release_time_for_gso, false)
-// If true, a duplicate NEW_CID frame will be ignore during QUIC packet processing.
-QUIC_FLAG(quic_reloadable_flag_quic_ignore_duplicate_new_cid_frame, 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\'.
