Rename to Timestampns

Author: WiSaGaN

src/sys/socket/mod.rs

@@ -560,7 +560,7 @@ pub enum ControlMessageOwned {
     ///
     /// [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"))]
-    ScmTimestampNs(TimeSpec),
+    ScmTimestampns(TimeSpec),
     #[cfg(any(
         target_os = "android",
         target_os = "ios",
@@ -655,7 +655,7 @@ impl ControlMessageOwned {
             #[cfg(all(target_os = "linux", any(target_arch = "x86_64"), target_env = "gnu"))]
             (libc::SOL_SOCKET, libc::SCM_TIMESTAMPNS) => {
                 let ts: libc::timespec = ptr::read_unaligned(p as *const _);
-                ControlMessageOwned::ScmTimestampNs(TimeSpec::from(ts))
+                ControlMessageOwned::ScmTimestampns(TimeSpec::from(ts))
             }
             #[cfg(any(
                 target_os = "android",

src/sys/socket/sockopt.rs

@@ -273,7 +273,7 @@ sockopt_impl!(Both, BindToDevice, libc::SOL_SOCKET, libc::SO_BINDTODEVICE, OsStr
 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"))]
-sockopt_impl!(Both, ReceiveTimestampNs, libc::SOL_SOCKET, libc::SO_TIMESTAMPNS, bool);
+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);
 #[cfg(target_os = "openbsd")]

test/sys/test_socket.rs

@@ -1551,7 +1551,7 @@ fn test_recvmsg_timestampns() {
         SockType::Datagram,
         SockFlag::empty(),
         None).unwrap();
-    setsockopt(in_socket, sockopt::ReceiveTimestampNs, &true).unwrap();
+    setsockopt(in_socket, sockopt::ReceiveTimestampns, &true).unwrap();
     let localhost = InetAddr::new(IpAddr::new_v4(127, 0, 0, 1), 0);
     bind(in_socket, &SockAddr::new_inet(localhost)).unwrap();
     let address = getsockname(in_socket).unwrap();
@@ -1568,7 +1568,7 @@ fn test_recvmsg_timestampns() {
     let iov = [IoVec::from_mut_slice(&mut buffer)];
     let r = recvmsg(in_socket, &iov, Some(&mut cmsgspace), flags).unwrap();
     let rtime = match r.cmsgs().next() {
-        Some(ControlMessageOwned::ScmTimestampNs(rtime)) => rtime,
+        Some(ControlMessageOwned::ScmTimestampns(rtime)) => rtime,
         Some(_) => panic!("Unexpected control message"),
         None => panic!("No control message")
     };
@@ -1599,7 +1599,7 @@ fn test_recvmmsg_timestampns() {
         SockType::Datagram,
         SockFlag::empty(),
         None).unwrap();
-    setsockopt(in_socket, sockopt::ReceiveTimestampNs, &true).unwrap();
+    setsockopt(in_socket, sockopt::ReceiveTimestampns, &true).unwrap();
     let localhost = InetAddr::new(IpAddr::new_v4(127, 0, 0, 1), 0);
     bind(in_socket, &SockAddr::new_inet(localhost)).unwrap();
     let address = getsockname(in_socket).unwrap();
@@ -1622,7 +1622,7 @@ fn test_recvmmsg_timestampns() {
     ];
     let r = recvmmsg(in_socket, &mut data, flags, None).unwrap();
     let rtime = match r[0].cmsgs().next() {
-        Some(ControlMessageOwned::ScmTimestampNs(rtime)) => rtime,
+        Some(ControlMessageOwned::ScmTimestampns(rtime)) => rtime,
         Some(_) => panic!("Unexpected control message"),
         None => panic!("No control message")
     };