Merge pull request #2 from leshow/macos

fix(macos): add support for macos + CI

.github/workflows/actions.yml

@@ -0,0 +1,152 @@
+# Based on https://github.com/actions-rs/meta/blob/master/recipes/msrv.md
+
+on: [push, pull_request]
+
+name: Actions
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+          - beta
+          - nightly
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Run cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --all-features
+
+  check-mac:
+    name: Check MacOS
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Run cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --all-features
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
+
+  test-mac:
+    name: Test Suite (macOS)
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Install rustfmt
+        run: rustup component add rustfmt
+
+      - name: Run cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          override: true
+
+      - name: Install clippy
+        run: rustup component add clippy
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -- -D warnings

Cargo.toml

@@ -19,3 +19,6 @@ bytes = "1.1.0"
 futures-core = "0.3.0"
 futures-sink = "0.3.0"
 pin-project-lite = "0.2.0"
+
+# [dev-dependencies]
+# nix = "0.26"

src/cmsg.rs

@@ -38,6 +38,7 @@ impl<'a> Encoder<'a> {
     /// # Panics
     /// - If insufficient buffer space remains.
     /// - If `T` has stricter alignment requirements than `cmsghdr`
+    #[allow(clippy::unnecessary_cast)]
     pub fn push<T: Copy + ?Sized>(&mut self, level: libc::c_int, ty: libc::c_int, value: T) {
         assert!(mem::align_of::<T>() <= mem::align_of::<libc::cmsghdr>());
         let space = unsafe { libc::CMSG_SPACE(mem::size_of_val(&value) as _) as usize };
@@ -75,6 +76,7 @@ impl<'a> Drop for Encoder<'a> {
 /// # Safety
 ///
 /// `cmsg` must refer to a cmsg containing a payload of type `T`
+#[allow(clippy::unnecessary_cast)]
 pub unsafe fn decode<T: Copy>(cmsg: &libc::cmsghdr) -> T {
     assert!(mem::align_of::<T>() <= mem::align_of::<libc::cmsghdr>());
     debug_assert_eq!(
@@ -206,23 +208,44 @@ 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()
+    }
+
+    fn len(&self) -> usize {
+        N
+    }
+}
+
+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
+    }
+}
+
 impl<T> AsPtr<T> for Vec<T> {
     fn as_ptr(&self) -> *const T {
-        self.as_ptr()
+        <Vec<T>>::as_ptr(self)
     }
     fn len(&self) -> usize {
-        self.len()
+        <Vec<T>>::len(self)
     }
 }
 
 impl<T> AsPtr<T> for [T] {
     fn as_ptr(&self) -> *const T {
-        self.as_ptr()
+        <[T]>::as_ptr(self)
     }
     fn len(&self) -> usize {
-        self.len()
+        <[T]>::len(self)
     }
 }
+
 impl AsPtr<u8> for BytesMut {
     fn as_ptr(&self) -> *const u8 {
         <[u8]>::as_ptr(self.as_ref())

src/lib.rs

@@ -113,3 +113,53 @@ fn log_sendmsg_error<B: AsPtr<u8>>(
             err, transmit.dst, transmit.src, transmit.ecn, transmit.contents.len(), transmit.segment_size);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::net::Ipv4Addr;
+
+    use super::*;
+
+    #[test]
+    fn test_create() {
+        let s = sync::UdpSocket::bind("0.0.0.0:9909");
+        assert!(s.is_ok());
+    }
+    #[test]
+    fn test_send_recv() {
+        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 buf = b"hello world";
+        b.send_to(&buf[..], saddr).unwrap();
+        // recv
+        let mut r = [0; 1024];
+        a.recv_from(&mut r).unwrap();
+        assert_eq!(buf[..], r[..11]);
+    }
+    #[test]
+    fn test_send_recv_msg() {
+        let saddr = "0.0.0.0:9902".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).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!
+        // 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)
+        ));
+    }
+}