summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2018-07-09 13:31:48 +0100
committerOdd Stranne <odd@mullvad.net>2018-07-10 11:32:03 +0200
commitc7b4c7ffe6a8216efb31ed26028be40c51cc6093 (patch)
tree7cae6bdf4df80859b0280ed207c69b34cb7df10d
parente308d800a98acf793404397236fd33a9b79daffa (diff)
downloadmullvadvpn-c7b4c7ffe6a8216efb31ed26028be40c51cc6093.tar.xz
mullvadvpn-c7b4c7ffe6a8216efb31ed26028be40c51cc6093.zip
Rename 'set_*' functions in talpid-core for building the OpenVPN command
-rw-r--r--talpid-core/src/process/openvpn.rs4
-rw-r--r--talpid-core/src/tunnel/mod.rs4
2 files changed, 4 insertions, 4 deletions
diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs
index ba0e5f20e4..0a5e93a084 100644
--- a/talpid-core/src/process/openvpn.rs
+++ b/talpid-core/src/process/openvpn.rs
@@ -122,14 +122,14 @@ impl OpenVpnCommand {
}
/// Sets extra options
- pub fn set_tunnel_options(&mut self, tunnel_options: &net::OpenVpnTunnelOptions) -> &mut Self {
+ pub fn tunnel_options(&mut self, tunnel_options: &net::OpenVpnTunnelOptions) -> &mut Self {
self.tunnel_options = *tunnel_options;
self
}
/// Sets the tunnel alias which will be used to identify a tunnel device that will be used by
/// OpenVPN.
- pub fn set_tunnel_alias(&mut self, tunnel_alias: Option<OsString>) -> &mut Self {
+ pub fn tunnel_alias(&mut self, tunnel_alias: Option<OsString>) -> &mut Self {
self.tunnel_alias = tunnel_alias;
self
}
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 3d56eb6e79..cd90924ac1 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -194,10 +194,10 @@ impl TunnelMonitor {
}
cmd.remote(remote)
.user_pass(user_pass_file)
- .set_tunnel_options(&options)
+ .tunnel_options(&options)
+ .tunnel_alias(tunnel_alias)
.ca(resource_dir.join("ca.crt"))
.crl(resource_dir.join("crl.pem"));
- cmd.set_tunnel_alias(tunnel_alias);
if let Some(log) = log {
cmd.log(log);
}