bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Disable accept4 on Android.

Browse source
This commit is contained in:
Maarten de Vries 2020-10-31 14:20:18 +01:00
parent 59c6ae615e
commit 3bee37c290
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/std/src/sys/unix/net.rs
View file

@ -195,7 +195,6 @@ impl Socket {
// glibc 2.10 and musl 0.9.5. // glibc 2.10 and musl 0.9.5.
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(any( if #[cfg(any(
target_os = "android",
target_os = "dragonfly", target_os = "dragonfly",
target_os = "freebsd", target_os = "freebsd",
target_os = "illumos", target_os = "illumos",
@ -207,6 +206,13 @@ impl Socket {
libc::accept4(self.0.raw(), storage, len, libc::SOCK_CLOEXEC) libc::accept4(self.0.raw(), storage, len, libc::SOCK_CLOEXEC)
})?; })?;
Ok(Socket(FileDesc::new(fd))) Ok(Socket(FileDesc::new(fd)))
// While the Android kernel supports the syscall,
// it is not included in all versions of Android's libc.
} else if #[cfg(target_os = "android")] {
let fd = cvt_r(|| unsafe {
libc::syscall(libc::SYS_accept4, self.0.raw(), storage, len, libc::SOCK_CLOEXEC)
})?;
Ok(Socket(FileDesc::new(fd as c_int)))
} else { } else {
let fd = cvt_r(|| unsafe { libc::accept(self.0.raw(), storage, len) })?; let fd = cvt_r(|| unsafe { libc::accept(self.0.raw(), storage, len) })?;
let fd = FileDesc::new(fd); let fd = FileDesc::new(fd);