diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-10-17 11:51:18 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-10-20 18:17:19 +0200 |
| commit | 5cee95d43bb0cc3654e5558ba02919dbf32d52aa (patch) | |
| tree | bda93278bf708769adc4fec3f4f526b84f5cf15b /talpid-wireguard/src | |
| parent | b3cc38c2bea1869e495206ec1febc6a92bb300bc (diff) | |
| download | mullvadvpn-5cee95d43bb0cc3654e5558ba02919dbf32d52aa.tar.xz mullvadvpn-5cee95d43bb0cc3654e5558ba02919dbf32d52aa.zip | |
Move talpid-windows-net into talpid-windows
Diffstat (limited to 'talpid-wireguard/src')
| -rw-r--r-- | talpid-wireguard/src/lib.rs | 6 | ||||
| -rw-r--r-- | talpid-wireguard/src/wireguard_nt.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs index cdc09224ef..c95a5d371b 100644 --- a/talpid-wireguard/src/lib.rs +++ b/talpid-wireguard/src/lib.rs @@ -105,7 +105,7 @@ pub enum Error { /// Failed to set IP addresses on WireGuard interface #[cfg(target_os = "windows")] #[error(display = "Failed to set IP addresses on WireGuard interface")] - SetIpAddressesError(#[error(source)] talpid_windows_net::Error), + SetIpAddressesError(#[error(source)] talpid_windows::net::Error), } /// Spawns and monitors a wireguard tunnel @@ -643,12 +643,12 @@ impl WireguardMonitor { })?; // TODO: The LUID can be obtained directly. - let luid = talpid_windows_net::luid_from_alias(iface_name).map_err(|error| { + let luid = talpid_windows::net::luid_from_alias(iface_name).map_err(|error| { log::error!("Failed to obtain tunnel interface LUID: {}", error); CloseMsg::SetupError(Error::IpInterfacesError) })?; for address in addresses { - talpid_windows_net::add_ip_address_for_interface(luid, *address) + talpid_windows::net::add_ip_address_for_interface(luid, *address) .map_err(|error| CloseMsg::SetupError(Error::SetIpAddressesError(error)))?; } Ok(()) diff --git a/talpid-wireguard/src/wireguard_nt.rs b/talpid-wireguard/src/wireguard_nt.rs index c3fb12de1e..daa7da65c8 100644 --- a/talpid-wireguard/src/wireguard_nt.rs +++ b/talpid-wireguard/src/wireguard_nt.rs @@ -22,7 +22,7 @@ use std::{ sync::{Arc, Mutex}, }; use talpid_types::{BoxedError, ErrorExt}; -use talpid_windows_net as net; +use talpid_windows::net; use widestring::{U16CStr, U16CString}; use windows_sys::{ core::GUID, @@ -1031,7 +1031,7 @@ mod tests { public_key: *WG_PUBLIC_KEY.as_bytes(), preshared_key: [0; WIREGUARD_KEY_LENGTH], persistent_keepalive: 0, - endpoint: talpid_windows_net::inet_sockaddr_from_socketaddr( + endpoint: talpid_windows::net::inet_sockaddr_from_socketaddr( "1.2.3.4:1234".parse().unwrap(), ) .into(), |