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-management-interface/src | |
| 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-management-interface/src')
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/states.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mullvad-management-interface/src/types/conversions/states.rs b/mullvad-management-interface/src/types/conversions/states.rs index 79e517e750..7d9cc3f417 100644 --- a/mullvad-management-interface/src/types/conversions/states.rs +++ b/mullvad-management-interface/src/types/conversions/states.rs @@ -1,4 +1,5 @@ use crate::types::{proto, FromProtobufTypeError}; +use talpid_types::net::IpVersion; impl From<mullvad_types::states::TunnelState> for proto::TunnelState { fn from(state: mullvad_types::states::TunnelState) -> Self { @@ -187,9 +188,15 @@ impl From<mullvad_types::states::TunnelState> for proto::TunnelState { talpid_tunnel::ParameterGenerationError::NoWireguardKey => { i32::from(GenerationError::NoWireguardKey) } - talpid_tunnel::ParameterGenerationError::CustomTunnelHostResultionError => { + talpid_tunnel::ParameterGenerationError::CustomTunnelHostResolutionError => { i32::from(GenerationError::CustomTunnelHostResolutionError) } + talpid_tunnel::ParameterGenerationError::IpVersionUnavailable { family: IpVersion::V4 } => { + i32::from(GenerationError::NetworkIpv4Unavailable) + } + talpid_tunnel::ParameterGenerationError::IpVersionUnavailable { family: IpVersion::V6 } => { + i32::from(GenerationError::NetworkIpv6Unavailable) + } } } else { 0 @@ -382,7 +389,7 @@ impl TryFrom<proto::TunnelState> for mullvad_types::states::TunnelState { } Ok(proto::error_state::Cause::TunnelParameterError) => { let parameter_error = match proto::error_state::GenerationError::try_from(parameter_error) { - Ok(proto::error_state::GenerationError::CustomTunnelHostResolutionError) => talpid_tunnel::ParameterGenerationError::CustomTunnelHostResultionError, + Ok(proto::error_state::GenerationError::CustomTunnelHostResolutionError) => talpid_tunnel::ParameterGenerationError::CustomTunnelHostResolutionError, Ok(proto::error_state::GenerationError::NoMatchingBridgeRelay) => talpid_tunnel::ParameterGenerationError::NoMatchingBridgeRelay, Ok(proto::error_state::GenerationError::NoMatchingRelay) => talpid_tunnel::ParameterGenerationError::NoMatchingRelay, Ok(proto::error_state::GenerationError::NoWireguardKey) => talpid_tunnel::ParameterGenerationError::NoWireguardKey, |