summaryrefslogtreecommitdiffhomepage
path: root/mullvad-management-interface/src
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-10-16 15:07:57 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-10-22 13:06:17 +0200
commit01e2ade8ba9c8ea4363eeca65a0d8ed989de4d2f (patch)
treefb55d756049f478fa4be40de48b239f2059393c9 /mullvad-management-interface/src
parent4d3129808552e247a591e074a944d95ea9916a27 (diff)
downloadmullvadvpn-01e2ade8ba9c8ea4363eeca65a0d8ed989de4d2f.tar.xz
mullvadvpn-01e2ade8ba9c8ea4363eeca65a0d8ed989de4d2f.zip
Add entry and exit no relay errors
The old no relay error is still kept for single hop
Diffstat (limited to 'mullvad-management-interface/src')
-rw-r--r--mullvad-management-interface/src/types/conversions/states.rs14
1 files changed, 11 insertions, 3 deletions
diff --git a/mullvad-management-interface/src/types/conversions/states.rs b/mullvad-management-interface/src/types/conversions/states.rs
index bbd6c500f2..002aa6ea69 100644
--- a/mullvad-management-interface/src/types/conversions/states.rs
+++ b/mullvad-management-interface/src/types/conversions/states.rs
@@ -179,9 +179,15 @@ impl From<mullvad_types::states::TunnelState> for proto::TunnelState {
error_state.cause()
{
match reason {
- talpid_tunnel::ParameterGenerationError::NoMatchingRelay => {
- i32::from(GenerationError::NoMatchingRelay)
+ talpid_tunnel::ParameterGenerationError::NoMatchingRelayEntry => {
+ i32::from(GenerationError::NoMatchingRelayEntry)
}
+ talpid_tunnel::ParameterGenerationError::NoMatchingRelayExit => {
+ i32::from(GenerationError::NoMatchingRelayExit)
+ }
+ talpid_tunnel::ParameterGenerationError::NoMatchingRelay => {
+ i32::from(GenerationError::NoMatchingRelay)
+ }
talpid_tunnel::ParameterGenerationError::NoMatchingBridgeRelay => {
i32::from(GenerationError::NoMatchingBridgeRelay)
}
@@ -391,10 +397,12 @@ impl TryFrom<proto::TunnelState> for mullvad_types::states::TunnelState {
let parameter_error = match proto::error_state::GenerationError::try_from(parameter_error) {
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::NoMatchingRelayEntry) => talpid_tunnel::ParameterGenerationError::NoMatchingRelayEntry,
+ Ok(proto::error_state::GenerationError::NoMatchingRelayExit) => talpid_tunnel::ParameterGenerationError::NoMatchingRelayExit,
Ok(proto::error_state::GenerationError::NoWireguardKey) => talpid_tunnel::ParameterGenerationError::NoWireguardKey,
Ok(proto::error_state::GenerationError::NetworkIpv4Unavailable) => talpid_tunnel::ParameterGenerationError::IpVersionUnavailable { family: IpVersion::V4 },
Ok(proto::error_state::GenerationError::NetworkIpv6Unavailable) => talpid_tunnel::ParameterGenerationError::IpVersionUnavailable { family: IpVersion::V6 },
+ Ok(proto::error_state::GenerationError::NoMatchingRelay) => talpid_tunnel::ParameterGenerationError::NoMatchingRelay,
_ => return Err(FromProtobufTypeError::InvalidArgument(
"invalid parameter error",
)),