fix(macos): fix test

leshow · Apr 26, 2023 · afd884e · afd884e
1 parent f4c0742
commit afd884e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 32 deletions.
diff --git a/src/cmsg.rs b/src/cmsg.rs
@@ -206,15 +206,15 @@ pub trait AsPtr<T> {
     }
 }
 
-impl<T, const N: usize> AsPtr<T> for &[T; N] {
-    fn as_ptr(&self) -> *const T {
-        self.as_slice().as_ptr()
-    }
+// impl<T, const N: usize> AsPtr<T> for &[T; N] {
+//     fn as_ptr(&self) -> *const T {
+//         self.as_slice().as_ptr()
+//     }
 
-    fn len(&self) -> usize {
-        N
-    }
-}
+//     fn len(&self) -> usize {
+//         N
+//     }
+// }
 
 impl<T, const N: usize> AsPtr<T> for [T; N] {
     fn as_ptr(&self) -> *const T {

diff --git a/src/lib.rs b/src/lib.rs
@@ -116,6 +116,8 @@ fn log_sendmsg_error<B: AsPtr<u8>>(
 
 #[cfg(test)]
 mod tests {
+    use std::net::Ipv4Addr;
+
     use super::*;
 
     #[test]
@@ -140,35 +142,24 @@ mod tests {
         let saddr = "0.0.0.0:9901".parse().unwrap();
         let a = sync::UdpSocket::bind(saddr).unwrap();
         let b = sync::UdpSocket::bind("0.0.0.0:0").unwrap();
+        let send_port = b.local_addr().unwrap().port();
         let send_addr = b.local_addr().unwrap().ip();
         let buf = b"hello world";
-        // let src = Source::Interface(1);
-        let tr = Transmit::new(saddr, *buf);
+        let src = Source::Interface(1);
+        let tr = Transmit::new(saddr, *buf).src_ip(src);
         b.send_msg(&UdpState::new(), tr).unwrap();
         // recv
         let mut r = [0; 1024];
         let meta = a.recv_msg(&mut r).unwrap();
         assert_eq!(buf[..], r[..11]);
         // dst addr and b addr matches!
-        assert_eq!(meta.dst_local_ip, Some(send_addr));
+        // meta.ifindex
+        assert_eq!(send_port, meta.addr.port());
+        assert_eq!(meta.ifindex, 1);
+        assert!(matches!(
+            meta.dst_local_ip,
+            // dst_local_ip might be 127.0.0.1
+            Some(addr) if addr == send_addr || addr == IpAddr::V4(Ipv4Addr::LOCALHOST)
+        ));
     }
-    // #[test]
-    // fn test_send_recv_msg_if() {
-    //     let addrs: Vec<_> = nix::ifaddrs::getifaddrs().unwrap().collect();
-    //     dbg!(addrs);
-    //     let saddr = "0.0.0.0:9901".parse().unwrap();
-    //     let a = sync::UdpSocket::bind(saddr).unwrap();
-    //     let b = sync::UdpSocket::bind("0.0.0.0:0").unwrap();
-    //     let send_addr = b.local_addr().unwrap().ip();
-    //     let buf = b"hello world";
-    //     // let src = Source::Interface(1);
-    //     let tr = Transmit::new(saddr, *buf);
-    //     b.send_msg(&UdpState::new(), tr).unwrap();
-    //     // recv
-    //     let mut r = [0; 1024];
-    //     let meta = a.recv_msg(&mut r).unwrap();
-    //     assert_eq!(buf[..], r[..11]);
-    //     // dst addr and b addr matches!
-    //     assert_eq!(meta.dst_local_ip, Some(send_addr));
-    // }
 }
diff --git a/src/unix.rs b/src/unix.rs
@@ -1,10 +1,10 @@
+#![allow(clippy::unnecessary_cast)]
 use std::{
     io,
     io::IoSliceMut,
     mem::{self, MaybeUninit},
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
     os::unix::io::AsRawFd,
-    ptr,
     sync::atomic::AtomicUsize,
     task::{Context, Poll},
     time::Instant,
@@ -679,6 +679,8 @@ fn send<B: AsPtr<u8>>(
     last_send_error: &mut Instant,
     transmits: &[Transmit<B>],
 ) -> io::Result<usize> {
+    use std::ptr;
+
     let mut msgs: [libc::mmsghdr; BATCH_SIZE] = unsafe { mem::zeroed() };
     let mut iovecs: [libc::iovec; BATCH_SIZE] = unsafe { mem::zeroed() };
     let mut cmsgs = [cmsg::Aligned([0u8; CMSG_LEN]); BATCH_SIZE];
@@ -692,7 +694,7 @@ fn send<B: AsPtr<u8>>(
         unsafe { MaybeUninit::uninit().assume_init() };
     for (i, transmit) in transmits.iter().enumerate().take(BATCH_SIZE) {
         let dst_addr = unsafe {
-            std::ptr::write(addrs[i].as_mut_ptr(), socket2::SockAddr::from(transmit.dst));
+            ptr::write(addrs[i].as_mut_ptr(), socket2::SockAddr::from(transmit.dst));
             &*addrs[i].as_ptr()
         };
         prepare_msg(
@@ -834,6 +836,8 @@ fn send<B: AsPtr<u8>>(
 
 #[cfg(not(any(target_os = "macos", target_os = "ios")))]
 fn recv(io: SockRef<'_>, bufs: &mut [IoSliceMut<'_>], meta: &mut [RecvMeta]) -> io::Result<usize> {
+    use std::ptr;
+
     let mut names = [MaybeUninit::<libc::sockaddr_storage>::uninit(); BATCH_SIZE];
     let mut ctrls = [cmsg::Aligned(MaybeUninit::<[u8; CMSG_LEN]>::uninit()); BATCH_SIZE];
     let mut hdrs = unsafe { mem::zeroed::<[libc::mmsghdr; BATCH_SIZE]>() };