summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-03-20 17:44:03 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-03-20 17:44:03 +0100
commitb83abbdc7b943cd4c1a451588445bf6615609c70 (patch)
treec32426a979aae2ece700466b0b4d3da949f89cb1 /mullvad-cli/src
parent4158deaa9e10947a14d097975e74545ced362f5a (diff)
parenta11973b703e293a124873a4b7ab8a1e895c80c51 (diff)
downloadmullvadvpn-b83abbdc7b943cd4c1a451588445bf6615609c70.tar.xz
mullvadvpn-b83abbdc7b943cd4c1a451588445bf6615609c70.zip
Merge branch 'rename-tunnel-parameters'
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/relay.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index c48a990f62..e87512e0c2 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -9,8 +9,8 @@ use mullvad_types::relay_constraints::{Constraint, LocationConstraint, OpenVpnCo
use mullvad_types::relay_list::RelayList;
use rpc;
-use talpid_types::net::{OpenVpnParameters, TransportProtocol, TunnelParameters,
- WireguardParameters};
+use talpid_types::net::{OpenVpnEndpointData, TransportProtocol, TunnelEndpointData,
+ WireguardEndpointData};
pub struct Relay;
@@ -135,11 +135,11 @@ impl Relay {
let host = value_t!(matches.value_of("host"), String).unwrap_or_else(|e| e.exit());
let port = value_t!(matches.value_of("port"), u16).unwrap_or_else(|e| e.exit());
let tunnel = match matches.value_of("tunnel").unwrap() {
- "openvpn" => TunnelParameters::OpenVpn(OpenVpnParameters {
+ "openvpn" => TunnelEndpointData::OpenVpn(OpenVpnEndpointData {
port,
protocol: value_t!(matches.value_of("protocol"), TransportProtocol).unwrap(),
}),
- "wireguard" => TunnelParameters::Wireguard(WireguardParameters { port }),
+ "wireguard" => TunnelEndpointData::Wireguard(WireguardEndpointData { port }),
_ => unreachable!("Invalid tunnel protocol"),
};
self.update_constraints(RelaySettingsUpdate::CustomTunnelEndpoint(