diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-10-08 13:28:36 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-10-08 13:28:36 +0100 |
| commit | d7455ad56c13129ea8b3c90556282a28a7858065 (patch) | |
| tree | 2ef6338168c65105e599b396004ee77bc573f2d1 | |
| parent | af6141a0667665a078d1cb90202accaeaca21fef (diff) | |
| parent | dacb0eacafea6ea1a9769c2c8c560d29fbe38e1d (diff) | |
| download | mullvadvpn-d7455ad56c13129ea8b3c90556282a28a7858065.tar.xz mullvadvpn-d7455ad56c13129ea8b3c90556282a28a7858065.zip | |
Merge branch 'set-connect-timeout-in-openvpn'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | talpid-core/src/process/openvpn.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 607f794303..e63839a195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ Line wrap the file at 100 chars. Th - Auto-hide scrollbars on macOS only, leaving them visible on other platforms. - Instead of showing the public IP of the device in the UI, we show the hostname of the VPN server 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. #### 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 6cc91371a0..dad14f6673 100644 --- a/talpid-core/src/process/openvpn.rs +++ b/talpid-core/src/process/openvpn.rs @@ -22,6 +22,7 @@ static BASE_ARGUMENTS: &[&[&str]] = &[ &["--dev-type", "tun"], &["--ping", "3"], &["--ping-exit", "15"], + &["--connect-timeout", "30"], &["--connect-retry", "0", "0"], &["--connect-retry-max", "1"], &["--remote-cert-tls", "server"], |