diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-03-25 13:27:18 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-03-25 13:27:18 +0100 |
| commit | 8bc5c1372516d0e84b19c950f20583be58b6a8f7 (patch) | |
| tree | ad4a58ea37d762b96900f9fc0d2c90b2c499dbad | |
| parent | 76f6ed59b349c2e1398479d275df07a249961f57 (diff) | |
| parent | b44ec28a5ee66f8ee793a5f9d8dc2a3eb5504528 (diff) | |
| download | mullvadvpn-8bc5c1372516d0e84b19c950f20583be58b6a8f7.tar.xz mullvadvpn-8bc5c1372516d0e84b19c950f20583be58b6a8f7.zip | |
Merge branch 'fix-nightly'
| -rw-r--r-- | talpid-openvpn/src/lib.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/talpid-openvpn/src/lib.rs b/talpid-openvpn/src/lib.rs index da30c1940f..c8057e536b 100644 --- a/talpid-openvpn/src/lib.rs +++ b/talpid-openvpn/src/lib.rs @@ -311,6 +311,7 @@ impl OpenVpnMonitor<OpenVpnCommand> { user_pass_file_path: user_pass_file_path.clone(), proxy_auth_file_path: proxy_auth_file_path.clone(), abort_server_tx: event_server_abort_tx, + #[cfg(any(target_os = "macos", target_os = "windows"))] proxy: params.proxy.clone(), route_manager, #[cfg(target_os = "linux")] @@ -776,7 +777,9 @@ mod event_server { task::{Context, Poll}, }; use talpid_tunnel::TunnelMetadata; - use talpid_types::{net::proxy::CustomProxy, ErrorExt}; + #[cfg(any(target_os = "macos", target_os = "windows"))] + use talpid_types::net::proxy::CustomProxy; + use talpid_types::ErrorExt; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use tonic::{ transport::{server::Connected, Server}, @@ -816,6 +819,7 @@ mod event_server { pub user_pass_file_path: super::PathBuf, pub proxy_auth_file_path: Option<super::PathBuf>, pub abort_server_tx: triggered::Trigger, + #[cfg(any(target_os = "macos", target_os = "windows"))] pub proxy: Option<CustomProxy>, pub route_manager: talpid_routing::RouteManagerHandle, #[cfg(target_os = "linux")] |