More review feedback fixes

mullvad · Nov 15, 2024 · 7d2f355 · 7d2f355
1 parent 63af599
commit 7d2f355
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/talpid-wireguard/src/ephemeral.rs b/talpid-wireguard/src/ephemeral.rs
@@ -204,7 +204,9 @@ async fn reconfigure_tunnel(
 
     let tunnel = lock.take().expect("tunnel was None");
 
-    let new_tunnel = tunnel.better_set_config(&config).unwrap();
+    let new_tunnel = tunnel
+        .better_set_config(&config)
+        .map_err(|e| SetupError(Error::TunnelError(e)))?;
 
     *lock = Some(new_tunnel);
     Ok(config)

diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs
@@ -777,11 +777,11 @@ impl WireguardMonitor {
         let config = Self::patch_allowed_ips(config, gateway_only);
 
         #[cfg(target_os = "android")]
-        let tunnel = if config.is_multihop() {
+        let tunnel = if let Some(exit_peer) = &config.exit_peer {
             WgGoTunnel::start_multihop_tunnel(
                 #[allow(clippy::needless_borrow)]
                 &config,
-                config.exit_peer.clone().unwrap(),
+                exit_peer.clone(),
                 log_path,
                 tun_provider,
                 routes,