summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-03-04 15:26:01 +0100
committerDavid Lönnhager <david.l@mullvad.net>2020-03-16 12:54:27 +0100
commita4a35669bdea5250e5c3fb93c662b94228a8967b (patch)
treeff1e4b99979cf1f63f4030721fda7816c971382e
parent8bbe10c47e8b87dbcb3b13de3aeb8e03c1546531 (diff)
downloadmullvadvpn-a4a35669bdea5250e5c3fb93c662b94228a8967b.tar.xz
mullvadvpn-a4a35669bdea5250e5c3fb93c662b94228a8967b.zip
Don't actually shut down the daemon when TemporaryShutdown is run
-rw-r--r--mullvad-daemon/src/lib.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index efe2890df3..27ae019cf0 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -1668,6 +1668,9 @@ where
}
fn on_temporary_shutdown(&mut self) {
+ // TODO: See if this can be made to also shut down the daemon
+ // without causing the service to be restarted.
+
// Cache the current target state
let cache_file = self.cache_dir.join(TARGET_START_STATE_FILE);
log::debug!("Saving tunnel target state to {}", cache_file.display());
@@ -1687,7 +1690,6 @@ where
if self.target_state == TargetState::Secured {
self.send_tunnel_command(TunnelCommand::BlockWhenDisconnected(true));
}
- self.trigger_shutdown_event();
}
/// Set the target state of the client. If it changed trigger the operations needed to