Show correct endpoint in CLI for custom relays

mullvad · Oct 17, 2023 · 1c903ef · 1c903ef
1 parent aee7561
commit 1c903ef
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
@@ -217,7 +217,11 @@ impl Relay {
         let relay_settings = settings.relay_settings;
 
         match relay_settings {
-            RelaySettings::CustomTunnelEndpoint(endpoint) => {
+            RelaySettings::CustomTunnelEndpoint(mut endpoint) => {
+                if let Err(error) = endpoint.resolve_host() {
+                    eprintln!("Failed to resolve custom endpoint: {error}");
+                    return Ok(());
+                }
                 println!("Custom endpoint: {endpoint}")
             }
 

diff --git a/mullvad-daemon/src/tunnel.rs b/mullvad-daemon/src/tunnel.rs
@@ -141,7 +141,7 @@ impl InnerParametersGenerator {
     async fn generate(&mut self, retry_attempt: u32) -> Result<TunnelParameters, Error> {
         let _data = self.device().await?;
         match self.relay_selector.get_relay(retry_attempt) {
-            Ok((SelectedRelay::Custom(custom_relay), _bridge, _obfsucator)) => {
+            Ok((SelectedRelay::Custom(mut custom_relay), _bridge, _obfsucator)) => {
                 self.last_generated_relays = None;
                 custom_relay
                     // TODO: generate proxy settings for custom tunnels

diff --git a/mullvad-types/src/custom_tunnel.rs b/mullvad-types/src/custom_tunnel.rs
@@ -39,18 +39,22 @@ impl CustomTunnelEndpoint {
         }
     }
 
+    pub fn resolve_host(&mut self) -> Result<(), Error> {
+        let ip = resolve_to_ip(&self.host)?;
+        self.config.set_ip(ip);
+        Ok(())
+    }
+
     pub fn to_tunnel_parameters(
-        &self,
+        &mut self,
         tunnel_options: TunnelOptions,
         proxy: Option<openvpn::ProxySettings>,
     ) -> Result<TunnelParameters, Error> {
-        let ip = resolve_to_ip(&self.host)?;
-        let mut config = self.config.clone();
-        config.set_ip(ip);
+        self.resolve_host()?;
 
-        let parameters = match config {
+        let parameters = match &self.config {
             ConnectionConfig::OpenVpn(config) => openvpn::TunnelParameters {
-                config,
+                config: config.clone(),
                 options: tunnel_options.openvpn,
                 generic_options: tunnel_options.generic,
                 proxy,
@@ -59,7 +63,7 @@ impl CustomTunnelEndpoint {
             }
             .into(),
             ConnectionConfig::Wireguard(connection) => wireguard::TunnelParameters {
-                connection,
+                connection: connection.clone(),
                 options: tunnel_options.wireguard.into_talpid_tunnel_options(),
                 generic_options: tunnel_options.generic,
                 obfuscation: None,