summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-10-08 15:08:36 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-10-08 15:08:36 +0200
commitfbe0bcadcf0ce69d498324c451100e41ea5bcfa7 (patch)
treeb7be4c3aba3329479cba140abc91520528cff91e
parentd7455ad56c13129ea8b3c90556282a28a7858065 (diff)
parent7d7526a4f8901473edff5fbd9b5764330c9d3bf4 (diff)
downloadmullvadvpn-fbe0bcadcf0ce69d498324c451100e41ea5bcfa7.tar.xz
mullvadvpn-fbe0bcadcf0ce69d498324c451100e41ea5bcfa7.zip
Merge branch 'increase-ping-exit'
-rw-r--r--CHANGELOG.md2
-rw-r--r--talpid-core/src/process/openvpn.rs4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e63839a195..4ee8434453 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@ Line wrap the file at 100 chars. Th
the app is connected to. Or nothing if not connected anywhere.
- Passing `--connect-timeout 30` to `openvpn` to decrease the time the daemon
will wait until it tries to reconnect again in the case of a broken TCP connection.
+- Increase timeout parameter to OpenVPN from 15 to 20 seconds. Should make active VPN tunnels drop
+ less frequent when on unstable networks.
#### Linux
- Moved CLI binary to `/usr/bin/` as to have the CLI binary in the user's `$PATH` by default.
diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs
index dad14f6673..e25e2bf652 100644
--- a/talpid-core/src/process/openvpn.rs
+++ b/talpid-core/src/process/openvpn.rs
@@ -20,8 +20,8 @@ static BASE_ARGUMENTS: &[&[&str]] = &[
&["--dev", "tun"],
#[cfg(windows)]
&["--dev-type", "tun"],
- &["--ping", "3"],
- &["--ping-exit", "15"],
+ &["--ping", "4"],
+ &["--ping-exit", "20"],
&["--connect-timeout", "30"],
&["--connect-retry", "0", "0"],
&["--connect-retry-max", "1"],