diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-11 11:32:28 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-08-11 11:32:28 +0200 |
| commit | df209be76105db4da7b667f0b2eb4bfd24234ec4 (patch) | |
| tree | 812b0085ba37012862279970e36afdb43bb1de02 | |
| parent | 28ccf8f5005d196e5369557de163f49bba40bb9a (diff) | |
| parent | 7b2f275c48475f30a8c7b4d23816e548c3344f65 (diff) | |
| download | mullvadvpn-df209be76105db4da7b667f0b2eb4bfd24234ec4.tar.xz mullvadvpn-df209be76105db4da7b667f0b2eb4bfd24234ec4.zip | |
Merge branch 'upgrade-socket2'
| -rw-r--r-- | Cargo.lock | 7 | ||||
| -rw-r--r-- | talpid-openvpn/Cargo.toml | 2 | ||||
| -rw-r--r-- | talpid-windows-net/Cargo.toml | 3 | ||||
| -rw-r--r-- | talpid-windows-net/src/net.rs | 3 | ||||
| -rw-r--r-- | talpid-wireguard/Cargo.toml | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index e7b5e807b6..e744b5b30f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3649,7 +3649,7 @@ dependencies = [ "prost", "shadowsocks-service", "shell-escape", - "socket2 0.4.9", + "socket2 0.5.3", "talpid-routing", "talpid-tunnel", "talpid-types", @@ -3782,9 +3782,8 @@ version = "0.0.0" dependencies = [ "err-derive", "futures", - "socket2 0.4.9", + "socket2 0.5.3", "talpid-types", - "winapi", "windows-sys 0.48.0", ] @@ -3812,7 +3811,7 @@ dependencies = [ "parking_lot", "rand 0.8.5", "rtnetlink", - "socket2 0.4.9", + "socket2 0.5.3", "talpid-dbus", "talpid-routing", "talpid-tunnel", diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml index bf8c41078c..18c8eecd78 100644 --- a/talpid-openvpn/Cargo.toml +++ b/talpid-openvpn/Cargo.toml @@ -28,7 +28,7 @@ tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] } shadowsocks-service = { git = "https://github.com/mullvad/shadowsocks-rust", rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36", features = [ "local", "stream-cipher" ] } [target.'cfg(not(target_os="android"))'.dependencies] -socket2 = { version = "0.4.2", features = ["all"] } +socket2 = { version = "0.5.3" } parity-tokio-ipc = "0.9" triggered = "0.1.1" tonic = { workspace = true } diff --git a/talpid-windows-net/Cargo.toml b/talpid-windows-net/Cargo.toml index f3a6f7046f..18fcbd9d07 100644 --- a/talpid-windows-net/Cargo.toml +++ b/talpid-windows-net/Cargo.toml @@ -10,9 +10,8 @@ publish.workspace = true [target.'cfg(windows)'.dependencies] err-derive = "0.3.1" -socket2 = { version = "0.4.2", features = ["all"] } +socket2 = { version = "0.5.3" } futures = "0.3.15" -winapi = { version = "0.3.6", features = ["ws2def"] } talpid-types = { path = "../talpid-types" } diff --git a/talpid-windows-net/src/net.rs b/talpid-windows-net/src/net.rs index 92e8e97969..7147bb35b0 100644 --- a/talpid-windows-net/src/net.rs +++ b/talpid-windows-net/src/net.rs @@ -9,9 +9,9 @@ use std::{ time::{Duration, Instant}, }; use talpid_types::win32_err; -use winapi::shared::ws2def::SOCKADDR_STORAGE as sockaddr_storage; use windows_sys::{ core::GUID, + Win32::Networking::WinSock::SOCKADDR_STORAGE as sockaddr_storage, Win32::{ Foundation::{ERROR_NOT_FOUND, HANDLE}, NetworkManagement::{ @@ -438,7 +438,6 @@ pub fn try_socketaddr_from_inet_sockaddr(addr: SOCKADDR_INET) -> Result<SocketAd unsafe { let mut storage: sockaddr_storage = mem::zeroed(); *(&mut storage as *mut _ as *mut SOCKADDR_INET) = addr; - // TODO: Switch to windows-sys struct once socket2 is updated SockAddr::new(storage, mem::size_of_val(&addr) as i32) } .as_socket() diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml index af2e889b2c..b211e87a68 100644 --- a/talpid-wireguard/Cargo.toml +++ b/talpid-wireguard/Cargo.toml @@ -34,7 +34,7 @@ duct = "0.13" [target.'cfg(not(target_os="android"))'.dependencies] byteorder = "1" internet-checksum = "0.2" -socket2 = { version = "0.4.2", features = ["all"] } +socket2 = { version = "0.5.3", features = ["all"] } [target.'cfg(unix)'.dependencies] nix = "0.23" |