summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2020-01-08 13:26:48 +0100
committerLinus Färnstrand <linus@mullvad.net>2020-01-08 13:26:48 +0100
commit233690c4e1bd67cc971ff36516f96bcfa29056cc (patch)
treeea7d8cf722715e8b08698e2c80014ddbbe45d421
parent17586c0ab88afd639611feec66f4b3850d531959 (diff)
parenteab97673e4d9917fda16d1cec572b5744341dc71 (diff)
downloadmullvadvpn-233690c4e1bd67cc971ff36516f96bcfa29056cc.tar.xz
mullvadvpn-233690c4e1bd67cc971ff36516f96bcfa29056cc.zip
Merge branch 'increase-openvpn-timeout'
-rw-r--r--CHANGELOG.md3
-rw-r--r--talpid-core/src/process/openvpn.rs2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c00f4c100..b9540a353b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ Line wrap the file at 100 chars. Th
- Add translations for Finnish and Danish.
### Changed
+- Increase OpenVPN ping timeout from 20 to 25 seconds. Might make working tunnels disconnect
+ a bit less frequently.
+
#### Linux
- DNS management with static `/etc/resolv.conf` will now work even when no
`/etc/resolv.conf` exists.
diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs
index da18d87074..e07be4fa16 100644
--- a/talpid-core/src/process/openvpn.rs
+++ b/talpid-core/src/process/openvpn.rs
@@ -21,7 +21,7 @@ static BASE_ARGUMENTS: &[&[&str]] = &[
#[cfg(windows)]
&["--dev-type", "tun"],
&["--ping", "4"],
- &["--ping-exit", "20"],
+ &["--ping-exit", "25"],
&["--connect-timeout", "30"],
&["--connect-retry", "0", "0"],
&["--connect-retry-max", "1"],