diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-07-03 14:24:19 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-07-03 14:24:48 +0200 |
| commit | e040f561b96b6e5b5cc05010e0200dbd099cb72a (patch) | |
| tree | 8239d6dc9daadb764989ef585b9241e385da9756 | |
| parent | b96fade3d14c307237f681840443e3d166280d4b (diff) | |
| download | mullvadvpn-e040f561b96b6e5b5cc05010e0200dbd099cb72a.tar.xz mullvadvpn-e040f561b96b6e5b5cc05010e0200dbd099cb72a.zip | |
Move and add warning comment to close handle
| -rw-r--r-- | mullvad_daemon/src/main.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mullvad_daemon/src/main.rs b/mullvad_daemon/src/main.rs index f00a211d2c..f2c6f46835 100644 --- a/mullvad_daemon/src/main.rs +++ b/mullvad_daemon/src/main.rs @@ -116,12 +116,13 @@ impl TunnelState { struct Daemon { state: TunnelState, + // The tunnel_close_handle must only exist in the Connecting and Connected states! + tunnel_close_handle: Option<tunnel::CloseHandle>, last_broadcasted_state: SecurityState, target_state: TargetState, shutdown: bool, rx: mpsc::Receiver<DaemonEvent>, tx: mpsc::Sender<DaemonEvent>, - tunnel_close_handle: Option<tunnel::CloseHandle>, management_interface_broadcaster: management_interface::EventBroadcaster, // Just for testing. A cyclic iterator iterating over the hardcoded remotes, @@ -138,12 +139,12 @@ impl Daemon { Ok( Daemon { state: TunnelState::NotRunning, + tunnel_close_handle: None, last_broadcasted_state: SecurityState::Unsecured, target_state: TargetState::Unsecured, shutdown: false, rx, tx, - tunnel_close_handle: None, management_interface_broadcaster, remote_iter: REMOTES.iter().cloned().cycle(), account_token: None, |