diff options
| author | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2025-03-05 16:45:21 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-03-10 10:14:19 +0100 |
| commit | 4f1f5fd04554785d3aafde869c6439256c3ba053 (patch) | |
| tree | 4eae5e4ab09a0e1ca612bc6244904641b88511e2 | |
| parent | 2760372ac7733e8824bbc02d1c3e9eb017b3caab (diff) | |
| download | mullvadvpn-4f1f5fd04554785d3aafde869c6439256c3ba053.tar.xz mullvadvpn-4f1f5fd04554785d3aafde869c6439256c3ba053.zip | |
Handle tunnel_protocol now being a required message field
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/relay_constraints.rs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/mullvad-management-interface/src/types/conversions/relay_constraints.rs b/mullvad-management-interface/src/types/conversions/relay_constraints.rs index 94cd5b6f64..aebaede49a 100644 --- a/mullvad-management-interface/src/types/conversions/relay_constraints.rs +++ b/mullvad-management-interface/src/types/conversions/relay_constraints.rs @@ -97,13 +97,8 @@ impl TryFrom<proto::RelaySettings> for mullvad_types::relay_constraints::RelaySe .unwrap_or(Constraint::Any); let providers = try_providers_constraint_from_proto(&settings.providers)?; let ownership = try_ownership_constraint_from_i32(settings.ownership)?; - let tunnel_protocol = settings - .tunnel_type - .map(try_tunnel_type_from_i32) - .transpose()? - .ok_or(FromProtobufTypeError::InvalidArgument( - "missing tunnel protocol", - ))?; + let tunnel_protocol = try_tunnel_type_from_i32(settings.tunnel_type)?; + let openvpn_constraints = mullvad_constraints::OpenVpnConstraints::try_from( &settings.openvpn_constraints.ok_or( @@ -227,7 +222,6 @@ impl From<mullvad_types::relay_constraints::RelaySettings> for proto::RelaySetti fn from(settings: mullvad_types::relay_constraints::RelaySettings) -> Self { use mullvad_types::relay_constraints::RelaySettings as MullvadRelaySettings; use proto::relay_settings; - use talpid_types::net as talpid_net; let endpoint = match settings { MullvadRelaySettings::CustomTunnelEndpoint(endpoint) => { @@ -244,11 +238,7 @@ impl From<mullvad_types::relay_constraints::RelaySettings> for proto::RelaySetti .map(proto::LocationConstraint::from), providers: convert_providers_constraint(&constraints.providers), ownership: convert_ownership_constraint(&constraints.ownership) as i32, - tunnel_type: match constraints.tunnel_protocol { - talpid_net::TunnelType::Wireguard => Some(proto::TunnelType::Wireguard), - talpid_net::TunnelType::OpenVpn => Some(proto::TunnelType::Openvpn), - } - .map(i32::from), + tunnel_type: constraints.tunnel_protocol as i32, wireguard_constraints: Some(proto::WireguardConstraints { port: constraints |