diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-26 19:22:00 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-29 09:55:34 +0000 |
| commit | 6ff0b0c9823274d135df006d63611c8d29555f19 (patch) | |
| tree | 3063b743e72c4b8e42b0bbc4127af9e4e120dddb | |
| parent | 351699a3419145f30c27c4040d6a0a2e27d736e3 (diff) | |
| download | mullvadvpn-6ff0b0c9823274d135df006d63611c8d29555f19.tar.xz mullvadvpn-6ff0b0c9823274d135df006d63611c8d29555f19.zip | |
Change default relay constraints on Android
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 562bf0bee8..e91b8ab209 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -93,7 +93,8 @@ impl RelaySettings { } } -#[derive(Debug, Default, Clone, Eq, PartialEq, Deserialize, Serialize)] +#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)] +#[cfg_attr(not(target_os = "android"), derive(Default))] pub struct RelayConstraints { pub location: Constraint<LocationConstraint>, pub tunnel_protocol: Constraint<TunnelProtocol>, @@ -101,6 +102,18 @@ pub struct RelayConstraints { pub openvpn_constraints: OpenVpnConstraints, } +#[cfg(target_os = "android")] +impl Default for RelayConstraints { + fn default() -> Self { + RelayConstraints { + location: Constraint::Any, + tunnel_protocol: Constraint::Only(TunnelProtocol::Wireguard), + wireguard_constraints: WireguardConstraints::default(), + openvpn_constraints: OpenVpnConstraints::default(), + } + } +} + impl RelayConstraints { pub fn merge(&self, update: RelayConstraintsUpdate) -> Self { RelayConstraints { |
