diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-08-02 15:16:01 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-08-03 15:06:22 +0200 |
| commit | bfda726d68a56ba034c2429206b4d2591c4d033f (patch) | |
| tree | e27674b37f68a1f72ce926ef7e8993a10f0bfcae | |
| parent | 4ee496e6fa7132e5d8426229a1b4f8f69e33f33b (diff) | |
| download | mullvadvpn-bfda726d68a56ba034c2429206b4d2591c4d033f.tar.xz mullvadvpn-bfda726d68a56ba034c2429206b4d2591c4d033f.zip | |
Use std::ffi::c_void in Rust<->iOS code instead of libc::c_void
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | ios/MullvadTransport/shadowsocks-proxy/Cargo.toml | 1 | ||||
| -rw-r--r-- | ios/MullvadTransport/shadowsocks-proxy/src/ffi.rs | 2 | ||||
| -rw-r--r-- | ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml | 1 | ||||
| -rw-r--r-- | ios/TunnelObfuscation/tunnel-obfuscator-proxy/src/ffi.rs | 2 |
5 files changed, 2 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index b679eb5652..244372fbbd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3320,7 +3320,6 @@ name = "shadowsocks-proxy" version = "0.0.0" dependencies = [ "cbindgen", - "libc", "log", "oslog", "shadowsocks-service", @@ -4265,7 +4264,6 @@ name = "tunnel-obfuscator-proxy" version = "0.0.0" dependencies = [ "cbindgen", - "libc", "log", "oslog", "tokio", diff --git a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml index 083b8cfa3f..46162c7c78 100644 --- a/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml +++ b/ios/MullvadTransport/shadowsocks-proxy/Cargo.toml @@ -17,7 +17,6 @@ shadowsocks-service.rev = "c45980bb22d0d50ac888813c59a1edf0cff14a36" shadowsocks-service.features = [ "local", "stream-cipher", "local-http", "local-tunnel" ] tokio = { workspace = true } -libc = "0.2" log = "0.4" [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] diff --git a/ios/MullvadTransport/shadowsocks-proxy/src/ffi.rs b/ios/MullvadTransport/shadowsocks-proxy/src/ffi.rs index fc083f18bf..be3ecf8fa0 100644 --- a/ios/MullvadTransport/shadowsocks-proxy/src/ffi.rs +++ b/ios/MullvadTransport/shadowsocks-proxy/src/ffi.rs @@ -9,7 +9,7 @@ static INIT_LOGGING: Once = Once::new(); #[repr(C)] pub struct ProxyHandle { - pub context: *mut libc::c_void, + pub context: *mut std::ffi::c_void, pub port: u16, } diff --git a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml index 9faa931e41..3608261d22 100644 --- a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml +++ b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/Cargo.toml @@ -14,7 +14,6 @@ bench = false [target.'cfg(target_os = "ios")'.dependencies] tunnel-obfuscation = { path = "../../../tunnel-obfuscation" } tokio = { workspace = true, features = ["sync"] } -libc = "0.2" log = "0.4" oslog = "0.2" diff --git a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/src/ffi.rs b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/src/ffi.rs index a6ea98a86d..1f7e5741d8 100644 --- a/ios/TunnelObfuscation/tunnel-obfuscator-proxy/src/ffi.rs +++ b/ios/TunnelObfuscation/tunnel-obfuscator-proxy/src/ffi.rs @@ -8,7 +8,7 @@ static INIT_LOGGING: Once = Once::new(); #[repr(C)] pub struct ProxyHandle { - pub context: *mut libc::c_void, + pub context: *mut std::ffi::c_void, pub port: u16, } |