summaryrefslogtreecommitdiffhomepage
path: root/mullvad-management-interface/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-04-23 19:16:39 +0200
committerDavid Lönnhager <david.l@mullvad.net>2021-05-17 11:08:50 +0200
commit68b0e6fdbd21c5fb7152e66da88a7983a7e4a855 (patch)
tree16fe3523e1e110448ee07571089349898544043f /mullvad-management-interface/src
parent03bea638ea4be5b1b1faf1a173f49866d5c50d52 (diff)
downloadmullvadvpn-68b0e6fdbd21c5fb7152e66da88a7983a7e4a855.tar.xz
mullvadvpn-68b0e6fdbd21c5fb7152e66da88a7983a7e4a855.zip
Add exit location CLI option
Diffstat (limited to 'mullvad-management-interface/src')
-rw-r--r--mullvad-management-interface/src/types.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/mullvad-management-interface/src/types.rs b/mullvad-management-interface/src/types.rs
index 07df610045..1309e8bf70 100644
--- a/mullvad-management-interface/src/types.rs
+++ b/mullvad-management-interface/src/types.rs
@@ -450,7 +450,10 @@ impl From<mullvad_types::relay_constraints::RelaySettings> for RelaySettings {
.option()
.map(IpVersion::from)
.map(IpVersionConstraint::from),
- exit_location: None,
+ exit_location: constraints
+ .wireguard_constraints
+ .exit_location
+ .and_then(|constraint| constraint.option().map(RelayLocation::from)),
}),
openvpn_constraints: Some(OpenvpnConstraints {
@@ -883,7 +886,9 @@ impl TryFrom<RelaySettingsUpdate> for mullvad_types::relay_constraints::RelaySet
Constraint::Any
},
ip_version: Constraint::from(ip_version),
- exit_location: None,
+ exit_location: constraints
+ .exit_location
+ .map(Constraint::<mullvad_types::relay_constraints::LocationConstraint>::from),
}
}),
openvpn_constraints: settings.openvpn_constraints.map(|constraints| {