Fix compilation on macos.

This also updates the testing to do more thorough testing accross
platforms, as that is creating just too many issues.

Author: davidv1992

.github/workflows/build.yaml

@@ -37,18 +37,23 @@ jobs:
           args: --all --check
 
   build:
-    name: Clippy & Test ${{ matrix.os }}
+    name: Clippy & Test ${{ matrix.os }} (${{ matrix.target }})
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        # os: [ubuntu-latest, macos-latest]
-        os: [ubuntu-latest]
-        rust:
-          - 1.88.0
-        target:
-          - ""
-        features:
-          - ""
+        include:
+          - rust: 1.88.0
+            os: ubuntu-latest
+            features: ""
+            target: "x86_64-unknown-linux-gnu"
+          - rust: 1.88.0
+            os: ubuntu-latest
+            features: ""
+            target: "x86_64-unknown-linux-musl"
+          - rust: 1.88.0
+            os: macos-latest
+            features: ""
+            target: "aarch64-apple-darwin"
     steps:
       - name: Checkout sources
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -59,29 +64,9 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           override: true
-      - name: cargo build
-        run: cargo build ${{ matrix.features }}
-      - name: cargo test
-        run: cargo test
-        env:
-          RUST_BACKTRACE: 1
-
-  build-musl:
-    name: Clippy & Test ubuntu-latest / MUSL 
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-        with:
-          persist-credentials: false
-      - name: Install rust toolchain
-        uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af
-        with:
-          toolchain: stable
-          override: true
           default: true
           components: clippy
-          target: x86_64-unknown-linux-musl
+          target: ${{ matrix.target }}
       - name: cargo build
         run: cargo build ${{ matrix.features }}
       - name: cargo test

src/raw_socket.rs

@@ -15,8 +15,6 @@ use crate::{
     },
 };
 
-#[cfg(any(target_os = "macos", target_os = "freebsd"))]
-mod bsdlike;
 #[cfg(not(any(target_os = "macos", target_os = "freebsd", target_os = "linux")))]
 mod fallback;
 #[cfg(target_os = "freebsd")]

src/raw_socket/bsdlike.rs

@@ -1,6 +1,8 @@
-use crate::cerr;
+use libc::{in_addr, sockaddr_storage};
 
-use super::RawSocket;
+use crate::{cerr, control_message::empty_msghdr, raw_socket::sockaddr_len};
+
+use super::{control_message, RawSocket};
 
 impl RawSocket {
     pub(crate) fn so_timestamp(&self, options: u32) -> std::io::Result<()> {
@@ -49,4 +51,57 @@ impl RawSocket {
         }
         Ok(())
     }
+
+    pub(crate) fn enable_destination_ipv4(&self) -> std::io::Result<()> {
+        // SAFETY:
+        //
+        // - the socket is provided by (safe) rust, and will outlive the call
+        // - method is guaranteed to be a valid "name" argument
+        // - the options pointer outlives the call
+        // - the `option_len` corresponds with the options pointer
+        unsafe {
+            cerr(libc::setsockopt(
+                self.fd,
+                libc::IPPROTO_IP,
+                libc::IP_RECVDSTADDR,
+                &(1 as libc::c_int) as *const _ as *const libc::c_void,
+                std::mem::size_of::<libc::c_int>() as libc::socklen_t,
+            ))?;
+        }
+        Ok(())
+    }
+
+    pub(crate) fn send_from_v4(&self, msg: &[u8], _addr: in_addr) -> std::io::Result<()> {
+        // FreeBSD and similar don't support setting an IPv4 source address
+        // on connected sockets.
+        self.send(msg)
+    }
+
+    pub(crate) fn send_from_to_v4(
+        &self,
+        msg: &[u8],
+        from: in_addr,
+        to: sockaddr_storage,
+    ) -> std::io::Result<()> {
+        let to_len = sockaddr_len(to);
+
+        let control_message = control_message(libc::IPPROTO_IP, libc::IP_SENDSRCADDR, from);
+
+        let mut iov = libc::iovec {
+            iov_base: msg.as_ptr() as *mut libc::c_void,
+            iov_len: msg.len(),
+        };
+
+        let mut msghdr = empty_msghdr();
+        msghdr.msg_name = &raw const to as *mut _;
+        msghdr.msg_namelen = to_len;
+        msghdr.msg_iov = &raw mut iov;
+        msghdr.msg_iovlen = 1;
+        msghdr.msg_control = control_message.as_ptr() as *mut _;
+        msghdr.msg_controllen = control_message.len() as _;
+
+        // Safety:
+        // msghdr is valid.
+        cerr(unsafe { libc::sendmsg(self.fd, &raw const msghdr, 0) } as _).map(|_| {})
+    }
 }

src/raw_socket/freebsd.rs

@@ -1,6 +1,8 @@
-use crate::cerr;
+use libc::{in_addr, sockaddr_storage};
 
-use super::RawSocket;
+use crate::{cerr, control_message::empty_msghdr, raw_socket::sockaddr_len};
+
+use super::{control_message, RawSocket};
 
 impl RawSocket {
     pub(crate) fn so_timestamp(&self, options: u32) -> std::io::Result<()> {
@@ -32,4 +34,86 @@ impl RawSocket {
 
         Ok(())
     }
+
+    pub(crate) fn enable_destination_ipv4(&self) -> std::io::Result<()> {
+        // SAFETY:
+        //
+        // - the socket is provided by (safe) rust, and will outlive the call
+        // - method is guaranteed to be a valid "name" argument
+        // - the options pointer outlives the call
+        // - the `option_len` corresponds with the options pointer
+        unsafe {
+            cerr(libc::setsockopt(
+                self.fd,
+                libc::IPPROTO_IP,
+                libc::IP_RECVDSTADDR,
+                &(1 as libc::c_int) as *const _ as *const libc::c_void,
+                std::mem::size_of::<libc::c_int>() as libc::socklen_t,
+            ))?;
+        }
+        Ok(())
+    }
+
+    pub(crate) fn send_from_v4(&self, msg: &[u8], addr: in_addr) -> std::io::Result<()> {
+        let control_message = control_message(
+            libc::IPPROTO_IP,
+            libc::IP_PKTINFO,
+            libc::in_pktinfo {
+                ipi_ifindex: 0,
+                ipi_spec_dst: addr,
+                ipi_addr: libc::in_addr { s_addr: 0 },
+            },
+        );
+
+        let mut iov = libc::iovec {
+            iov_base: msg.as_ptr() as *mut libc::c_void,
+            iov_len: msg.len(),
+        };
+
+        let mut msghdr = empty_msghdr();
+        msghdr.msg_iov = &raw mut iov;
+        msghdr.msg_iovlen = 1;
+        msghdr.msg_control = control_message.as_ptr() as *mut _;
+        msghdr.msg_controllen = control_message.len() as _;
+
+        // Safety:
+        // msghdr is valid.
+        cerr(unsafe { libc::sendmsg(self.fd, &raw const msghdr, 0) } as _).map(|_| {})
+    }
+
+    pub(crate) fn send_from_to_v4(
+        &self,
+        msg: &[u8],
+        from: in_addr,
+        to: sockaddr_storage,
+    ) -> std::io::Result<()> {
+        let to_len = sockaddr_len(to);
+
+        let control_message = control_message(
+            libc::IPPROTO_IP,
+            libc::IP_PKTINFO,
+            libc::in_pktinfo {
+                ipi_ifindex: 0,
+                ipi_spec_dst: from,
+                ipi_addr: libc::in_addr { s_addr: 0 },
+            },
+        );
+
+        let mut iov = libc::iovec {
+            iov_base: msg.as_ptr() as *mut libc::c_void,
+            iov_len: msg.len(),
+        };
+
+        let mut msghdr = empty_msghdr();
+        msghdr.msg_name = &raw const to as *mut _;
+        msghdr.msg_namelen = to_len;
+        msghdr.msg_iov = &raw mut iov;
+        msghdr.msg_iovlen = 1;
+        msghdr.msg_control = control_message.as_ptr() as *mut _;
+        msghdr.msg_controllen = control_message.len() as _;
+
+        // Safety:
+        // msghdr is valid.
+        cerr(unsafe { libc::sendmsg(self.fd, &raw const msghdr, 0) } as _).map(|_| {})
+    }
 }