summaryrefslogtreecommitdiffhomepage
path: root/test/test-runner/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-10-21 16:19:17 +0200
committerDavid Lönnhager <david.l@mullvad.net>2023-10-21 16:23:59 +0200
commit03feae48cd2832cf8460a76ccb5aa868fc52435c (patch)
tree9e00a8a1c0259ca1c33a114ecf4a60083bc4e129 /test/test-runner/src
parentc9f9f6be9d9948ac92c7cef6308bfc5a6997bde9 (diff)
downloadmullvadvpn-03feae48cd2832cf8460a76ccb5aa868fc52435c.tar.xz
mullvadvpn-03feae48cd2832cf8460a76ccb5aa868fc52435c.zip
Remove references to talpid-windows-net in e2e tests
Diffstat (limited to 'test/test-runner/src')
-rw-r--r--test/test-runner/src/net.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test-runner/src/net.rs b/test/test-runner/src/net.rs
index df2c66dae5..851a2f2951 100644
--- a/test/test-runner/src/net.rs
+++ b/test/test-runner/src/net.rs
@@ -181,8 +181,8 @@ pub async fn send_ping(
#[cfg(target_os = "windows")]
if let Some(interface) = interface {
let family = match destination {
- IpAddr::V4(_) => talpid_windows_net::AddressFamily::Ipv4,
- IpAddr::V6(_) => talpid_windows_net::AddressFamily::Ipv6,
+ IpAddr::V4(_) => talpid_windows::net::AddressFamily::Ipv4,
+ IpAddr::V6(_) => talpid_windows::net::AddressFamily::Ipv6,
};
source_ip = get_interface_ip_for_family(interface, family)
.map_err(|_error| test_rpc::Error::Syscall)?;
@@ -285,7 +285,7 @@ pub fn get_interface_name(interface: Interface) -> &'static str {
pub fn get_interface_ip(interface: Interface) -> Result<IpAddr, test_rpc::Error> {
// TODO: IPv6
- get_interface_ip_for_family(interface, talpid_windows_net::AddressFamily::Ipv4)
+ get_interface_ip_for_family(interface, talpid_windows::net::AddressFamily::Ipv4)
.map_err(|_error| test_rpc::Error::Syscall)?
.ok_or(test_rpc::Error::InterfaceNotFound)
}
@@ -293,17 +293,17 @@ pub fn get_interface_ip(interface: Interface) -> Result<IpAddr, test_rpc::Error>
#[cfg(target_os = "windows")]
fn get_interface_ip_for_family(
interface: Interface,
- family: talpid_windows_net::AddressFamily,
+ family: talpid_windows::net::AddressFamily,
) -> Result<Option<IpAddr>, ()> {
let interface = match interface {
Interface::NonTunnel => non_tunnel_interface(),
Interface::Tunnel => TUNNEL_INTERFACE,
};
- let interface_alias = talpid_windows_net::luid_from_alias(interface).map_err(|error| {
+ let interface_alias = talpid_windows::net::luid_from_alias(interface).map_err(|error| {
log::error!("Failed to obtain interface LUID: {error}");
})?;
- talpid_windows_net::get_ip_address_for_interface(family, interface_alias).map_err(|error| {
+ talpid_windows::net::get_ip_address_for_interface(family, interface_alias).map_err(|error| {
log::error!("Failed to obtain interface IP: {error}");
})
}