Merge branch 'master' into set-sockaddr-length-linux

2 files changed, 16 insertions, 13 deletions

diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
index 88bd6f5a..0517615e 100644
--- a/src/sys/socket/addr.rs
+++ b/src/sys/socket/addr.rs
@@ -39,18 +39,17 @@ use std::{fmt, mem, net, ptr, slice};
 /// Convert a std::net::Ipv4Addr into the libc form.
 #[cfg(feature = "net")]
 pub(crate) const fn ipv4addr_to_libc(addr: net::Ipv4Addr) -> libc::in_addr {
-    static_assertions::assert_eq_size!(net::Ipv4Addr, libc::in_addr);
-    // Safe because both types have the same memory layout, and no fancy Drop
-    // impls.
-    unsafe { mem::transmute(addr) }
+    libc::in_addr {
+        s_addr: u32::from_ne_bytes(addr.octets())
+    }
 }
 
 /// Convert a std::net::Ipv6Addr into the libc form.
 #[cfg(feature = "net")]
 pub(crate) const fn ipv6addr_to_libc(addr: &net::Ipv6Addr) -> libc::in6_addr {
-    static_assertions::assert_eq_size!(net::Ipv6Addr, libc::in6_addr);
-    // Safe because both are Newtype wrappers around the same libc type
-    unsafe { mem::transmute(*addr) }
+    libc::in6_addr {
+        s6_addr: addr.octets()
+    }
 }
 
 /// These constants specify the protocol family to be used
@@ -485,6 +484,7 @@ enum UnixAddrKind<'a> {
 }
 impl<'a> UnixAddrKind<'a> {
     /// Safety: sun & sun_len must be valid
+    #[allow(clippy::unnecessary_cast)]   // Not unnecessary on all platforms
     unsafe fn get(sun: &'a libc::sockaddr_un, sun_len: u8) -> Self {
         assert!(sun_len as usize >= offset_of!(libc::sockaddr_un, sun_path));
         let path_len =
@@ -521,6 +521,7 @@ impl<'a> UnixAddrKind<'a> {
 
 impl UnixAddr {
     /// Create a new sockaddr_un representing a filesystem path.
+    #[allow(clippy::unnecessary_cast)]   // Not unnecessary on all platforms
     pub fn new<P: ?Sized + NixPath>(path: &P) -> Result<UnixAddr> {
         path.with_nix_path(|cstr| unsafe {
             let mut ret = libc::sockaddr_un {
@@ -568,6 +569,7 @@ impl UnixAddr {
     /// processes to communicate with processes having a different filesystem view.
     #[cfg(any(target_os = "android", target_os = "linux"))]
     #[cfg_attr(docsrs, doc(cfg(all())))]
+    #[allow(clippy::unnecessary_cast)]   // Not unnecessary on all platforms
     pub fn new_abstract(path: &[u8]) -> Result<UnixAddr> {
         unsafe {
             let mut ret = libc::sockaddr_un {
@@ -990,9 +992,6 @@ impl SockaddrLike for () {
 }
 
 /// An IPv4 socket address
-// This is identical to net::SocketAddrV4.  But the standard library
-// doesn't allow direct access to the libc fields, which we need.  So we
-// reimplement it here.
 #[cfg(feature = "net")]
 #[repr(transparent)]
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
index 4ca12997..3abcb033 100644
--- a/src/sys/socket/mod.rs
+++ b/src/sys/socket/mod.rs
@@ -247,14 +247,18 @@ libc_bitflags! {
         SOF_TIMESTAMPING_SOFTWARE;
         /// Report hardware timestamps as generated by SOF_TIMESTAMPING_TX_HARDWARE when available.
         SOF_TIMESTAMPING_RAW_HARDWARE;
-        /// Collect transmiting timestamps as reported by hardware
+        /// Collect transmitting timestamps as reported by hardware
         SOF_TIMESTAMPING_TX_HARDWARE;
-        /// Collect transmiting timestamps as reported by software
+        /// Collect transmitting timestamps as reported by software
         SOF_TIMESTAMPING_TX_SOFTWARE;
         /// Collect receiving timestamps as reported by hardware
         SOF_TIMESTAMPING_RX_HARDWARE;
         /// Collect receiving timestamps as reported by software
         SOF_TIMESTAMPING_RX_SOFTWARE;
+        /// Generate a unique identifier along with each transmitted packet
+        SOF_TIMESTAMPING_OPT_ID;
+        /// Return transmit timestamps alongside an empty packet instead of the original packet
+        SOF_TIMESTAMPING_OPT_TSONLY;
     }
 }
 
@@ -2239,7 +2243,7 @@ pub fn recvfrom<T: SockaddrLike>(
         Ok((
             ret,
             T::from_raw(
-                addr.assume_init().as_ptr() as *const sockaddr,
+                addr.assume_init().as_ptr(),
                 Some(len),
             ),
         ))