diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-06-30 08:14:35 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-06-30 08:14:35 +0200 |
| commit | b85be0f5ff46cdfcc3672941fe5a62345605f627 (patch) | |
| tree | 18b993af610b6805fa238404befcb078addb4269 | |
| parent | 6ffcfc939ec7364856bc66714ec39149a6fcad79 (diff) | |
| parent | 7bcdd4eea712b968e649911692e892dee37b350c (diff) | |
| download | mullvadvpn-b85be0f5ff46cdfcc3672941fe5a62345605f627.tar.xz mullvadvpn-b85be0f5ff46cdfcc3672941fe5a62345605f627.zip | |
Merge branch 'fix-boringtun-bad-fd'
| -rw-r--r-- | talpid-wireguard/src/boringtun/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/talpid-wireguard/src/boringtun/mod.rs b/talpid-wireguard/src/boringtun/mod.rs index 44ba1eb1d8..cff6848bc7 100644 --- a/talpid-wireguard/src/boringtun/mod.rs +++ b/talpid-wireguard/src/boringtun/mod.rs @@ -12,7 +12,7 @@ use boringtun::device::{ #[cfg(not(target_os = "android"))] use ipnetwork::IpNetwork; #[cfg(target_os = "android")] -use std::os::fd::AsRawFd; +use std::os::fd::IntoRawFd; use std::{ future::Future, ops::Deref, @@ -298,7 +298,7 @@ pub fn get_tunnel_for_userspace( .map_err(TunnelError::SetupTunnelDevice)?; match nix::unistd::dup(&tunnel_device) { - Ok(fd) => return Ok((tunnel_device, fd.as_raw_fd())), + Ok(fd) => return Ok((tunnel_device, fd.into_raw_fd())), #[cfg(not(target_os = "macos"))] Err(error @ nix::errno::Errno::EBADFD) => last_error = Some(error), Err(error @ nix::errno::Errno::EBADF) => last_error = Some(error), |