Remove quic connection option `RVCM` everywhere given IETF style connection migration is no longer guarded by it since cl/527045730. PiperOrigin-RevId: 537370745
diff --git a/quiche/quic/core/crypto/crypto_protocol.h b/quiche/quic/core/crypto/crypto_protocol.h index 99099dd..13f0009 100644 --- a/quiche/quic/core/crypto/crypto_protocol.h +++ b/quiche/quic/core/crypto/crypto_protocol.h
@@ -279,11 +279,6 @@ const QuicTag kELDT = TAG('E', 'L', 'D', 'T'); // Enable Loss Detection Tuning -// TODO(haoyuewang) Remove RVCM option once -// --quic_remove_connection_migration_connection_option_v2 is deprecated. -const QuicTag kRVCM = TAG('R', 'V', 'C', 'M'); // Validate the new address - // upon client address change. - const QuicTag kSPAD = TAG('S', 'P', 'A', 'D'); // Use server preferred address const QuicTag kSPA2 = TAG('S', 'P', 'A', '2'); // Start validating server // preferred address once it is
diff --git a/quiche/quic/core/http/end_to_end_test.cc b/quiche/quic/core/http/end_to_end_test.cc index b2c92db..c08ed47 100644 --- a/quiche/quic/core/http/end_to_end_test.cc +++ b/quiche/quic/core/http/end_to_end_test.cc
@@ -466,7 +466,7 @@ server_writer_ = new PacketDroppingTestWriter(); StartServer(); - client_config_.SetConnectionOptionsToSend(QuicTagVector{kRVCM, kSPAD}); + client_config_.SetConnectionOptionsToSend(QuicTagVector{kSPAD}); } if (!connect_to_server_on_initialize_) {
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc index 54b671a..7909f0e 100644 --- a/quiche/quic/core/quic_connection_test.cc +++ b/quiche/quic/core/quic_connection_test.cc
@@ -1476,7 +1476,6 @@ EXPECT_EQ(kPeerAddress, connection_.peer_address()); EXPECT_EQ(kPeerAddress, connection_.effective_peer_address()); QuicConfig config; - config.SetInitialReceivedConnectionOptions(QuicTagVector{kRVCM}); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); connection_.SetFromConfig(config); connection_.set_sent_server_preferred_address(kServerPreferredAddress); @@ -1504,7 +1503,7 @@ connection_.RemoveEncrypter(ENCRYPTION_INITIAL); connection_.SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE); - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM, kSPAD}); + config.SetConnectionOptionsToSend(QuicTagVector{kSPAD}); QuicConfigPeer::SetReceivedStatelessResetToken(&config, kTestStatelessResetToken); QuicConfigPeer::SetReceivedAlternateServerAddress(&config, @@ -3083,7 +3082,7 @@ connection_.SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE); QuicConfig config; - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM, kSPAD}); + config.SetConnectionOptionsToSend(QuicTagVector{kSPAD}); QuicConfigPeer::SetReceivedStatelessResetToken(&config, kTestStatelessResetToken); QuicConfigPeer::SetReceivedAlternateServerAddress(&config, @@ -13011,7 +13010,6 @@ TEST_P(QuicConnectionTest, MultiPortConnection) { set_perspective(Perspective::IS_CLIENT); QuicConfig config; - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM}); config.SetClientConnectionOptions(QuicTagVector{kMPQC}); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); connection_.SetFromConfig(config); @@ -13146,7 +13144,6 @@ TEST_P(QuicConnectionTest, TooManyMultiPortPathCreations) { set_perspective(Perspective::IS_CLIENT); QuicConfig config; - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM}); config.SetClientConnectionOptions(QuicTagVector{kMPQC}); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); connection_.SetFromConfig(config); @@ -13262,7 +13259,6 @@ TEST_P(QuicConnectionTest, PathDegradingWhenAltPathIsNotReady) { set_perspective(Perspective::IS_CLIENT); QuicConfig config; - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM}); config.SetClientConnectionOptions(QuicTagVector{kMPQC}); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); connection_.SetFromConfig(config); @@ -13333,7 +13329,6 @@ .WillRepeatedly(Return(HANDSHAKE_CONFIRMED)); set_perspective(Perspective::IS_CLIENT); QuicConfig config; - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM}); config.SetClientConnectionOptions(QuicTagVector{kMPQC}); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); connection_.SetFromConfig(config); @@ -13412,7 +13407,6 @@ .WillRepeatedly(Return(HANDSHAKE_CONFIRMED)); set_perspective(Perspective::IS_CLIENT); QuicConfig config; - config.SetConnectionOptionsToSend(QuicTagVector{kRVCM}); config.SetClientConnectionOptions(QuicTagVector{kMPQC}); EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)); connection_.SetFromConfig(config);
diff --git a/quiche/quic/core/quic_session_test.cc b/quiche/quic/core/quic_session_test.cc index 9bcbf71..1827f30 100644 --- a/quiche/quic/core/quic_session_test.cc +++ b/quiche/quic/core/quic_session_test.cc
@@ -2133,7 +2133,6 @@ } TEST_P(QuicSessionTestClient, NewStreamCreationResumesMultiPortProbing) { - session_.config()->SetConnectionOptionsToSend({kRVCM}); session_.config()->SetClientConnectionOptions({kMPQC}); session_.Initialize(); connection_->CreateConnectionIdManager();