diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-03-04 14:28:52 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-03-05 09:39:30 +0100 |
| commit | be0877a65e0f5e53a06ca7ee7a1303b5716b41dd (patch) | |
| tree | 544ab5d544ba148c7656d51d1ab508e01f218629 /mullvad-cli/src | |
| parent | a2be04b4792ec942bd20d5fb69bcfa8cf7d854d7 (diff) | |
| download | mullvadvpn-be0877a65e0f5e53a06ca7ee7a1303b5716b41dd.tar.xz mullvadvpn-be0877a65e0f5e53a06ca7ee7a1303b5716b41dd.zip | |
Remove automatic tunnel type
Co-authored-by: Markus Pettersson <markus.pettersson@mullvad.net>
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 1f2d1f9192..b3fa3812ef 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -96,8 +96,8 @@ pub enum SetCommands { #[clap(subcommand)] Tunnel(SetTunnelCommands), - /// Set tunnel protocol to use: 'any', 'wireguard', or 'openvpn'. - TunnelProtocol { protocol: Constraint<TunnelType> }, + /// Set tunnel protocol to use: 'wireguard', or 'openvpn'. + TunnelProtocol { protocol: TunnelType }, /// Set a custom VPN relay to use #[clap(subcommand)] @@ -565,27 +565,18 @@ impl Relay { // Depending on the current configured tunnel protocol, we filter only the relevant hosts let location_constraint = match constraints.tunnel_protocol { - Constraint::Any => { + TunnelType::OpenVpn => { resolve_location_constraint(&mut rpc, location_constraint_args, |relay| { - relay.active && relay.endpoint_data != RelayEndpointData::Bridge + relay.active && relay.endpoint_data == RelayEndpointData::Openvpn + }) + .await + } + TunnelType::Wireguard => { + resolve_location_constraint(&mut rpc, location_constraint_args, |relay| { + relay.active && matches!(relay.endpoint_data, RelayEndpointData::Wireguard(_)) }) .await } - Constraint::Only(tunnel) => match tunnel { - TunnelType::OpenVpn => { - resolve_location_constraint(&mut rpc, location_constraint_args, |relay| { - relay.active && relay.endpoint_data == RelayEndpointData::Openvpn - }) - .await - } - TunnelType::Wireguard => { - resolve_location_constraint(&mut rpc, location_constraint_args, |relay| { - relay.active - && matches!(relay.endpoint_data, RelayEndpointData::Wireguard(_)) - }) - .await - } - }, }?; Self::update_constraints(|constraints| { @@ -721,7 +712,7 @@ impl Relay { } } - async fn set_tunnel_protocol(protocol: Constraint<TunnelType>) -> Result<()> { + async fn set_tunnel_protocol(protocol: TunnelType) -> Result<()> { Self::update_constraints(|constraints| { constraints.tunnel_protocol = protocol; }) |