diff options
| -rw-r--r-- | talpid-wireguard/src/connectivity/mock.rs | 2 | ||||
| -rw-r--r-- | talpid-wireguard/src/ephemeral.rs | 3 | ||||
| -rw-r--r-- | talpid-wireguard/src/lib.rs | 22 | ||||
| -rw-r--r-- | talpid-wireguard/src/wireguard_go/mod.rs | 15 | ||||
| -rw-r--r-- | talpid-wireguard/src/wireguard_nt/mod.rs | 5 |
5 files changed, 25 insertions, 22 deletions
diff --git a/talpid-wireguard/src/connectivity/mock.rs b/talpid-wireguard/src/connectivity/mock.rs index 5b7c98b183..8149e0ced3 100644 --- a/talpid-wireguard/src/connectivity/mock.rs +++ b/talpid-wireguard/src/connectivity/mock.rs @@ -121,7 +121,7 @@ impl Tunnel for MockTunnel { #[cfg(daita)] fn start_daita( &mut self, - #[cfg(not(target_os = "windows"))] _: talpid_tunnel_config_client::DaitaSettings, + _: talpid_tunnel_config_client::DaitaSettings, ) -> std::result::Result<(), TunnelError> { Ok(()) } diff --git a/talpid-wireguard/src/ephemeral.rs b/talpid-wireguard/src/ephemeral.rs index 04f24d5fbb..903ccf4c3b 100644 --- a/talpid-wireguard/src/ephemeral.rs +++ b/talpid-wireguard/src/ephemeral.rs @@ -168,8 +168,7 @@ async fn config_ephemeral_peers_inner( #[cfg(daita)] if config.daita { - let Some(daita) = daita - else { + let Some(daita) = daita else { unreachable!("missing DAITA settings"); }; diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs index 9cf6082a48..3d6c2b4471 100644 --- a/talpid-wireguard/src/lib.rs +++ b/talpid-wireguard/src/lib.rs @@ -697,14 +697,15 @@ impl WireguardMonitor { let use_userspace_wg = config.daita; if use_userspace_wg { log::debug!("Using userspace WireGuard implementation"); - let tunnel = runtime.block_on(Self::open_wireguard_go_tunnel( - runtime, - config, - log_path, - setup_done_tx, - route_manager, - )) - .map(Box::new)?; + let tunnel = runtime + .block_on(Self::open_wireguard_go_tunnel( + runtime, + config, + log_path, + setup_done_tx, + route_manager, + )) + .map(Box::new)?; return Ok(tunnel); } } @@ -755,8 +756,9 @@ impl WireguardMonitor { .map_err(Error::TunnelError)?; #[cfg(target_os = "windows")] - let tunnel = WgGoTunnel::start_tunnel(runtime, config, log_path, route_manager, setup_done_tx) - .map_err(Error::TunnelError)?; + let tunnel = + WgGoTunnel::start_tunnel(runtime, config, log_path, route_manager, setup_done_tx) + .map_err(Error::TunnelError)?; // Android uses multihop implemented in Mullvad's wireguard-go fork. When negotiating // with an ephemeral peer, this multihop strategy require us to restart the tunnel diff --git a/talpid-wireguard/src/wireguard_go/mod.rs b/talpid-wireguard/src/wireguard_go/mod.rs index df2500c7be..9cfda42699 100644 --- a/talpid-wireguard/src/wireguard_go/mod.rs +++ b/talpid-wireguard/src/wireguard_go/mod.rs @@ -14,9 +14,9 @@ use ipnetwork::IpNetwork; #[cfg(daita)] use std::ffi::CString; #[cfg(unix)] -use std::sync::{Arc, Mutex}; -#[cfg(unix)] use std::os::unix::io::{AsRawFd, RawFd}; +#[cfg(unix)] +use std::sync::{Arc, Mutex}; use std::{ future::Future, path::{Path, PathBuf}, @@ -275,13 +275,12 @@ impl WgGoTunnel { .map(|ordinal| LoggingContext::new(ordinal, log_path.map(Path::to_owned))) .map_err(TunnelError::LoggingError)?; - let socket_update_cb = runtime - .block_on( - route_manager.add_default_route_change_callback(Box::new( + let socket_update_cb = + runtime + .block_on(route_manager.add_default_route_change_callback(Box::new( Self::default_route_changed_callback, - )), - ) - .ok(); + ))) + .ok(); if socket_update_cb.is_none() { log::warn!("Failed to register default route callback"); } diff --git a/talpid-wireguard/src/wireguard_nt/mod.rs b/talpid-wireguard/src/wireguard_nt/mod.rs index e5f0aa7c63..fb4dfcbb22 100644 --- a/talpid-wireguard/src/wireguard_nt/mod.rs +++ b/talpid-wireguard/src/wireguard_nt/mod.rs @@ -1104,7 +1104,10 @@ impl Tunnel for WgNtTunnel { } #[cfg(daita)] - fn start_daita(&mut self, _: talpid_tunnel_config_client::DaitaSettings) -> std::result::Result<(), crate::TunnelError> { + fn start_daita( + &mut self, + _: talpid_tunnel_config_client::DaitaSettings, + ) -> std::result::Result<(), crate::TunnelError> { self.spawn_machinist().map_err(|error| { log::error!( "{}", |