diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-12-03 14:59:53 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-12-03 15:21:10 +0100 |
| commit | 73dec8e90c9c07712ceab5f0d780d15c67483137 (patch) | |
| tree | 504c79eac5e475c1ab1cb3ab52b2c9cf7014d8a7 | |
| parent | 8e937ce1809246083f5bbd24c4b8de020c6b4fea (diff) | |
| download | mullvadvpn-73dec8e90c9c07712ceab5f0d780d15c67483137.tar.xz mullvadvpn-73dec8e90c9c07712ceab5f0d780d15c67483137.zip | |
Increase timeout for OpenVPN to die on windows
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/openvpn.rs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ea3be3385..95555859bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ Line wrap the file at 100 chars. Th - Handle sleep/resume events to quickly restore the tunnel when the machine wakes up. - Add default route to fix NLA issues (Microsoft Store/Office/etc say the machine is offline). - Update installer to not rely on WMI when enumerating network adapters. +- Increase timeout waiting for OpenVPN to shut down cleanly. ## [2018.5] - 2018-11-15 diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs index c57be646d8..dd7af9e5a2 100644 --- a/talpid-core/src/tunnel/openvpn.rs +++ b/talpid-core/src/tunnel/openvpn.rs @@ -31,7 +31,11 @@ mod errors { pub use self::errors::*; +#[cfg(unix)] static OPENVPN_DIE_TIMEOUT: Duration = Duration::from_secs(4); +#[cfg(windows)] +static OPENVPN_DIE_TIMEOUT: Duration = Duration::from_secs(30); + /// Struct for monitoring an OpenVPN process. #[derive(Debug)] |