diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-12-17 15:32:25 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-12-17 15:32:25 +0100 |
| commit | 9bb408fd13c12fa31118638d108af4ce7a449b91 (patch) | |
| tree | 6080eb8ff4f837c41b95566c957c88665e8a8d02 | |
| parent | 209cc97133e16286e86ab919fcbbbfeba66d4b11 (diff) | |
| parent | 82f775855b37cbcaf206a4f6713bc3c33a201775 (diff) | |
| download | mullvadvpn-9bb408fd13c12fa31118638d108af4ce7a449b91.tar.xz mullvadvpn-9bb408fd13c12fa31118638d108af4ce7a449b91.zip | |
Merge branch 'win-increase-txn-timeout'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | talpid-core/src/firewall/windows.rs | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c22f9ae3..db6e9d55b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ Line wrap the file at 100 chars. Th - Update wireguard-nt to 0.10.1. - Make wireguard-nt the default driver for WireGuard. This is used instead of wireguard-go and Wintun. +- Increase firewall transaction timeout from 2 to 5 seconds. ### Fixed - Always kill `sslocal` if the tunnel monitor fails to start when using bridges. diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs index 989e453ff7..26f773eff4 100644 --- a/talpid-core/src/firewall/windows.rs +++ b/talpid-core/src/firewall/windows.rs @@ -45,7 +45,8 @@ pub enum Error { SetTunMetric(#[error(source)] crate::winnet::Error), } -const WINFW_TIMEOUT_SECONDS: u32 = 2; +/// Timeout for acquiring the WFP transaction lock +const WINFW_TIMEOUT_SECONDS: u32 = 5; /// The Windows implementation for the firewall and DNS. pub struct Firewall(()); |