From da03baa063d2516be5a0b5cbe6040aaa9f8e2a29 Mon Sep 17 00:00:00 2001 From: theS1LV3R Date: Sun, 8 Mar 2026 17:03:29 +0100 Subject: [PATCH] fix: Ensure codeflow returns at correct locations --- src/service/resolver/actual.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/service/resolver/actual.rs b/src/service/resolver/actual.rs index 471aeae07..80d5edb8e 100644 --- a/src/service/resolver/actual.rs +++ b/src/service/resolver/actual.rs @@ -172,18 +172,18 @@ async fn resolve_3_well_known( debug!("3: A .well-known file is available"); *host = add_port_to_hostname(&delegated).uri_string(); - // 3.1 - If is of IP:port format, connect to that, + // 3.1 - If is IP:port, connect to that, // or IP with default port if no port provided (8448) if let Some(host_and_port) = get_ip_with_port(&delegated) { debug!("3.1: IP with port in .well-known file"); return Ok(host_and_port); } - // 3.2 - If is not an IP and a port is present, lookup IP for - // hostname and connect + // 3.2 - If is hostname:port, lookup IP for hostname and connect if let Some(pos) = &delegated.find(':') { - self.resolve_3_2_hostname_port(cache, &delegated, *pos) - .await?; + return self + .resolve_3_2_hostname_port(cache, &delegated, *pos) + .await; } // 3.3 - If is not an IP and there is no port, lookup SRV @@ -191,8 +191,7 @@ async fn resolve_3_well_known( // see steps 3.1 and 3.2) trace!("Delegated hostname has no port, querying SRV"); if let Some(overrider) = self.query_srv_record(&delegated).await? { - self.resolve_3_3_use_srv(cache, &delegated, overrider) - .await?; + return self.resolve_3_3_use_srv(cache, &delegated, overrider).await; } self.resolve_3_4_use_default_port(cache, delegated).await