Coalesce tunnel device errors on Windows

1 files changed, 5 insertions, 9 deletions

diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 75f3d8eebf..ec8ddc5f2c 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -37,7 +37,7 @@ pub(crate) type TunnelCloseEvent = Fuse<oneshot::Receiver<Option<ErrorStateCause
 const MAX_ATTEMPTS_WITH_SAME_TUN: u32 = 5;
 const MIN_TUNNEL_ALIVE_TIME: Duration = Duration::from_millis(1000);
 #[cfg(target_os = "windows")]
-const MAX_RECOVERABLE_FAIL_RETRIES: u32 = 4;
+const MAX_ATTEMPT_CREATE_TUN: u32 = 4;
 
 const INITIAL_ALLOWED_TUNNEL_TRAFFIC: AllowedTunnelTraffic = AllowedTunnelTraffic::None;
 
@@ -589,7 +589,6 @@ fn should_retry(error: &tunnel::Error, retry_attempt: u32) -> bool {
 
         tunnel::Error::WireguardTunnelMonitoringError(Error::PskNegotiationError(_)) => true,
 
-        #[cfg(not(windows))]
         tunnel::Error::WireguardTunnelMonitoringError(Error::TunnelError(
             TunnelError::RecoverableStartWireguardError,
         )) => true,
@@ -606,14 +605,11 @@ fn should_retry(error: &tunnel::Error, retry_attempt: u32) -> bool {
 
         #[cfg(windows)]
         tunnel::Error::WireguardTunnelMonitoringError(Error::TunnelError(
-            // This usually occurs when the tunnel interface cannot be created.
-            TunnelError::RecoverableStartWireguardError,
-        )) if retry_attempt < MAX_RECOVERABLE_FAIL_RETRIES => true,
-
-        #[cfg(windows)]
-        tunnel::Error::OpenVpnTunnelMonitoringError(
+            TunnelError::SetupTunnelDevice(_),
+        ))
+        | tunnel::Error::OpenVpnTunnelMonitoringError(
             talpid_openvpn::Error::WintunCreateAdapterError(_),
-        ) if retry_attempt < MAX_RECOVERABLE_FAIL_RETRIES => true,
+        ) if retry_attempt < MAX_ATTEMPT_CREATE_TUN => true,
 
         _ => false,
     }