diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 1c32214b2..0a4aa9546 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -18,7 +18,7 @@ outputs: description: Compilable packages for the current OS value: ${{ (runner.os == 'Linux' && '--workspace') || - (runner.os == 'macOS' && '--workspace --exclude ebpf-turn-router --exclude gui-smoke-test') || + (runner.os == 'macOS' && '--workspace --exclude ebpf-turn-router --exclude gui-smoke-test --exclude connlib-client-android') || (runner.os == 'Windows' && '--workspace --exclude ebpf-turn-router --exclude connlib-client-apple --exclude connlib-client-android') }} test-packages: description: Testable packages for the current OS diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 83fe39633..e06de021c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -3748,9 +3748,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "libdbus-sys" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 15b8e08ea..18bebed8a 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -99,7 +99,7 @@ known-folders = "1.2.0" l4-tcp-dns-server = { path = "connlib/l4-tcp-dns-server" } l4-udp-dns-server = { path = "connlib/l4-udp-dns-server" } bufferpool = { path = "bufferpool" } -libc = "0.2.171" +libc = "0.2.172" lockfree-object-pool = "0.1.6" log = "0.4" lru = "0.12.5" diff --git a/rust/connlib/clients/android/src/tun.rs b/rust/connlib/clients/android/src/tun.rs index 12f1ef10a..a17c409db 100644 --- a/rust/connlib/clients/android/src/tun.rs +++ b/rust/connlib/clients/android/src/tun.rs @@ -92,10 +92,9 @@ impl Tun { /// /// The file descriptor must be open. unsafe fn interface_name(fd: RawFd) -> io::Result { - const TUNGETIFF: libc::c_ulong = 0x800454d2; let mut request = tun::ioctl::Request::::new(); - unsafe { ioctl::exec(fd, TUNGETIFF, &mut request)? }; + unsafe { ioctl::exec(fd, libc::TUNGETIFF as libc::c_ulong, &mut request)? }; Ok(request.name().to_string()) }