Add more archs for timestampns

Author: WiSaGaN

src/sys/socket/mod.rs

@@ -7,7 +7,11 @@ use libc::{self, c_void, c_int, iovec, socklen_t, size_t,
         CMSG_FIRSTHDR, CMSG_NXTHDR, CMSG_DATA, CMSG_LEN};
 use std::{mem, ptr, slice};
 use std::os::unix::io::RawFd;
-#[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
+#[cfg(all(target_os = "linux", any(
+            target_arch = "x86",
+            target_arch = "x86_64",
+            target_arch = "aarch64",
+            ), not(target_env = "musl")))]
 use crate::sys::time::TimeSpec;
 use crate::sys::time::TimeVal;
 use crate::sys::uio::IoVec;
@@ -559,7 +563,11 @@ pub enum ControlMessageOwned {
     /// Nanoseconds resolution timestamp
     ///
     /// [Further reading](https://www.kernel.org/doc/html/latest/networking/timestamping.html)
-    #[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
+    #[cfg(all(target_os = "linux", any(
+                target_arch = "x86",
+                target_arch = "x86_64",
+                target_arch = "aarch64",
+                ), not(target_env = "musl")))]
     ScmTimestampns(TimeSpec),
     #[cfg(any(
         target_os = "android",
@@ -652,7 +660,11 @@ impl ControlMessageOwned {
                 let tv: libc::timeval = ptr::read_unaligned(p as *const _);
                 ControlMessageOwned::ScmTimestamp(TimeVal::from(tv))
             },
-            #[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
+            #[cfg(all(target_os = "linux", any(
+                        target_arch = "x86",
+                        target_arch = "x86_64",
+                        target_arch = "aarch64",
+                        ), not(target_env = "musl")))]
             (libc::SOL_SOCKET, libc::SCM_TIMESTAMPNS) => {
                 let ts: libc::timespec = ptr::read_unaligned(p as *const _);
                 ControlMessageOwned::ScmTimestampns(TimeSpec::from(ts))

src/sys/socket/sockopt.rs

@@ -272,7 +272,11 @@ sockopt_impl!(Both, BindToDevice, libc::SOL_SOCKET, libc::SO_BINDTODEVICE, OsStr
 #[cfg(any(target_os = "android", target_os = "linux"))]
 sockopt_impl!(GetOnly, OriginalDst, libc::SOL_IP, libc::SO_ORIGINAL_DST, libc::sockaddr_in);
 sockopt_impl!(Both, ReceiveTimestamp, libc::SOL_SOCKET, libc::SO_TIMESTAMP, bool);
-#[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
+#[cfg(all(target_os = "linux", any(
+            target_arch = "x86",
+            target_arch = "x86_64",
+            target_arch = "aarch64",
+            ), not(target_env = "musl")))]
 sockopt_impl!(Both, ReceiveTimestampns, libc::SOL_SOCKET, libc::SO_TIMESTAMPNS, bool);
 #[cfg(any(target_os = "android", target_os = "linux"))]
 sockopt_impl!(Both, IpTransparent, libc::SOL_IP, libc::IP_TRANSPARENT, bool);

test/sys/test_socket.rs

@@ -1536,7 +1536,14 @@ pub fn test_vsock() {
     thr.join().unwrap();
 }
 
-#[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
+// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
+// support is suspected.
+#[cfg_attr(all(not(any(target_arch = "x86_64")), any(target_env = "musl")), ignore)]
+#[cfg(all(target_os = "linux", any(
+            target_arch = "x86",
+            target_arch = "x86_64",
+            target_arch = "aarch64",
+            ), not(target_env = "musl")))]
 #[test]
 fn test_recvmsg_timestampns() {
     use nix::sys::socket::*;
@@ -1584,7 +1591,14 @@ fn test_recvmsg_timestampns() {
     nix::unistd::close(in_socket).unwrap();
 }
 
-#[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
+// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
+// support is suspected.
+#[cfg_attr(all(not(any(target_arch = "x86_64")), any(target_env = "musl")), ignore)]
+#[cfg(all(target_os = "linux", any(
+            target_arch = "x86",
+            target_arch = "x86_64",
+            target_arch = "aarch64",
+            ), not(target_env = "musl")))]
 #[test]
 fn test_recvmmsg_timestampns() {
     use nix::sys::socket::*;