summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-07-16 11:27:33 +0100
committerEmīls Piņķis <emils@mullvad.net>2019-07-26 11:25:54 +0100
commitace147c273e058e85df619fb4300e3953cedd2dd (patch)
tree794c27eaa8519083c26c1ac02c27209f34f7fe56 /mullvad-cli
parentacb390ea11be0975f2166b4bf0fa0977c1efe919 (diff)
downloadmullvadvpn-ace147c273e058e85df619fb4300e3953cedd2dd.tar.xz
mullvadvpn-ace147c273e058e85df619fb4300e3953cedd2dd.zip
Update CLI
Diffstat (limited to 'mullvad-cli')
-rw-r--r--mullvad-cli/src/cmds/relay.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index c9bf61be43..fe411b06a2 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -9,7 +9,7 @@ use std::{
use mullvad_types::{
relay_constraints::{
Constraint, OpenVpnConstraints, RelayConstraintsUpdate, RelaySettingsUpdate,
- TunnelConstraints, WireguardConstraints,
+ TunnelProtocol, WireguardConstraints,
},
ConnectionConfig, CustomTunnelEndpoint,
};
@@ -271,7 +271,7 @@ impl Relay {
self.update_constraints(RelaySettingsUpdate::Normal(RelayConstraintsUpdate {
location: Some(location_constraint),
- tunnel: None,
+ ..Default::default()
}))
}
@@ -287,17 +287,17 @@ impl Relay {
}
self.update_constraints(RelaySettingsUpdate::Normal(RelayConstraintsUpdate {
location: None,
- tunnel: Some(Constraint::Only(TunnelConstraints::Wireguard(
- WireguardConstraints { port },
- ))),
+ tunnel_protocol: Some(Constraint::Only(TunnelProtocol::Wireguard)),
+ wireguard_constraints: Some(WireguardConstraints { port }),
+ ..Default::default()
}))
}
"openvpn" => {
self.update_constraints(RelaySettingsUpdate::Normal(RelayConstraintsUpdate {
location: None,
- tunnel: Some(Constraint::Only(TunnelConstraints::OpenVpn(
- OpenVpnConstraints { port, protocol },
- ))),
+ tunnel_protocol: Some(Constraint::Any),
+ openvpn_constraints: Some(OpenVpnConstraints { port, protocol }),
+ ..Default::default()
}))
}
_ => unreachable!(),