From e6cebfabc272952bffa7b766f772d53e6b9ef1d5 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 2 Jan 2024 14:03:15 +0100 Subject: [PATCH] Fix windows compile errors --- talpid-core/src/tunnel/mod.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index 04b5b1be32b1..b8eee7096580 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -8,7 +8,7 @@ use talpid_openvpn; use talpid_routing::RouteManagerHandle; pub use talpid_tunnel::{TunnelArgs, TunnelEvent, TunnelMetadata}; #[cfg(not(target_os = "android"))] -use talpid_types::net::openvpn as openvpn_types; +use talpid_types::net::proxy; use talpid_types::net::{wireguard as wireguard_types, TunnelParameters}; /// A module for all WireGuard related tunnel management. @@ -112,11 +112,9 @@ impl TunnelMonitor { let resource_dir = resource_dir.to_path_buf(); match params { TunnelParameters::OpenVpn(params) => match ¶ms.proxy { - Some(openvpn_types::ProxySettings::Shadowsocks(_)) => { - Some(std::env::current_exe().unwrap()) - } - Some(openvpn_types::ProxySettings::Local(_)) => None, - Some(openvpn_types::ProxySettings::Remote(_)) | None => { + Some(proxy::CustomProxy::Shadowsocks(_)) => Some(std::env::current_exe().unwrap()), + Some(proxy::CustomProxy::Socks5Local(_)) => None, + Some(proxy::CustomProxy::Socks5Remote(_)) | None => { Some(resource_dir.join("openvpn.exe")) } },