Deprecate --gfe2_reloadable_flag_quic_remove_connection_migration_connection_option_v2
PiperOrigin-RevId: 527045730
diff --git a/quiche/quic/core/http/end_to_end_test.cc b/quiche/quic/core/http/end_to_end_test.cc
index c6db0b6..1662a69 100644
--- a/quiche/quic/core/http/end_to_end_test.cc
+++ b/quiche/quic/core/http/end_to_end_test.cc
@@ -430,10 +430,6 @@
copt.push_back(kILD0);
}
copt.push_back(kPLE1);
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- copt.push_back(kRVCM);
- }
client_config_.SetConnectionOptionsToSend(copt);
// Start the server first, because CreateQuicClient() attempts
diff --git a/quiche/quic/core/quic_connection.cc b/quiche/quic/core/quic_connection.cc
index 4a60d9a..274a52a 100644
--- a/quiche/quic/core/quic_connection.cc
+++ b/quiche/quic/core/quic_connection.cc
@@ -645,18 +645,7 @@
if (config.HasClientRequestedIndependentOption(kINVC, perspective_)) {
send_connection_close_for_invalid_version_ = true;
}
- const bool remove_connection_migration_connection_option =
- GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2);
- if (remove_connection_migration_connection_option) {
- QUIC_RELOADABLE_FLAG_COUNT(
- quic_remove_connection_migration_connection_option_v2);
- }
- if (framer_.version().HasIetfQuicFrames() &&
- (remove_connection_migration_connection_option ||
- config.HasClientSentConnectionOption(kRVCM, perspective_))) {
- validate_client_addresses_ = true;
- }
+ validate_client_addresses_ = framer_.version().HasIetfQuicFrames();
// Having connection_migration_use_new_cid_ depends on the same set of flags
// and connection option on both client and server sides has the advantage of:
// 1) Less chance of skew in using new connection ID or not between client
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 0a6c01c..e36c817 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -1349,16 +1349,6 @@
void set_perspective(Perspective perspective) {
connection_.set_perspective(perspective);
if (perspective == Perspective::IS_SERVER) {
- QuicConfig config;
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicTagVector connection_options;
- connection_options.push_back(kRVCM);
- config.SetInitialReceivedConnectionOptions(connection_options);
- }
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
-
connection_.set_can_truncate_connection_ids(true);
QuicConnectionPeer::SetNegotiatedVersion(&connection_);
connection_.OnSuccessfulVersionNegotiation();
@@ -14542,13 +14532,6 @@
TEST_P(QuicConnectionTest,
PathValidationFailedOnClientDueToLackOfServerConnectionId) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- config.SetConnectionOptionsToSend({kRVCM});
- }
if (!connection_.connection_migration_use_new_cid()) {
return;
}
@@ -14571,13 +14554,6 @@
TEST_P(QuicConnectionTest,
PathValidationFailedOnClientDueToLackOfClientConnectionIdTheSecondTime) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- config.SetConnectionOptionsToSend({kRVCM});
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- }
if (!connection_.connection_migration_use_new_cid()) {
return;
}
@@ -14666,13 +14642,6 @@
}
TEST_P(QuicConnectionTest, ServerConnectionIdRetiredUponPathValidationFailure) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- config.SetConnectionOptionsToSend({kRVCM});
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- }
if (!connection_.connection_migration_use_new_cid()) {
return;
}
@@ -14717,13 +14686,6 @@
TEST_P(QuicConnectionTest,
MigratePathDirectlyFailedDueToLackOfServerConnectionId) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- config.SetConnectionOptionsToSend({kRVCM});
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- }
if (!connection_.connection_migration_use_new_cid()) {
return;
}
@@ -14740,13 +14702,6 @@
TEST_P(QuicConnectionTest,
MigratePathDirectlyFailedDueToLackOfClientConnectionIdTheSecondTime) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- config.SetConnectionOptionsToSend({kRVCM});
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- }
if (!connection_.connection_migration_use_new_cid()) {
return;
}
@@ -15073,13 +15028,6 @@
}
TEST_P(QuicConnectionTest, ServerRetireSelfIssuedConnectionId) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- config.SetConnectionOptionsToSend({kRVCM});
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- }
if (!connection_.connection_migration_use_new_cid()) {
return;
}
@@ -15523,13 +15471,6 @@
}
TEST_P(QuicConnectionTest, AckElicitingFrames) {
- if (!GetQuicReloadableFlag(
- quic_remove_connection_migration_connection_option_v2)) {
- QuicConfig config;
- config.SetConnectionOptionsToSend({kRVCM});
- EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _));
- connection_.SetFromConfig(config);
- }
if (!version().HasIetfQuicFrames() ||
!connection_.connection_migration_use_new_cid()) {
return;
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index e160456..75d63ad 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -51,8 +51,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_enable_server_on_wire_ping, true)
// If true, flush pending frames as well as pending padding bytes on connection migration.
QUIC_FLAG(quic_reloadable_flag_quic_flush_pending_frames_and_padding_bytes_on_migration, true)
-// If true, ietf connection migration is no longer conditioned on connection option RVCM.
-QUIC_FLAG(quic_reloadable_flag_quic_remove_connection_migration_connection_option_v2, true)
// If true, include stream information in idle timeout connection close detail.
QUIC_FLAG(quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, true)
// If true, reject or send error response code upon receiving invalid request or response headers.
