diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-07-07 14:40:05 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-07-07 14:40:05 +0200 |
| commit | ac15ef4e14d97b3e9f8ec1ac237d544d4264f550 (patch) | |
| tree | b94d2664d37b4bbfe45ea244d7dd5ad2965fa7c2 /mullvad-cli | |
| parent | 887349f12a71a2c6a3bce49ba7d86df353be71a6 (diff) | |
| parent | 7652f299b34003721923f53f47868b14eca3ae53 (diff) | |
| download | mullvadvpn-ac15ef4e14d97b3e9f8ec1ac237d544d4264f550.tar.xz mullvadvpn-ac15ef4e14d97b3e9f8ec1ac237d544d4264f550.zip | |
Merge branch 'relays-validate-ports'
Diffstat (limited to 'mullvad-cli')
| -rw-r--r-- | mullvad-cli/src/cmds/bridge.rs | 3 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 14 |
2 files changed, 5 insertions, 12 deletions
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs index b253ae63a9..27532f1416 100644 --- a/mullvad-cli/src/cmds/bridge.rs +++ b/mullvad-cli/src/cmds/bridge.rs @@ -439,8 +439,7 @@ impl Bridge { .filter_map(|mut city| { city.relays.retain(|relay| { relay.active - && relay.bridges.is_some() - && !relay.bridges.as_ref().unwrap().shadowsocks.is_empty() + && relay.endpoint_type == (types::relay::RelayType::Bridge as i32) }); if !city.relays.is_empty() { Some(city) diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 46d4567724..8e68adda6c 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -682,13 +682,9 @@ impl Relay { city.name, city.code, city.latitude, city.longitude ); for relay in &city.relays { - let tunnels = relay.tunnels.as_ref().unwrap(); - let supports_openvpn = !tunnels.openvpn.is_empty(); - let supports_wireguard = !tunnels.wireguard.is_empty(); - let support_msg = match (supports_openvpn, supports_wireguard) { - (true, true) => "OpenVPN and WireGuard", - (true, false) => "OpenVPN", - (false, true) => "WireGuard", + let support_msg = match relay.endpoint_type { + i if i == i32::from(types::relay::RelayType::Openvpn) => "OpenVPN", + i if i == i32::from(types::relay::RelayType::Wireguard) => "WireGuard", _ => unreachable!("Bug in relay filtering earlier on"), }; let ownership = if relay.owned { @@ -737,9 +733,7 @@ impl Relay { .filter_map(|mut city| { city.relays.retain(|relay| { relay.active - && relay.tunnels.is_some() - && !(relay.tunnels.as_ref().unwrap().openvpn.is_empty() - && relay.tunnels.as_ref().unwrap().wireguard.is_empty()) + && relay.endpoint_type != (types::relay::RelayType::Bridge as i32) }); if !city.relays.is_empty() { Some(city) |