diff --git a/libs/hbb_common b/libs/hbb_common index 4eca5b45b..3afaf6494 160000 --- a/libs/hbb_common +++ b/libs/hbb_common @@ -1 +1 @@ -Subproject commit 4eca5b45b95b2f3d71789dc001595149c015fe72 +Subproject commit 3afaf6494475ef58dcaaae6b4e6d2303cc3d632b diff --git a/src/rendezvous_mediator.rs b/src/rendezvous_mediator.rs index d8ec3c102..f731a58de 100644 --- a/src/rendezvous_mediator.rs +++ b/src/rendezvous_mediator.rs @@ -383,14 +383,8 @@ impl RendezvousMediator { pub async fn start(server: ServerPtr, host: String) -> ResultType<()> { log::info!("start rendezvous mediator of {}", host); //If the investment agent type is http or https, then tcp forwarding is enabled. - let is_http_proxy = if let Some(conf) = Config::get_socks() { - let proxy = Proxy::from_conf(&conf, None)?; - proxy.is_http_or_https() - } else { - false - }; if (cfg!(debug_assertions) && option_env!("TEST_TCP").is_some()) - || is_http_proxy + || Config::is_proxy() || get_builtin_option(config::keys::OPTION_DISABLE_UDP) == "Y" { Self::start_tcp(server, host).await