From b5bcae50a8eaaec3c6f93e0205f35f8bdb80ab12 Mon Sep 17 00:00:00 2001 From: Dan Zhang Date: Thu, 17 Oct 2024 16:23:04 +0000 Subject: [PATCH] default value of connect timeout Signed-off-by: Dan Zhang --- mobile/library/cc/engine_builder.h | 2 +- .../chromium/net/impl/NativeCronvoyEngineBuilderImpl.java | 7 ++++++- .../kotlin/io/envoyproxy/envoymobile/EngineBuilder.kt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mobile/library/cc/engine_builder.h b/mobile/library/cc/engine_builder.h index 6d67acf504c7..3cd78f47397c 100644 --- a/mobile/library/cc/engine_builder.h +++ b/mobile/library/cc/engine_builder.h @@ -144,7 +144,7 @@ class EngineBuilder { std::unique_ptr callbacks_; std::unique_ptr event_tracker_{nullptr}; - int connect_timeout_seconds_ = 30; + int connect_timeout_seconds_ = 10; int dns_refresh_seconds_ = 60; int dns_failure_refresh_seconds_base_ = 2; int dns_failure_refresh_seconds_max_ = 10; diff --git a/mobile/library/java/org/chromium/net/impl/NativeCronvoyEngineBuilderImpl.java b/mobile/library/java/org/chromium/net/impl/NativeCronvoyEngineBuilderImpl.java index 4ff3415d67a5..f562d5c785b7 100644 --- a/mobile/library/java/org/chromium/net/impl/NativeCronvoyEngineBuilderImpl.java +++ b/mobile/library/java/org/chromium/net/impl/NativeCronvoyEngineBuilderImpl.java @@ -38,7 +38,7 @@ public class NativeCronvoyEngineBuilderImpl extends CronvoyEngineBuilderImpl { // TODO(refactor) move unshared variables into their specific methods. private final List nativeFilterChain = new ArrayList<>(); private final EnvoyEventTracker mEnvoyEventTracker = null; - private final int mConnectTimeoutSeconds = 30; + private int mConnectTimeoutSeconds = 10; private final int mDnsRefreshSeconds = 60; private final int mDnsFailureRefreshSecondsBase = 2; private final int mDnsFailureRefreshSecondsMax = 10; @@ -234,6 +234,11 @@ public NativeCronvoyEngineBuilderImpl setUpstreamTlsSni(String sni) { return this; } + public NativeCronvoyEngineBuilderImpl setConnectTimeoutSeconds(int connect_timeout) { + mConnectTimeoutSeconds = connect_timeout; + return this; + } + /** * Indicates to skip the TLS certificate verification. * diff --git a/mobile/library/kotlin/io/envoyproxy/envoymobile/EngineBuilder.kt b/mobile/library/kotlin/io/envoyproxy/envoymobile/EngineBuilder.kt index ebf81c87113d..1eed99b4fc86 100644 --- a/mobile/library/kotlin/io/envoyproxy/envoymobile/EngineBuilder.kt +++ b/mobile/library/kotlin/io/envoyproxy/envoymobile/EngineBuilder.kt @@ -26,7 +26,7 @@ open class EngineBuilder() { ) } private var logLevel = LogLevel.INFO - private var connectTimeoutSeconds = 30 + private var connectTimeoutSeconds = 10 private var dnsRefreshSeconds = 60 private var dnsFailureRefreshSecondsBase = 2 private var dnsFailureRefreshSecondsMax = 10