diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-29 14:35:50 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-29 14:35:50 -0300 |
| commit | 74e55c69d43decfeeab76590ca29c35062cec24f (patch) | |
| tree | 3063b743e72c4b8e42b0bbc4127af9e4e120dddb | |
| parent | 8040ffc95132450c5faea766292369d3e6dda283 (diff) | |
| parent | 6ff0b0c9823274d135df006d63611c8d29555f19 (diff) | |
| download | mullvadvpn-74e55c69d43decfeeab76590ca29c35062cec24f.tar.xz mullvadvpn-74e55c69d43decfeeab76590ca29c35062cec24f.zip | |
Merge branch 'fix-relay-selection'
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 8 | ||||
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 15 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 1 |
3 files changed, 14 insertions, 10 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 025c535e6c..22ab4c7cd7 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -248,7 +248,6 @@ impl RelaySelector { // any constraints that are explicitly specified. match original_constraints.tunnel_protocol { // If no tunnel protocol is selected, use preferred constraints - #[cfg(not(target_os = "android"))] Constraint::Any => { if original_constraints.openvpn_constraints.port.is_any() && original_constraints.openvpn_constraints.protocol.is_any() @@ -264,20 +263,13 @@ impl RelaySelector { }; } } - #[cfg(not(target_os = "android"))] Constraint::Only(TunnelProtocol::OpenVpn) => { relay_constraints.openvpn_constraints = original_constraints.openvpn_constraints; } - #[cfg(not(target_os = "android"))] Constraint::Only(TunnelProtocol::Wireguard) => { relay_constraints.wireguard_constraints = original_constraints.wireguard_constraints; } - #[cfg(target_os = "android")] - _ => { - relay_constraints.wireguard_constraints = - original_constraints.wireguard_constraints; - } } relay_constraints 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 { diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 94eebdf818..d9ac78442a 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -60,7 +60,6 @@ impl ConnectingState { shared_values.firewall.apply_policy(policy) } - #[cfg_attr(target_os = "android", allow(unused_variables))] fn start_tunnel( parameters: TunnelParameters, log_dir: &Option<PathBuf>, |