summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2024-10-17 09:33:49 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-10-18 15:49:31 +0200
commit58e1123f7844104f36ab326d4f2ee90043034c8e (patch)
treef6e94bc147a83baaefd9cdd47a0128b5de3e27a8
parent031b8a797ed88340d0a8a5466805605f00c2300a (diff)
downloadmullvadvpn-58e1123f7844104f36ab326d4f2ee90043034c8e.tar.xz
mullvadvpn-58e1123f7844104f36ab326d4f2ee90043034c8e.zip
Do not use multihop on Android (yet)
-rw-r--r--mullvad-relay-selector/src/relay_selector/mod.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/mullvad-relay-selector/src/relay_selector/mod.rs b/mullvad-relay-selector/src/relay_selector/mod.rs
index 9122c340c8..c71a85f378 100644
--- a/mullvad-relay-selector/src/relay_selector/mod.rs
+++ b/mullvad-relay-selector/src/relay_selector/mod.rs
@@ -674,7 +674,12 @@ impl RelaySelector {
custom_lists: &CustomListsSettings,
parsed_relays: &ParsedRelays,
) -> Result<WireguardConfig, Error> {
- // TODO: Make sure that this works differently on Android.
+ // TODO: Remove when Android gets support for multihop.
+ if cfg!(target_os = "android") {
+ let relay = Self::get_wireguard_singlehop_config(query, custom_lists, parsed_relays)
+ .ok_or(Error::NoRelay)?;
+ return Ok(WireguardConfig::from(relay));
+ }
let inner = if query.singlehop() {
match Self::get_wireguard_singlehop_config(query, custom_lists, parsed_relays) {
Some(exit) => WireguardConfig::from(exit),