diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-09-23 11:32:12 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-09-23 12:35:12 +0200 |
| commit | d3357bbb43880524bd0b760ddd17ea0597a4ef19 (patch) | |
| tree | f1a40014a832897b979aae2ecbd707f1aa9f712f | |
| parent | ac18bfca43644580a98d251fadead712d23af00b (diff) | |
| download | mullvadvpn-d3357bbb43880524bd0b760ddd17ea0597a4ef19.tar.xz mullvadvpn-d3357bbb43880524bd0b760ddd17ea0597a4ef19.zip | |
Only reset firewall when target state is unsecured
| -rw-r--r-- | mullvad-daemon/src/main.rs | 3 |
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(()), |