diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-02-28 10:28:42 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-02-28 11:08:36 +0100 |
| commit | f2e71de32cde3c8c29dc12349b1d1e147fbc6296 (patch) | |
| tree | 450f90c56ae4f00b82e6a6e1f4f82f8e66147a2f | |
| parent | f5f60e311641a26c37bf3495a9f02251a82d7e4d (diff) | |
| download | mullvadvpn-f2e71de32cde3c8c29dc12349b1d1e147fbc6296.tar.xz mullvadvpn-f2e71de32cde3c8c29dc12349b1d1e147fbc6296.zip | |
Retry if PSK negotiation fails for any reason
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c47e21d55..696f1435a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ Line wrap the file at 100 chars. Th - Fix close to expiry notification not showing unless app is opened once within the last three days in the desktop app. - Fix desktop app not quitting properly after switching from unpinned to pinned window. +- Retry if PQ PSK negotiation fails for any reason. #### Android - Fix adaptive app icon which previously had a displaced nose and some other oddities. diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index a10b6fa4f5..ac8e0debd9 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -494,9 +494,7 @@ fn should_retry(error: &tunnel::Error, retry_attempt: u32) -> bool { tunnel::Error::WireguardTunnelMonitoringError(Error::ObfuscatorError(_)) => true, - tunnel::Error::WireguardTunnelMonitoringError(Error::PskNegotiationError( - talpid_tunnel_config_client::Error::GrpcConnectError(_), - )) => true, + tunnel::Error::WireguardTunnelMonitoringError(Error::PskNegotiationError(_)) => true, #[cfg(not(windows))] tunnel::Error::WireguardTunnelMonitoringError(Error::TunnelError( |