summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2018-07-06 17:49:32 +0100
committerOdd Stranne <odd@mullvad.net>2018-07-10 11:32:03 +0200
commite308d800a98acf793404397236fd33a9b79daffa (patch)
tree7f731ee65fa56824da890f916a64453c2ef9f34d
parent2314d5a5d0b89b5eca6bd868df0c83c4a46aba52 (diff)
downloadmullvadvpn-e308d800a98acf793404397236fd33a9b79daffa.tar.xz
mullvadvpn-e308d800a98acf793404397236fd33a9b79daffa.zip
Specify a tunnel interface by it's alias on Windows
-rw-r--r--mullvad-daemon/src/main.rs13
1 files changed, 13 insertions, 0 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index d2dc1da4f7..abfc83b764 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -129,6 +129,8 @@ const DAEMON_LOG_FILENAME: &str = "daemon.log";
const OPENVPN_LOG_FILENAME: &str = "openvpn.log";
const WIREGUARD_LOG_FILENAME: &str = "wireguard.log";
+#[cfg(windows)]
+const TUNNEL_INTERFACE_ALIAS: &str = "Mullvad";
/// All events that can happen in the daemon. Sent from various threads and exposed interfaces.
pub enum DaemonEvent {
@@ -742,9 +744,20 @@ impl Daemon {
};
let tunnel_options = self.settings.get_tunnel_options();
+ let tunnel_alias = {
+ #[cfg(windows)]
+ {
+ Some(TUNNEL_INTERFACE_ALIAS.into())
+ }
+ #[cfg(not(windows))]
+ {
+ None
+ }
+ };
TunnelMonitor::new(
tunnel_endpoint,
&tunnel_options,
+ tunnel_alias,
account_token,
tunnel_log.as_ref().map(PathBuf::as_path),
&self.resource_dir,