diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-04-07 15:20:30 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-04-09 09:46:21 +0200 |
| commit | 0db6e80bbc591eeefb2408fa2e335b2804135eb2 (patch) | |
| tree | 3b465d233d94a4739f9a0850607fc0424c9cb8af /mullvad-daemon | |
| parent | 9a6938a4a32ecc162cc5afcf15fa636de2f9b9fe (diff) | |
| download | mullvadvpn-0db6e80bbc591eeefb2408fa2e335b2804135eb2.tar.xz mullvadvpn-0db6e80bbc591eeefb2408fa2e335b2804135eb2.zip | |
Improve error message when an unavailable ip version is selected
Diffstat (limited to 'mullvad-daemon')
| -rw-r--r-- | mullvad-daemon/src/tunnel.rs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mullvad-daemon/src/tunnel.rs b/mullvad-daemon/src/tunnel.rs index 4874ee167a..ab2efb62cf 100644 --- a/mullvad-daemon/src/tunnel.rs +++ b/mullvad-daemon/src/tunnel.rs @@ -220,12 +220,12 @@ impl InnerParametersGenerator { GetRelay::Custom(custom_relay) => { self.last_generated_relays = None; custom_relay - // TODO: generate proxy settings for custom tunnels - .to_tunnel_parameters(self.tunnel_options.clone(), None) - .map_err(|e| { - log::error!("Failed to resolve hostname for custom tunnel config: {}", e); - Error::ResolveCustomHostname - }) + // TODO: generate proxy settings for custom tunnels + .to_tunnel_parameters(self.tunnel_options.clone(), None) + .map_err(|e| { + log::error!("Failed to resolve hostname for custom tunnel config: {}", e); + Error::ResolveCustomHostname + }) } } } @@ -325,7 +325,10 @@ impl From<Error> for ParameterGenerationError { ParameterGenerationError::NoMatchingBridgeRelay } Error::ResolveCustomHostname => { - ParameterGenerationError::CustomTunnelHostResultionError + ParameterGenerationError::CustomTunnelHostResolutionError + } + Error::SelectRelay(mullvad_relay_selector::Error::IpVersionUnavailable { family }) => { + ParameterGenerationError::IpVersionUnavailable { family } } Error::NoAuthDetails | Error::SelectRelay(_) | Error::Device(_) => { ParameterGenerationError::NoMatchingRelay |