summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-04-22 17:30:05 +0200
committerDavid Lönnhager <david.l@mullvad.net>2021-04-29 12:17:18 +0200
commit3cf03af4ad377b3b2cb003ed6819dcd742b8bb17 (patch)
treebaaa527c17006e996e9ff98a074c28e46fe41f8f
parent54d009a0485e1a9616d85afea023b47a9812ad9a (diff)
downloadmullvadvpn-3cf03af4ad377b3b2cb003ed6819dcd742b8bb17.tar.xz
mullvadvpn-3cf03af4ad377b3b2cb003ed6819dcd742b8bb17.zip
Implement From for LocationConstraint
-rw-r--r--mullvad-management-interface/src/types.rs25
1 files changed, 25 insertions, 0 deletions
diff --git a/mullvad-management-interface/src/types.rs b/mullvad-management-interface/src/types.rs
index 279e9d7b37..0549bb6f83 100644
--- a/mullvad-management-interface/src/types.rs
+++ b/mullvad-management-interface/src/types.rs
@@ -1,5 +1,7 @@
pub use prost_types::{Duration, Timestamp};
+use mullvad_types::relay_constraints::Constraint;
+
tonic::include_proto!("mullvad_daemon.management_interface");
impl From<mullvad_types::version::AppVersionInfo> for AppVersionInfo {
@@ -94,6 +96,29 @@ impl From<IpVersion> for IpVersionConstraint {
}
}
+impl From<mullvad_types::relay_constraints::LocationConstraint> for RelayLocation {
+ fn from(location: mullvad_types::relay_constraints::LocationConstraint) -> Self {
+ use mullvad_types::relay_constraints::LocationConstraint;
+
+ match location {
+ LocationConstraint::Country(country) => Self {
+ country,
+ ..Default::default()
+ },
+ LocationConstraint::City(country, city) => Self {
+ country,
+ city,
+ ..Default::default()
+ },
+ LocationConstraint::Hostname(country, city, hostname) => Self {
+ country,
+ city,
+ hostname,
+ },
+ }
+ }
+}
+
impl From<TransportProtocol> for talpid_types::net::TransportProtocol {
fn from(protocol: TransportProtocol) -> Self {
match protocol {