Update OpenVPN monitor

mullvad · Oct 12, 2023 · 7f8b7e9 · 7f8b7e9
1 parent 5f0f746
commit 7f8b7e9
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 265 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
@@ -224,11 +224,18 @@ impl TunnelMonitor {
             config,
             log,
             resource_dir,
-            tunnel_close_rx,
             #[cfg(target_os = "linux")]
             route_manager,
         )
         .await?;
+
+        let close_handle = monitor.close_handle();
+        tokio::spawn(async move {
+            if tunnel_close_rx.await.is_ok() {
+                close_handle.close();
+            }
+        });
+
         Ok(TunnelMonitor {
             monitor: InternalTunnelMonitor::OpenVpn(monitor),
         })
@@ -298,9 +305,12 @@ enum InternalTunnelMonitor {
 
 impl InternalTunnelMonitor {
     fn wait(self) -> Result<()> {
+        #[cfg(not(target_os = "android"))]
+        let handle = tokio::runtime::Handle::current();
+
         match self {
             #[cfg(not(target_os = "android"))]
-            InternalTunnelMonitor::OpenVpn(tun) => tun.wait()?,
+            InternalTunnelMonitor::OpenVpn(tun) => handle.block_on(tun.wait())?,
             InternalTunnelMonitor::Wireguard(tun) => tun.wait()?,
         }
 

diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
@@ -15,8 +15,6 @@ err-derive = { workspace = true }
 futures = "0.3.15"
 once_cell = { workspace = true }
 log = { workspace = true }
-os_pipe = "1.1.4"
-parking_lot = "0.12.0"
 shell-escape = "0.1"
 talpid-routing = { path = "../talpid-routing" }
 talpid-tunnel = { path = "../talpid-tunnel" }