diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-07-30 15:26:24 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-07-30 15:26:24 +0200 |
| commit | a4bf0a191a502d183bb4ca93ad4f1194d55722bc (patch) | |
| tree | 4a0f4bb77814b2a63bd05fe5bf9f321fe6513495 | |
| parent | e634114c76e21004c6f4c0394cda51ca75df4049 (diff) | |
| download | mullvadvpn-boringtun-tso.tar.xz mullvadvpn-boringtun-tso.zip | |
fix tso androidboringtun-tso
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | talpid-wireguard/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-wireguard/src/boringtun/mod.rs | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 5727e3d5b8..018ced2956 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -455,7 +455,7 @@ dependencies = [ [[package]] name = "boringtun" version = "0.6.0" -source = "git+https://github.com/mullvad/boringtun?rev=d2efda34e2b5c852ccbf19c2828e515b732cfe1e#d2efda34e2b5c852ccbf19c2828e515b732cfe1e" +source = "git+https://github.com/mullvad/boringtun?rev=9bd738b2476e50b25e08af1cd69084560e409102#9bd738b2476e50b25e08af1cd69084560e409102" dependencies = [ "aead", "async-trait", diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml index 8bfe833ccf..8da7b9ed70 100644 --- a/talpid-wireguard/Cargo.toml +++ b/talpid-wireguard/Cargo.toml @@ -48,7 +48,7 @@ tokio-stream = { version = "0.1", features = ["io-util"] } optional = true features = ["device", "tun"] git = "https://github.com/mullvad/boringtun" -rev = "d2efda34e2b5c852ccbf19c2828e515b732cfe1e" +rev = "9bd738b2476e50b25e08af1cd69084560e409102" [target.'cfg(unix)'.dependencies] nix = { workspace = true, features = ["fs"] } diff --git a/talpid-wireguard/src/boringtun/mod.rs b/talpid-wireguard/src/boringtun/mod.rs index 30d2ae7ff6..6bf5f6a2a7 100644 --- a/talpid-wireguard/src/boringtun/mod.rs +++ b/talpid-wireguard/src/boringtun/mod.rs @@ -568,8 +568,7 @@ fn get_tunnel_for_userspace( .open_tun() .map_err(TunnelError::SetupTunnelDevice)?; - // TODO - boringtun::tun::tso::try_enable_tso(&tun.deref().dev).expect("Failed to enable TUN TSO"); + boringtun::tun::tso::try_enable_tso(tun.deref()).expect("Failed to enable TUN TSO"); Ok(tun) } @@ -600,6 +599,9 @@ pub fn get_tunnel_for_userspace( .open_tun() .map_err(TunnelError::SetupTunnelDevice)?; + // TODO + boringtun::tun::tso::try_enable_tso(&tunnel_device).expect("Failed to enable TUN TSO"); + match nix::unistd::dup(&tunnel_device) { Ok(fd) => return Ok((tunnel_device, fd.into_raw_fd())), #[cfg(not(target_os = "macos"))] |