Avoid Go crash

mullvad · Feb 17, 2025 · 3cea785 · 3cea785
1 parent ad02f7e
commit 3cea785
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs
@@ -425,7 +425,7 @@ impl WireguardMonitor {
         let should_negotiate_ephemeral_peer = config.quantum_resistant || config.daita;
 
         let (cancel_token, cancel_receiver) = connectivity::CancelToken::new();
-        let mut connectivity_check = connectivity::Check::new(
+        let connectivity_check = connectivity::Check::new(
             config.ipv4_gateway,
             args.retry_attempt,
             cancel_receiver.clone(),
@@ -500,24 +500,6 @@ impl WireguardMonitor {
                     .await;
             }
 
-            match connectivity_check
-                .establish_connectivity(&tunnel.lock().await.as_ref().unwrap())
-                .await
-            {
-                Ok(true) => Ok(()),
-                Ok(false) => {
-                    log::warn!("Timeout while checking tunnel connection");
-                    Err(CloseMsg::PingErr)
-                }
-                Err(error) => {
-                    log::error!(
-                        "{}",
-                        error.display_chain_with_msg("Failed to check tunnel connection")
-                    );
-                    Err(CloseMsg::PingErr)
-                }
-            }?;
-
             let metadata = Self::tunnel_metadata(&iface_name, &config);
             event_hook.on_event(TunnelEvent::Up(metadata)).await;
 

diff --git a/talpid-wireguard/src/wireguard_go/mod.rs b/talpid-wireguard/src/wireguard_go/mod.rs
@@ -482,7 +482,10 @@ impl WgGoTunnel {
             tunnel.wait_for_routes().await?;
         }
 
+        // This seemingly fixes the GO crash we see
+        tunnel.ensure_tunnel_is_running().await?;
         log::debug!("DEBUG: get_tunnel 4");
+
         Ok(tunnel)
     }
 
@@ -551,6 +554,9 @@ impl WgGoTunnel {
             tunnel.wait_for_routes().await?;
         }
 
+        // This seemingly fixes the GO crash we see
+        tunnel.ensure_tunnel_is_running().await?;
+
         Ok(tunnel)
     }
 
@@ -585,6 +591,29 @@ impl WgGoTunnel {
             .map_err(CloseMsg::SetupError)
             .unwrap();
 
+        Ok(())
+    }
+    async fn ensure_tunnel_is_running(&self) -> Result<()> {
+        let state = self.as_state();
+        let addr = state.config.ipv4_gateway;
+        let cancel_receiver = state.cancel_receiver.clone();
+        let mut check = connectivity::Check::new(addr, 0, cancel_receiver)
+            .map_err(|err| TunnelError::RecoverableStartWireguardError(Box::new(err)))?;
+
+        // TODO: retry attempt?
+
+        let connection_established = check
+            .establish_connectivity(self)
+            .await
+            .map_err(|e| TunnelError::RecoverableStartWireguardError(Box::new(e)))?;
+
+        // Timed out
+        if !connection_established {
+            return Err(TunnelError::RecoverableStartWireguardError(Box::new(
+                super::Error::TimeoutError,
+            )));
+        }
+
         Ok(())
     }
 }