diff options
| author | Emīls <emils@mullvad.net> | 2020-07-15 12:37:17 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-07-16 15:57:02 +0100 |
| commit | 598bb3542564d555c7d75fdf49eb458c9c320c7e (patch) | |
| tree | 683b6770be37ebbfb309d63c72fb7cfcf564db3b /mullvad-cli/src | |
| parent | 16847ca723bfbd9750136228b3c1b1665a2cbce4 (diff) | |
| download | mullvadvpn-598bb3542564d555c7d75fdf49eb458c9c320c7e.tar.xz mullvadvpn-598bb3542564d555c7d75fdf49eb458c9c320c7e.zip | |
Use talpid_types TunnelType instead of TunnelProtocol
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index e9921b972b..c4e8c72c81 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -9,11 +9,13 @@ use std::{ use mullvad_types::{ relay_constraints::{ Constraint, OpenVpnConstraints, RelayConstraintsUpdate, RelaySettingsUpdate, - TunnelProtocol, WireguardConstraints, + WireguardConstraints, }, ConnectionConfig, CustomTunnelEndpoint, }; -use talpid_types::net::{all_of_the_internet, openvpn, wireguard, Endpoint, TransportProtocol}; +use talpid_types::net::{ + all_of_the_internet, openvpn, wireguard, Endpoint, TransportProtocol, TunnelType, +}; pub struct Relay; @@ -318,8 +320,8 @@ impl Relay { fn set_tunnel_protocol(&self, matches: &clap::ArgMatches<'_>) -> Result<()> { let tunnel_protocol = match matches.value_of("tunnel protocol").unwrap() { - "wireguard" => Constraint::Only(TunnelProtocol::Wireguard), - "openvpn" => Constraint::Only(TunnelProtocol::OpenVpn), + "wireguard" => Constraint::Only(TunnelType::Wireguard), + "openvpn" => Constraint::Only(TunnelType::OpenVpn), "any" => Constraint::Any, _ => unreachable!(), }; |
