summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--mullvad-daemon/src/main.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 9bd4d195fe..535d13c0ec 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -298,7 +298,6 @@ impl Daemon {
}
self.relay_endpoint = None;
self.tunnel_metadata = None;
- self.reset_security_policy()?;
self.tunnel_close_handle = None;
self.set_state(TunnelState::NotRunning)
}
@@ -477,12 +476,12 @@ impl Daemon {
if let Err(e) = self.start_tunnel().chain_err(|| "Failed to start tunnel") {
error!("{}", e.display_chain());
self.relay_endpoint = None;
- self.reset_security_policy()?;
self.management_interface_broadcaster.notify_error(&e);
self.set_target_state(TargetState::Unsecured)?;
}
Ok(())
}
+ (TargetState::Unsecured, TunnelState::NotRunning) => self.reset_security_policy(),
(TargetState::Unsecured, TunnelState::Connecting) |
(TargetState::Unsecured, TunnelState::Connected) => self.kill_tunnel(),
(..) => Ok(()),