diff options
| author | Emīls <emils@mullvad.net> | 2020-11-30 11:17:38 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-11-30 11:17:38 +0000 |
| commit | 68b16559eced183dea59499312f3c7fd2bc5c002 (patch) | |
| tree | 4c59d99e3b75884dd42f6de92e7183411f0ea0f7 | |
| parent | 2245c9c286124e490f12cb1d34da74723d5b1c49 (diff) | |
| parent | df9c3527fb265adc8d9366f608f59780aac27157 (diff) | |
| download | mullvadvpn-68b16559eced183dea59499312f3c7fd2bc5c002.tar.xz mullvadvpn-68b16559eced183dea59499312f3c7fd2bc5c002.zip | |
Merge branch 'dont-log-when-wireguard-times-out' into master
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f8a8ec1269..b239e10c8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ Line wrap the file at 100 chars. Th - Upgrade OpenVPN from 2.4.9 to 2.5.0. - Upgrade Electron from 8.5.2 to Electron 11.0.2. - Upgrade wireguard-go to v0.0.20201118. +- Reduce logging about time outs when conneting to a WireGuard tunnel. #### Android - Remove the Quit button. diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 614d82e233..60e836a4da 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -168,6 +168,12 @@ impl ConnectingState { ); Some(ErrorStateCause::VirtualAdapterProblem) } + tunnel::Error::WireguardTunnelMonitoringError( + tunnel::wireguard::Error::TimeoutError, + ) => { + log::debug!("WireGuard tunnel timed out"); + None + } error => { warn!( "{}", |