Postpone removing handshake timeout from transport params getting negotiated to handshake complete.
Please note, on client side, handshake complete indicates client receives server first flight and can send client finished. On the server side, handshake complete indicates client finished has been received.
Connection option FTOE is used for experiment purpose.
Credit to Stanislav Slusny from Akamai, who reported this issue.
Protected by FLAGS_quic_reloadable_flag_quic_fix_timeouts.
PiperOrigin-RevId: 677553203
diff --git a/quiche/quic/core/quic_connection_test.cc b/quiche/quic/core/quic_connection_test.cc
index 33b6002..b4f67c5 100644
--- a/quiche/quic/core/quic_connection_test.cc
+++ b/quiche/quic/core/quic_connection_test.cc
@@ -10318,6 +10318,75 @@
}
}
+TEST_P(QuicConnectionTest, FixTimeoutsClient) {
+ if (!connection_.version().UsesTls()) {
+ return;
+ }
+ set_perspective(Perspective::IS_CLIENT);
+ if (GetQuicReloadableFlag(quic_fix_timeouts)) {
+ EXPECT_CALL(visitor_, GetHandshakeState())
+ .WillRepeatedly(Return(HANDSHAKE_START));
+ }
+ QuicConfig config;
+ QuicTagVector connection_options;
+ connection_options.push_back(kFTOE);
+ config.SetConnectionOptionsToSend(connection_options);
+ QuicConfigPeer::SetNegotiated(&config, true);
+ QuicConfigPeer::SetReceivedOriginalConnectionId(&config,
+ connection_.connection_id());
+ QuicConfigPeer::SetReceivedInitialSourceConnectionId(
+ &config, connection_.connection_id());
+
+ EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)).Times(1);
+ connection_.SetFromConfig(config);
+ QuicIdleNetworkDetector& idle_network_detector =
+ QuicConnectionPeer::GetIdleNetworkDetector(&connection_);
+ if (GetQuicReloadableFlag(quic_fix_timeouts)) {
+ // Handshake timeout has not been removed yet.
+ EXPECT_NE(idle_network_detector.handshake_timeout(),
+ QuicTime::Delta::Infinite());
+ } else {
+ // Handshake timeout has been set to infinite.
+ EXPECT_EQ(idle_network_detector.handshake_timeout(),
+ QuicTime::Delta::Infinite());
+ }
+}
+
+TEST_P(QuicConnectionTest, FixTimeoutsServer) {
+ if (!connection_.version().UsesTls()) {
+ return;
+ }
+ set_perspective(Perspective::IS_SERVER);
+ if (GetQuicReloadableFlag(quic_fix_timeouts)) {
+ EXPECT_CALL(visitor_, GetHandshakeState())
+ .WillRepeatedly(Return(HANDSHAKE_START));
+ }
+ QuicConfig config;
+ quic::QuicTagVector initial_received_options;
+ initial_received_options.push_back(quic::kFTOE);
+ ASSERT_TRUE(
+ config.SetInitialReceivedConnectionOptions(initial_received_options));
+ QuicConfigPeer::SetNegotiated(&config, true);
+ QuicConfigPeer::SetReceivedOriginalConnectionId(&config,
+ connection_.connection_id());
+ QuicConfigPeer::SetReceivedInitialSourceConnectionId(&config,
+ QuicConnectionId());
+
+ EXPECT_CALL(*send_algorithm_, SetFromConfig(_, _)).Times(1);
+ connection_.SetFromConfig(config);
+ QuicIdleNetworkDetector& idle_network_detector =
+ QuicConnectionPeer::GetIdleNetworkDetector(&connection_);
+ if (GetQuicReloadableFlag(quic_fix_timeouts)) {
+ // Handshake timeout has not been removed yet.
+ EXPECT_NE(idle_network_detector.handshake_timeout(),
+ QuicTime::Delta::Infinite());
+ } else {
+ // Handshake timeout has been set to infinite.
+ EXPECT_EQ(idle_network_detector.handshake_timeout(),
+ QuicTime::Delta::Infinite());
+ }
+}
+
TEST_P(QuicConnectionTest, ClientParsesRetry) {
TestClientRetryHandling(/*invalid_retry_tag=*/false,
/*missing_original_id_in_config=*/false,
