diff options
| author | Linus Färnstrand <faern@faern.net> | 2021-11-26 13:54:58 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2021-11-29 13:09:35 +0100 |
| commit | bc55e8482e45fa1a42a16078a80400cafb1a4258 (patch) | |
| tree | 16465e852163a01f8ef713321e1a629daed28764 /talpid-core/src | |
| parent | 0954877ceaa0ae9d63bc572b6a10088de1273fa7 (diff) | |
| download | mullvadvpn-bc55e8482e45fa1a42a16078a80400cafb1a4258.tar.xz mullvadvpn-bc55e8482e45fa1a42a16078a80400cafb1a4258.zip | |
Reformat code without blank_lines_upper_bound = 2
Diffstat (limited to 'talpid-core/src')
36 files changed, 0 insertions, 90 deletions
diff --git a/talpid-core/src/dns/linux/mod.rs b/talpid-core/src/dns/linux/mod.rs index 7ab5b43d03..bf3f27e612 100644 --- a/talpid-core/src/dns/linux/mod.rs +++ b/talpid-core/src/dns/linux/mod.rs @@ -10,7 +10,6 @@ use self::{ use crate::routing::RouteManagerHandle; use std::{env, fmt, net::IpAddr}; - const RESOLV_CONF_PATH: &str = "/etc/resolv.conf"; pub type Result<T> = std::result::Result<T, Error>; diff --git a/talpid-core/src/dns/linux/network_manager.rs b/talpid-core/src/dns/linux/network_manager.rs index b1b6ba2cca..d44c273cc1 100644 --- a/talpid-core/src/dns/linux/network_manager.rs +++ b/talpid-core/src/dns/linux/network_manager.rs @@ -4,14 +4,12 @@ use talpid_dbus::network_manager::{self, DeviceConfig, NetworkManager as DBus}; pub type Result<T> = std::result::Result<T, Error>; - pub struct NetworkManager { pub connection: DBus, device: Option<String>, settings_backup: Option<DeviceConfig>, } - impl NetworkManager { pub fn new() -> Result<Self> { let connection = DBus::new()?; diff --git a/talpid-core/src/dns/linux/systemd_resolved.rs b/talpid-core/src/dns/linux/systemd_resolved.rs index 9a9ae7e7f6..321b4181ed 100644 --- a/talpid-core/src/dns/linux/systemd_resolved.rs +++ b/talpid-core/src/dns/linux/systemd_resolved.rs @@ -24,7 +24,6 @@ pub struct SystemdResolved { tunnel_index: u32, } - impl SystemdResolved { pub fn new() -> Result<Self> { let dbus_interface = DbusInterface::new()?.async_handle(); @@ -66,7 +65,6 @@ impl SystemdResolved { Ok(()) } - pub async fn reset(&mut self) -> Result<()> { if let Err(error) = self .dbus_interface diff --git a/talpid-core/src/dns/windows/mod.rs b/talpid-core/src/dns/windows/mod.rs index f56b52e924..42ca632e92 100644 --- a/talpid-core/src/dns/windows/mod.rs +++ b/talpid-core/src/dns/windows/mod.rs @@ -11,7 +11,6 @@ use winreg::{ RegKey, RegValue, }; - const DNS_CACHE_POLICY_GUID: &str = "{d57d2750-f971-408e-8e55-cfddb37e60ae}"; lazy_static! { @@ -220,7 +219,6 @@ ffi_error!(InitializationResult, Error::Initialization); ffi_error!(DeinitializationResult, Error::Deinitialization); ffi_error!(SettingResult, Error::Setting); - #[allow(non_snake_case)] extern "stdcall" { #[link_name = "WinDns_Initialize"] diff --git a/talpid-core/src/firewall/linux.rs b/talpid-core/src/firewall/linux.rs index f584df4475..c1619f0f46 100644 --- a/talpid-core/src/firewall/linux.rs +++ b/talpid-core/src/firewall/linux.rs @@ -265,7 +265,6 @@ impl<'a> PolicyBatch<'a> { batch.add(&in_chain, nftnl::MsgType::Add); batch.add(&forward_chain, nftnl::MsgType::Add); - Self::flush_table(&mut batch, &tables.mangle_v4); Self::flush_table(&mut batch, &tables.mangle_v6); diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs index e3ece0cbfe..3a003b4c1e 100644 --- a/talpid-core/src/firewall/mod.rs +++ b/talpid-core/src/firewall/mod.rs @@ -11,7 +11,6 @@ use std::net::{Ipv4Addr, Ipv6Addr}; use std::path::PathBuf; use talpid_types::net::Endpoint; - #[cfg(target_os = "macos")] #[path = "macos.rs"] mod imp; @@ -82,7 +81,6 @@ const DHCPV6_SERVER_PORT: u16 = 547; #[cfg(all(unix, not(target_os = "android")))] const DHCPV6_CLIENT_PORT: u16 = 546; - #[cfg(all(unix, not(target_os = "android")))] /// Returns whether an address belongs to a private subnet. pub fn is_local_address(address: &IpAddr) -> bool { diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs index 85ce8810f7..2889432c28 100644 --- a/talpid-core/src/firewall/windows.rs +++ b/talpid-core/src/firewall/windows.rs @@ -10,7 +10,6 @@ use std::os::windows::ffi::OsStrExt; use talpid_types::{net::Endpoint, tunnel::FirewallPolicyError}; use widestring::WideCString; - /// Errors that can happen when configuring the Windows firewall. #[derive(err_derive::Error, Debug)] #[error(no_from)] diff --git a/talpid-core/src/logging/windows.rs b/talpid-core/src/logging/windows.rs index c853d3cd9d..9e382d1bf5 100644 --- a/talpid-core/src/logging/windows.rs +++ b/talpid-core/src/logging/windows.rs @@ -5,7 +5,6 @@ use winapi::um::{stringapiset::MultiByteToWideChar, winnls::CP_ACP}; /// Logging callback type. pub type LogSink = extern "system" fn(level: log::Level, msg: *const c_char, context: *mut c_void); - /// Logging callback implementation. pub extern "system" fn log_sink(level: log::Level, msg: *const c_char, context: *mut c_void) { if msg.is_null() { diff --git a/talpid-core/src/network_interface.rs b/talpid-core/src/network_interface.rs index 7d7e79b95a..0e00dd9b9f 100644 --- a/talpid-core/src/network_interface.rs +++ b/talpid-core/src/network_interface.rs @@ -46,7 +46,6 @@ pub trait NetworkInterface: Sized { fn get_name(&self) -> &str; } - trait WireguardLink: AsRawFd + IntoRawFd {} fn apply_async_flags(fd: RawFd) -> Result<(), nix::Error> { diff --git a/talpid-core/src/offline/linux.rs b/talpid-core/src/offline/linux.rs index 37468a07b8..08ee97a7fe 100644 --- a/talpid-core/src/offline/linux.rs +++ b/talpid-core/src/offline/linux.rs @@ -83,7 +83,6 @@ pub async fn spawn_monitor( Ok(monitor_handle) } - async fn public_ip_unreachable(handle: &RouteManagerHandle) -> Result<bool> { Ok(handle .get_destination_route(PUBLIC_INTERNET_ADDRESS_V4, true) diff --git a/talpid-core/src/offline/macos.rs b/talpid-core/src/offline/macos.rs index 3e374cf29c..884a7f1d38 100644 --- a/talpid-core/src/offline/macos.rs +++ b/talpid-core/src/offline/macos.rs @@ -23,7 +23,6 @@ use system_configuration::{ }, }; - const PRIMARY_INTERFACE_KEY: &str = "State:/Network/Global/IPv4"; #[derive(err_derive::Error, Debug)] @@ -76,7 +75,6 @@ pub async fn spawn_monitor(notify_tx: UnboundedSender<bool>) -> Result<MonitorHa is_offline: Arc::new(AtomicBool::new(is_currently_offline)), }; - let result = || -> Result<SCDynamicStore, Error> { let dynamic_store = create_dynamic_store(context.clone())?; CFRunLoop::get_current().add_source(&dynamic_store.create_run_loop_source(), unsafe { @@ -92,11 +90,9 @@ pub async fn spawn_monitor(notify_tx: UnboundedSender<bool>) -> Result<MonitorHa kCFRunLoopCommonModes })?; - Ok(dynamic_store) }; - match result() { Ok(_dynamic_store) => { let _ = result_tx.send(Ok(())); diff --git a/talpid-core/src/offline/windows.rs b/talpid-core/src/offline/windows.rs index f8308e5a28..c04277aea5 100644 --- a/talpid-core/src/offline/windows.rs +++ b/talpid-core/src/offline/windows.rs @@ -36,7 +36,6 @@ use winapi::{ const CLASS_NAME: &[u8] = b"S\0T\0A\0T\0I\0C\0\0\0"; const REQUEST_THREAD_SHUTDOWN: UINT = WM_USER + 1; - #[derive(err_derive::Error, Debug)] pub enum Error { #[error(display = "Unable to create listener thread")] @@ -45,7 +44,6 @@ pub enum Error { ConnectivityMonitorError(#[error(source)] winnet::DefaultRouteCallbackError), } - pub struct BroadcastListener { thread_handle: RawHandle, thread_id: DWORD, diff --git a/talpid-core/src/ping_monitor/mod.rs b/talpid-core/src/ping_monitor/mod.rs index ba265232ae..e978bd38b2 100644 --- a/talpid-core/src/ping_monitor/mod.rs +++ b/talpid-core/src/ping_monitor/mod.rs @@ -2,7 +2,6 @@ #[path = "unix.rs"] mod imp; - #[cfg(any(target_os = "windows", target_os = "linux"))] #[path = "icmp.rs"] mod imp; diff --git a/talpid-core/src/ping_monitor/unix.rs b/talpid-core/src/ping_monitor/unix.rs index e7e7927349..fca9614e60 100644 --- a/talpid-core/src/ping_monitor/unix.rs +++ b/talpid-core/src/ping_monitor/unix.rs @@ -29,7 +29,6 @@ impl Pinger { }) } - fn try_deplete_process_list(&mut self) { self.processes.retain(|child| { match child.try_wait() { @@ -78,7 +77,6 @@ impl Drop for Pinger { } } - fn ping_cmd(ip: Ipv4Addr, timeout_secs: u16, interface: &str) -> duct::Expression { let mut args = vec!["-n", "-i", "1"]; diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs index 4c6c8e0dd8..4dd594a2f2 100644 --- a/talpid-core/src/process/openvpn.rs +++ b/talpid-core/src/process/openvpn.rs @@ -476,7 +476,6 @@ impl Drop for OpenVpnProcHandle { } } - #[cfg(test)] mod tests { use super::OpenVpnCommand; diff --git a/talpid-core/src/routing/android.rs b/talpid-core/src/routing/android.rs index 967576323a..78f5c14a90 100644 --- a/talpid-core/src/routing/android.rs +++ b/talpid-core/src/routing/android.rs @@ -11,7 +11,6 @@ pub struct Error; /// Stub route manager for Android pub struct RouteManagerImpl {} - impl RouteManagerImpl { pub async fn new(_required_routes: HashSet<RequiredRoute>) -> Result<Self, Error> { Ok(RouteManagerImpl {}) diff --git a/talpid-core/src/routing/linux.rs b/talpid-core/src/routing/linux.rs index 72ebe5b27c..e9f917abd1 100644 --- a/talpid-core/src/routing/linux.rs +++ b/talpid-core/src/routing/linux.rs @@ -38,7 +38,6 @@ use rtnetlink::{ use libc::{AF_INET, AF_INET6}; - lazy_static! { static ref SUPPRESS_RULE_V4: RuleMessage = RuleMessage { header: RuleHeader { @@ -81,7 +80,6 @@ lazy_static! { ]; } - pub type Result<T> = std::result::Result<T, Error>; /// Errors that can happen in the Linux routing integration @@ -123,7 +121,6 @@ pub enum Error { Shutdown, } - pub struct RouteManagerImpl { handle: Handle, messages: UnboundedReceiver<(NetlinkMessage<RtnlMessage>, SocketAddr)>, @@ -302,7 +299,6 @@ impl RouteManagerImpl { Ok(link_map) } - fn find_iface_idx(&self, iface_name: &str) -> Option<u32> { self.iface_map .iter() @@ -323,7 +319,6 @@ impl RouteManagerImpl { } } - pub(crate) async fn run( mut self, manage_rx: UnboundedReceiver<RouteManagerCommand>, @@ -422,7 +417,6 @@ impl RouteManagerImpl { } }; - // By default, the prefix is unspecified. let mut prefix = IpNetwork::new( if is_ipv4 { @@ -492,7 +486,6 @@ impl RouteManagerImpl { return Err(Error::InvalidRoute); } - let node = Node { ip: node_addr.or(gateway.into()), device: device.map(|dev| dev.name.clone()), @@ -824,7 +817,6 @@ mod test { use super::*; use std::collections::HashSet; - /// Tests if dropping inside a tokio runtime panics #[test] fn test_drop_in_executor() { diff --git a/talpid-core/src/routing/macos.rs b/talpid-core/src/routing/macos.rs index 6808ad3e7b..62d9a6e7f8 100644 --- a/talpid-core/src/routing/macos.rs +++ b/talpid-core/src/routing/macos.rs @@ -15,7 +15,6 @@ use std::{ use tokio::{io::AsyncBufReadExt, process::Command}; use tokio_stream::wrappers::LinesStream; - pub type Result<T> = std::result::Result<T, Error>; /// Errors that can happen in the macOS routing integration. @@ -63,7 +62,6 @@ pub struct RouteManagerImpl { Option<Box<dyn FusedStream<Item = std::io::Result<()>> + Unpin + Send + Sync>>, } - impl RouteManagerImpl { pub async fn new(required_routes: HashSet<RequiredRoute>) -> Result<Self> { let v4_gateway = Self::get_default_node_cmd("-inet").await?; @@ -231,7 +229,6 @@ impl RouteManagerImpl { cmd.status().await.map_err(Error::FailedToRemoveRoute) } - async fn add_route(route: &Route) -> Result<ExitStatus> { let mut cmd = Command::new("route"); cmd.arg("-q") @@ -289,7 +286,6 @@ impl RouteManagerImpl { } } - fn ip_vers(prefix: IpNetwork) -> &'static str { if prefix.is_ipv4() { "-inet" @@ -298,7 +294,6 @@ fn ip_vers(prefix: IpNetwork) -> &'static str { } } - /// Returns a stream that produces an item whenever a default route is either added or deleted from /// the routing table. async fn listen_for_default_route_changes() -> Result<impl Stream<Item = std::io::Result<()>>> { @@ -310,7 +305,6 @@ async fn listen_for_default_route_changes() -> Result<impl Stream<Item = std::io .stdout(Stdio::piped()) .stdin(Stdio::null()); - let mut process = cmd.spawn().map_err(Error::FailedToMonitorRoutes)?; let reader = tokio::io::BufReader::new(process.stdout.take().unwrap()); let lines = reader.lines(); @@ -351,6 +345,5 @@ async fn listen_for_default_route_changes() -> Result<impl Stream<Item = std::io future::ready(Ok(None)) }); - Ok(monitor) } diff --git a/talpid-core/src/split_tunnel/linux.rs b/talpid-core/src/split_tunnel/linux.rs index b2c3fcfe1e..6944aada4d 100644 --- a/talpid-core/src/split_tunnel/linux.rs +++ b/talpid-core/src/split_tunnel/linux.rs @@ -87,7 +87,6 @@ impl PidManager { ) .map_err(Error::InitNetClsCGroup)?; - Ok(net_cls_dir) } diff --git a/talpid-core/src/split_tunnel/windows/mod.rs b/talpid-core/src/split_tunnel/windows/mod.rs index d541d7c3f2..7bb2eb1bab 100644 --- a/talpid-core/src/split_tunnel/windows/mod.rs +++ b/talpid-core/src/split_tunnel/windows/mod.rs @@ -516,7 +516,6 @@ impl SplitTunnel { ), )); - self._route_change_callback = None; let mut context = context_mutex.lock().unwrap(); let callback = winnet::add_default_route_change_callback( diff --git a/talpid-core/src/split_tunnel/windows/path_monitor.rs b/talpid-core/src/split_tunnel/windows/path_monitor.rs index 6f283f8c1e..6906e574b4 100644 --- a/talpid-core/src/split_tunnel/windows/path_monitor.rs +++ b/talpid-core/src/split_tunnel/windows/path_monitor.rs @@ -51,7 +51,6 @@ const CSTR_EQUAL: i32 = 2; const ANYSIZE_ARRAY: usize = 1; const SYMLINK_FLAG_RELATIVE: u32 = 0x00000001; - // See https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-fscc/c3a420cb-8a72-4adf-87e8-eee95379d78f. #[repr(C)] struct ReparseData { diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index f4f34be00b..ea04a9d425 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -62,7 +62,6 @@ pub enum Error { WireguardTunnelMonitoringError(#[error(source)] wireguard::Error), } - /// Possible events from the VPN tunnel and the child process managing it. #[derive(Debug, Clone, Eq, PartialEq, Hash)] pub enum TunnelEvent { @@ -273,7 +272,6 @@ impl TunnelMonitor { } } - /// A handle to a `TunnelMonitor` pub enum CloseHandle { #[cfg(not(target_os = "android"))] @@ -323,7 +321,6 @@ impl InternalTunnelMonitor { } } - #[cfg(target_os = "windows")] fn is_ipv6_enabled_in_os() -> bool { use winreg::{enums::*, RegKey}; diff --git a/talpid-core/src/tunnel/openvpn/mod.rs b/talpid-core/src/tunnel/openvpn/mod.rs index 4b27b6163e..ffca275f68 100644 --- a/talpid-core/src/tunnel/openvpn/mod.rs +++ b/talpid-core/src/tunnel/openvpn/mod.rs @@ -40,7 +40,6 @@ use winapi::shared::{guiddef::GUID, ifdef::NET_LUID}; #[cfg(windows)] mod wintun; - #[cfg(windows)] lazy_static! { static ref ADAPTER_ALIAS: U16CString = U16CString::from_str("Mullvad").unwrap(); @@ -55,7 +54,6 @@ const ADAPTER_GUID: GUID = GUID { Data4: [0x85, 0x36, 0x57, 0x6A, 0xB8, 0x6A, 0xFE, 0x9A], }; - /// Results from fallible operations on the OpenVPN tunnel. pub type Result<T> = std::result::Result<T, Error>; @@ -155,13 +153,11 @@ pub enum Error { ParseRemoteHost(#[error(source)] std::net::AddrParseError), } - #[cfg(unix)] static OPENVPN_DIE_TIMEOUT: Duration = Duration::from_secs(4); #[cfg(windows)] static OPENVPN_DIE_TIMEOUT: Duration = Duration::from_secs(30); - #[cfg(target_os = "macos")] const OPENVPN_PLUGIN_FILENAME: &str = "libtalpid_openvpn_plugin.dylib"; #[cfg(target_os = "linux")] @@ -250,7 +246,6 @@ impl WintunContext for WintunContextImpl { } } - impl OpenVpnMonitor<OpenVpnCommand> { /// Creates a new `OpenVpnMonitor` with the given listener and using the plugin at the given /// path. @@ -645,7 +640,6 @@ impl<C: OpenVpnBuilder + Send + 'static> OpenVpnMonitor<C> { Ok(temp_file) } - #[cfg(unix)] fn set_user_pass_file_permissions(file: &fs::File) -> io::Result<()> { use std::os::unix::fs::PermissionsExt; @@ -811,7 +805,6 @@ impl ProcessHandle for OpenVpnProcHandle { } } - mod event_server { use crate::tunnel::TunnelMetadata; use futures::stream::TryStreamExt; @@ -1110,7 +1103,6 @@ mod event_server { } } - #[cfg(test)] mod tests { use super::*; diff --git a/talpid-core/src/tunnel/openvpn/wintun.rs b/talpid-core/src/tunnel/openvpn/wintun.rs index a50d1d4490..e466f287c5 100644 --- a/talpid-core/src/tunnel/openvpn/wintun.rs +++ b/talpid-core/src/tunnel/openvpn/wintun.rs @@ -75,7 +75,6 @@ enum WintunLoggerLevel { Err, } - pub struct WintunDll { handle: HINSTANCE, func_open: WintunOpenAdapterFn, diff --git a/talpid-core/src/tunnel/tun_provider/android/mod.rs b/talpid-core/src/tunnel/tun_provider/android/mod.rs index 3febda73d4..1772e26c23 100644 --- a/talpid-core/src/tunnel/tun_provider/android/mod.rs +++ b/talpid-core/src/tunnel/tun_provider/android/mod.rs @@ -19,7 +19,6 @@ use std::{ }; use talpid_types::{android::AndroidContext, ErrorExt}; - /// Errors that occur while setting up VpnService tunnel. #[derive(Debug, err_derive::Error)] #[error(no_from)] diff --git a/talpid-core/src/tunnel/wireguard/config.rs b/talpid-core/src/tunnel/wireguard/config.rs index 252bf8418f..307a713272 100644 --- a/talpid-core/src/tunnel/wireguard/config.rs +++ b/talpid-core/src/tunnel/wireguard/config.rs @@ -163,7 +163,6 @@ impl<'a> From<&'a [u8]> for ConfValue<'a> { } } - impl<'a> ConfValue<'a> { fn to_bytes(&self) -> Cow<'a, [u8]> { match self { diff --git a/talpid-core/src/tunnel/wireguard/connectivity_check.rs b/talpid-core/src/tunnel/wireguard/connectivity_check.rs index be97608821..5a2118fb27 100644 --- a/talpid-core/src/tunnel/wireguard/connectivity_check.rs +++ b/talpid-core/src/tunnel/wireguard/connectivity_check.rs @@ -15,7 +15,6 @@ const DELAY_ON_INITIAL_SETUP: Duration = Duration::from_millis(50); /// Sleep time used when checking if an established connection is still working. const REGULAR_LOOP_SLEEP: Duration = Duration::from_secs(1); - /// Timeout for waiting on receiving traffic after sending outgoing traffic. Once this timeout is /// hit, a ping will be sent every `SECONDS_PER_PING` until `PING_TIMEOUT` is reached, or traffic /// is received. @@ -41,7 +40,6 @@ pub enum Error { PingError(#[error(source)] crate::ping_monitor::Error), } - /// Verifies if a connection to a tunnel is working. /// The connectivity monitor is biased to receiving traffic - it is expected that all outgoing /// traffic will be answered with a response. @@ -73,7 +71,6 @@ pub struct ConnectivityMonitor { close_receiver: mpsc::Receiver<()>, } - impl ConnectivityMonitor { pub(super) fn new( addr: Ipv4Addr, @@ -603,7 +600,6 @@ mod test { } } - #[test] /// Verify that `check_connectivity()` returns `false` if the tunnel is connected and traffic is /// not flowing after `BYTES_RX_TIMEOUT` and `PING_TIMEOUT`. diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs index e2889166a7..848c309da4 100644 --- a/talpid-core/src/tunnel/wireguard/mod.rs +++ b/talpid-core/src/tunnel/wireguard/mod.rs @@ -72,7 +72,6 @@ pub enum Error { SetIpAddressesError, } - /// Spawns and monitors a wireguard tunnel pub struct WireguardMonitor { runtime: tokio::runtime::Handle, @@ -480,7 +479,6 @@ impl WireguardMonitor { }) } - /// On linux, there is no need #[cfg(target_os = "linux")] fn get_tunnel_traffic_routes<'a>( diff --git a/talpid-core/src/tunnel/wireguard/stats.rs b/talpid-core/src/tunnel/wireguard/stats.rs index f565988267..e9a22a906a 100644 --- a/talpid-core/src/tunnel/wireguard/stats.rs +++ b/talpid-core/src/tunnel/wireguard/stats.rs @@ -1,7 +1,6 @@ #[cfg(target_os = "linux")] use super::wireguard_kernel::wg_message::{DeviceMessage, DeviceNla, PeerNla}; - #[derive(err_derive::Error, Debug, PartialEq)] pub enum Error { #[error(display = "Failed to parse peer pubkey from string \"_0\"")] @@ -122,7 +121,6 @@ impl Stats { } } - #[cfg(test)] mod test { use super::{Error, Stats}; diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs index 5e22adb2df..460a628a26 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/mod.rs @@ -29,7 +29,6 @@ pub use netlink_tunnel::NetlinkTunnel; pub mod nm_tunnel; pub use nm_tunnel::NetworkManagerTunnel; - #[derive(err_derive::Error, Debug)] #[error(no_from)] pub enum Error { @@ -95,7 +94,6 @@ pub struct Handle { route_abort_handle: AbortHandle, } - impl Handle { pub async fn connect() -> Result<Self, Error> { let message_type = Self::get_wireguard_message_type().await?; @@ -112,7 +110,6 @@ impl Handle { let (abortable_connection, route_abort_handle) = abortable(conn); tokio::spawn(abortable_connection); - Ok(Self { wg_handle, route_handle, @@ -200,7 +197,6 @@ impl Handle { } } - Err(Error::NoDevice) } @@ -209,7 +205,6 @@ impl Handle { let mut request = NetlinkMessage::from(RtnlMessage::NewAddress(address_message)); request.header.flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_CREATE | NLM_F_REPLACE; - let mut response = self .route_handle .request(request) @@ -313,7 +308,6 @@ impl WireguardConnection { } } - fn consume_netlink_error< T, I: NetlinkDeserializable<T> + Clone + Eq + std::fmt::Debug, diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs index 9606fe4b64..ab640732bd 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/netlink_tunnel.rs @@ -4,7 +4,6 @@ use super::{ Config, Error, Handle, Tunnel, TunnelError, MULLVAD_INTERFACE_NAME, }; - pub struct NetlinkTunnel { interface_index: u32, netlink_connections: Handle, @@ -39,7 +38,6 @@ impl NetlinkTunnel { return Err(err); } - Ok(tunnel) }) } diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/nl_message.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/nl_message.rs index 7fc8be8304..1fc5b36e9f 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/nl_message.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/nl_message.rs @@ -10,7 +10,6 @@ use netlink_packet_utils::{ }; use std::{ffi::CString, io::Write, mem}; - #[derive(err_derive::Error, Debug)] pub enum Error { #[error(display = "Family name too long")] @@ -37,7 +36,6 @@ impl NetlinkControlMessage { } } - impl NetlinkSerializable<NetlinkControlMessage> for NetlinkControlMessage { fn message_type(&self) -> u16 { libc::GENL_ID_CTRL as u16 diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/nm_tunnel.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/nm_tunnel.rs index 1df358ab8d..fed29b93d9 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/nm_tunnel.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/nm_tunnel.rs @@ -11,7 +11,6 @@ use talpid_dbus::{ }, }; - #[derive(err_derive::Error, Debug)] pub enum Error { #[error(display = "Error while communicating over Dbus")] @@ -29,7 +28,6 @@ pub struct NetworkManagerTunnel { interface_name: String, } - impl NetworkManagerTunnel { pub fn new( tokio_handle: tokio::runtime::Handle, @@ -119,7 +117,6 @@ fn convert_config_to_dbus(config: &Config) -> DeviceConfig { .map(ToString::to_string) .collect::<Vec<_>>(); - peer_config.insert("allowed-ips".into(), Variant(Box::new(allowed_ips))); peer_config.insert( "endpoint".into(), @@ -145,7 +142,6 @@ fn convert_config_to_dbus(config: &Config) -> DeviceConfig { ); connection_config.insert("autoconnect".into(), Variant(Box::new(true))); - let ipv4_addrs: Vec<_> = config .tunnel .addresses @@ -177,7 +173,6 @@ fn convert_config_to_dbus(config: &Config) -> DeviceConfig { ipv6_config.insert("may-fail".into(), Variant(Box::new(true))); } - let mut settings = HashMap::new(); settings.insert("ipv4".into(), ipv4_config); if !ipv6_config.is_empty() { diff --git a/talpid-core/src/tunnel/wireguard/wireguard_kernel/wg_message.rs b/talpid-core/src/tunnel/wireguard/wireguard_kernel/wg_message.rs index b2687d9ffd..007acb8df7 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_kernel/wg_message.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_kernel/wg_message.rs @@ -67,7 +67,6 @@ type PrivateKey = [u8; 32]; type PublicKey = [u8; 32]; type PresharedKey = [u8; 32]; - #[derive(Debug, PartialEq, Eq, Clone)] pub struct DeviceMessage { pub nlas: Vec<DeviceNla>, @@ -99,7 +98,6 @@ impl DeviceMessage { DeviceNla::Peers(peers), ]; - Self { nlas, message_type, @@ -495,7 +493,6 @@ impl<'a, T: AsRef<[u8]> + 'a + ?Sized> Parseable<NlaBuffer<&'a T>> for AllowedIp } } - #[derive(Debug, PartialEq, Eq, Clone)] pub enum AllowedIpNla { AddressFamily(u16), @@ -592,7 +589,6 @@ mod test { use nix::sys::time::TimeValLike; use std::net::Ipv4Addr; - #[test] fn deserialize_netlink_message() { #[rustfmt::skip] @@ -864,7 +860,6 @@ mod test { } } - #[test] fn serialize_netlink_message() { let expected_payload: &[u8] = &[ @@ -892,7 +887,6 @@ mod test { let mut message = sample_set_message(); message.command = WG_CMD_SET_DEVICE; - let mut payload_buffer = vec![0u8; message.buffer_len()]; message.serialize(&mut payload_buffer); let header = NetlinkHeader { diff --git a/talpid-core/src/tunnel/wireguard/wireguard_nt.rs b/talpid-core/src/tunnel/wireguard/wireguard_nt.rs index 14097baedb..f7de82d5be 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_nt.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_nt.rs @@ -38,7 +38,6 @@ use winapi::{ }, }; - lazy_static! { static ref WG_NT_DLL: Mutex<Option<Arc<WgNtDll>>> = Mutex::new(None); static ref ADAPTER_POOL: U16CString = U16CString::from_str("Mullvad").unwrap(); @@ -426,7 +425,6 @@ enum WgAdapterState { Up = 1, } - impl WgNtTunnel { pub fn start_tunnel( config: &Config, @@ -565,7 +563,6 @@ impl Drop for LoggerHandle { } } - struct WgNtAdapter { dll_handle: Arc<WgNtDll>, handle: RawHandle, diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs index 89a2960598..546f9e92ab 100644 --- a/talpid-core/src/tunnel_state_machine/connected_state.rs +++ b/talpid-core/src/tunnel_state_machine/connected_state.rs @@ -28,7 +28,6 @@ use super::connecting_state::TunnelCloseEvent; pub(crate) type TunnelEventsReceiver = Fuse<mpsc::UnboundedReceiver<(TunnelEvent, oneshot::Sender<()>)>>; - pub struct ConnectedStateBootstrap { pub metadata: TunnelMetadata, pub tunnel_events: TunnelEventsReceiver, |
