summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2020-01-09 14:42:25 +0000
committerEmīls <emils@mullvad.net>2020-01-09 14:42:25 +0000
commit96f6003a3d514b51ed257e9b0fb9e6d448e14888 (patch)
treec765e5fc1de435925ef8b00299b0bac624d7904b
parent984b2f326c630ff2afd9dd82f7fc72ffcff37e93 (diff)
parent10f804d36e2f07f349c482ff6a72519a7c6146bc (diff)
downloadmullvadvpn-96f6003a3d514b51ed257e9b0fb9e6d448e14888.tar.xz
mullvadvpn-96f6003a3d514b51ed257e9b0fb9e6d448e14888.zip
Merge branch 'wg-bump-timeout-to-15-seconds'
-rw-r--r--CHANGELOG.md1
-rw-r--r--talpid-core/src/tunnel/wireguard/mod.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c494003714..ea3d4af60e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ Line wrap the file at 100 chars. Th
### Changed
- Increase OpenVPN ping timeout from 20 to 25 seconds. Might make working tunnels disconnect
a bit less frequently.
+- Increase WireGuard ping timeout from 7 to 15 seconds.
#### Linux
- DNS management with static `/etc/resolv.conf` will now work even when no
diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs
index a2c632d36f..9b84a83cf0 100644
--- a/talpid-core/src/tunnel/wireguard/mod.rs
+++ b/talpid-core/src/tunnel/wireguard/mod.rs
@@ -14,7 +14,7 @@ pub mod wireguard_go;
pub use self::wireguard_go::WgGoTunnel;
// amount of seconds to run `ping` until it returns.
-const PING_TIMEOUT: u16 = 7;
+const PING_TIMEOUT: u16 = 15;
pub type Result<T> = std::result::Result<T, Error>;