Introduce single-parameter variant of QuicConfig::SetIdleNetworkTimeout This will allow us to start transitioning clients that use the same value to the new method. gfe-relnote: n/a, new unused code PiperOrigin-RevId: 309333427 Change-Id: I98881d6c70e93976456fed5de12caeebb8b8d4a4
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc index 151c66f..37b75c0 100644 --- a/quic/core/http/end_to_end_test.cc +++ b/quic/core/http/end_to_end_test.cc
@@ -1618,8 +1618,7 @@ } TEST_P(EndToEndTest, Timeout) { - client_config_.SetIdleNetworkTimeout(QuicTime::Delta::FromMicroseconds(500), - QuicTime::Delta::FromMicroseconds(500)); + client_config_.SetIdleNetworkTimeout(QuicTime::Delta::FromMicroseconds(500)); // Note: we do NOT ASSERT_TRUE: we may time out during initial handshake: // that's enough to validate timeout in this case. Initialize();
diff --git a/quic/core/quic_config.cc b/quic/core/quic_config.cc index ba7413f..5a3e769 100644 --- a/quic/core/quic_config.cc +++ b/quic/core/quic_config.cc
@@ -598,6 +598,10 @@ static_cast<uint32_t>(default_idle_network_timeout.ToSeconds())); } +void QuicConfig::SetIdleNetworkTimeout(QuicTime::Delta idle_network_timeout) { + SetIdleNetworkTimeout(idle_network_timeout, idle_network_timeout); +} + QuicTime::Delta QuicConfig::IdleNetworkTimeout() const { return QuicTime::Delta::FromSeconds( idle_network_timeout_seconds_.GetUint32());
diff --git a/quic/core/quic_config.h b/quic/core/quic_config.h index 020c16c..2a46ae6 100644 --- a/quic/core/quic_config.h +++ b/quic/core/quic_config.h
@@ -336,6 +336,9 @@ void SetIdleNetworkTimeout(QuicTime::Delta max_idle_network_timeout, QuicTime::Delta default_idle_network_timeout); + // Sets both default and max to the same value. + void SetIdleNetworkTimeout(QuicTime::Delta idle_network_timeout); + QuicTime::Delta IdleNetworkTimeout() const; // Sets the max bidirectional stream count that this endpoint supports.
diff --git a/quic/core/quic_config_test.cc b/quic/core/quic_config_test.cc index 2677e54..9ce6024 100644 --- a/quic/core/quic_config_test.cc +++ b/quic/core/quic_config_test.cc
@@ -181,7 +181,6 @@ QuicTagVector cgst; cgst.push_back(kQBIC); server_config.SetIdleNetworkTimeout( - QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs / 2), QuicTime::Delta::FromSeconds(kMaximumIdleTimeoutSecs / 2)); server_config.SetInitialRoundTripTimeUsToSend(10 * kNumMicrosPerMilli); server_config.SetInitialStreamFlowControlWindowToSend( @@ -277,7 +276,6 @@ TEST_P(QuicConfigTest, OutOfBoundSHLO) { QuicConfig server_config; server_config.SetIdleNetworkTimeout( - QuicTime::Delta::FromSeconds(2 * kMaximumIdleTimeoutSecs), QuicTime::Delta::FromSeconds(2 * kMaximumIdleTimeoutSecs)); CryptoHandshakeMessage msg;
diff --git a/quic/core/quic_connection_test.cc b/quic/core/quic_connection_test.cc index f1a2df0..a9ee2af 100644 --- a/quic/core/quic_connection_test.cc +++ b/quic/core/quic_connection_test.cc
@@ -5781,7 +5781,6 @@ client_config.SetInitialSessionFlowControlWindowToSend( kInitialSessionFlowControlWindowForTest); client_config.SetIdleNetworkTimeout( - QuicTime::Delta::FromSeconds(kDefaultIdleTimeoutSecs), QuicTime::Delta::FromSeconds(kDefaultIdleTimeoutSecs)); client_config.ToHandshakeMessage(&msg, connection_.transport_version()); const QuicErrorCode error = @@ -5871,7 +5870,6 @@ client_config.SetInitialSessionFlowControlWindowToSend( kInitialSessionFlowControlWindowForTest); client_config.SetIdleNetworkTimeout( - QuicTime::Delta::FromSeconds(kDefaultIdleTimeoutSecs), QuicTime::Delta::FromSeconds(kDefaultIdleTimeoutSecs)); client_config.ToHandshakeMessage(&msg, connection_.transport_version()); const QuicErrorCode error = @@ -5933,7 +5931,6 @@ client_config.SetInitialSessionFlowControlWindowToSend( kInitialSessionFlowControlWindowForTest); client_config.SetIdleNetworkTimeout( - QuicTime::Delta::FromSeconds(kDefaultIdleTimeoutSecs), QuicTime::Delta::FromSeconds(kDefaultIdleTimeoutSecs)); client_config.ToHandshakeMessage(&msg, connection_.transport_version()); const QuicErrorCode error =
diff --git a/quic/quartc/quartc_factory.cc b/quic/quartc/quartc_factory.cc index ff98761..280d936 100644 --- a/quic/quartc/quartc_factory.cc +++ b/quic/quartc/quartc_factory.cc
@@ -148,7 +148,6 @@ } if (quartc_session_config.idle_network_timeout > QuicTime::Delta::Zero()) { quic_config.SetIdleNetworkTimeout( - quartc_session_config.idle_network_timeout, quartc_session_config.idle_network_timeout); }
diff --git a/quic/tools/quic_client_interop_test_bin.cc b/quic/tools/quic_client_interop_test_bin.cc index 25e9c1e..c256161 100644 --- a/quic/tools/quic_client_interop_test_bin.cc +++ b/quic/tools/quic_client_interop_test_bin.cc
@@ -167,7 +167,7 @@ QuicEpollClock epoll_clock(&epoll_server); QuicConfig config; QuicTime::Delta timeout = QuicTime::Delta::FromSeconds(20); - config.SetIdleNetworkTimeout(timeout, timeout); + config.SetIdleNetworkTimeout(timeout); auto client = std::make_unique<QuicClient>( addr, server_id, versions, config, &epoll_server, std::move(proof_verifier), std::move(session_cache));