summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--mullvad-cli/src/cmds/custom_relay.rs3
-rw-r--r--mullvad-daemon/src/management_interface.rs4
2 files changed, 5 insertions, 2 deletions
diff --git a/mullvad-cli/src/cmds/custom_relay.rs b/mullvad-cli/src/cmds/custom_relay.rs
index 172040322e..ab9a148fb3 100644
--- a/mullvad-cli/src/cmds/custom_relay.rs
+++ b/mullvad-cli/src/cmds/custom_relay.rs
@@ -26,7 +26,8 @@ impl Command for CustomRelay {
.help("The port of the relay")
.required(true))
.arg(clap::Arg::with_name("protocol")
- .help("The transport protocol. UDP is recommended as it usually results in higher throughput than TCP")
+ .help("The transport protocol. UDP is recommended as it usually results in
+ higher throughput than TCP")
.possible_values(&["udp", "tcp"])
.default_value("udp")))
.subcommand(clap::SubCommand::with_name("remove")
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 4826e8a97b..ff63fcfde7 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -322,7 +322,9 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem
fn set_custom_relay(&self, custom_relay: RelayEndpoint) -> BoxFuture<(), Error> {
trace!("set_custom_relay");
let (tx, rx) = sync::oneshot::channel();
- let future = self.send_command_to_daemon(TunnelCommand::SetCustomRelay(tx, Some(custom_relay)),)
+
+ let message = TunnelCommand::SetCustomRelay(tx, Some(custom_relay));
+ let future = self.send_command_to_daemon(message)
.and_then(|_| rx.map_err(|_| Error::internal_error()));
Box::new(future)
}