Merge pull request #19 from ohadravid/bugfix/replace-custom-ffi-with-netlink-crates

Replace bespoke netlink impl with one based on the `netlink-*` crates

Author: ohadravid

.github/workflows/ci.yml

@@ -40,3 +40,14 @@ jobs:
           rustup target add aarch64-apple-ios
           cross build --target aarch64-apple-ios
         if: matrix.os == 'macos-latest'
+
+      - name: setup zig for cargo-zigbuild (on macOS)
+        uses: mlugg/setup-zig@v1
+        if: matrix.os == 'macos-latest'
+
+      - name: run cargo-zigbuild for Linux (on macOS)
+        run: |
+          cargo install --locked cargo-zigbuild
+          rustup target add aarch64-unknown-linux-gnu
+          cargo zigbuild --target aarch64-unknown-linux-gnu
+        if: matrix.os == 'macos-latest'

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "netstat2"
-version = "0.10.1"
+version = "0.11.0"
 authors = ["Ohad Ravid <ohad.rv@gmail.com>", "ivxvm <ivxvm@protonmail.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -14,7 +14,6 @@ Cross-platform library to retrieve network sockets information.
 """
 
 [dependencies]
-libc = "0.2"
 bitflags = "2"
 thiserror = "2"
 
@@ -32,3 +31,9 @@ bindgen = "0.65"
 num-derive = "0.3"
 num-traits = "0.2.8"
 byteorder = "1.3.2"
+
+[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
+netlink-sys = "0.8"
+netlink-packet-core = "0.7"
+netlink-packet-utils = "0.5"
+netlink-packet-sock-diag = "0.4"

README.md

@@ -11,7 +11,7 @@ Provides unified interface and returns data structures which may have additional
 ```toml
 # Cargo.toml
 [dependencies]
-netstat2 = "0.10"
+netstat2 = "0.11"
 ```
 
 This is a fork based on the [netstat](https://crates.io/crates/netstat) crate by [ivxvm](https://github.com/ivxvm).

build.rs

@@ -27,30 +27,6 @@ fn main() {
                 .write_to_file(output_path)
                 .expect("Failed to write libproc bindings");
         }
-        "linux" | "android" => {
-            let bindings = bindgen::builder()
-                .header_contents(
-                    "linux_bindings.h",
-                    r#"
-                    #include <linux/sock_diag.h>
-                    #include <linux/inet_diag.h>
-                    #include <linux/rtnetlink.h>
-                    #include <linux/netlink.h>
-                    #include <linux/tcp.h>
-                "#,
-                )
-                .layout_tests(false)
-                .generate()
-                .expect("Failed to build linux bindings");
-
-            let output_path =
-                Path::new(&env::var("OUT_DIR").expect("OUT_DIR env var was not defined"))
-                    .join("linux_bindings.rs");
-
-            bindings
-                .write_to_file(output_path)
-                .expect("Failed to write linux bindings");
-        }
         _ => {}
     }
 }

src/integrations/linux/api.rs

@@ -2,7 +2,7 @@ use crate::integrations::linux::netlink_iterator::*;
 use crate::integrations::linux::procfs::*;
 use crate::types::error::Error;
 use crate::types::*;
-use libc::*;
+use netlink_packet_sock_diag::{AF_INET, AF_INET6, IPPROTO_TCP, IPPROTO_UDP};
 
 /// Iterate through sockets information.
 pub fn iterate_sockets_info(
@@ -25,22 +25,20 @@ pub fn iterate_sockets_info_without_pids(
     let tcp = proto_flags.contains(ProtocolFlags::TCP);
     let udp = proto_flags.contains(ProtocolFlags::UDP);
     let mut iterators = Vec::with_capacity(4);
-    unsafe {
-        if ipv4 {
-            if tcp {
-                iterators.push(NetlinkIterator::new(AF_INET as u8, IPPROTO_TCP as u8)?);
-            }
-            if udp {
-                iterators.push(NetlinkIterator::new(AF_INET as u8, IPPROTO_UDP as u8)?);
-            }
+    if ipv4 {
+        if tcp {
+            iterators.push(NetlinkIterator::new(AF_INET as u8, IPPROTO_TCP as u8)?);
         }
-        if ipv6 {
-            if tcp {
-                iterators.push(NetlinkIterator::new(AF_INET6 as u8, IPPROTO_TCP as u8)?);
-            }
-            if udp {
-                iterators.push(NetlinkIterator::new(AF_INET6 as u8, IPPROTO_UDP as u8)?);
-            }
+        if udp {
+            iterators.push(NetlinkIterator::new(AF_INET as u8, IPPROTO_UDP as u8)?);
+        }
+    }
+    if ipv6 {
+        if tcp {
+            iterators.push(NetlinkIterator::new(AF_INET6 as u8, IPPROTO_TCP as u8)?);
+        }
+        if udp {
+            iterators.push(NetlinkIterator::new(AF_INET6 as u8, IPPROTO_UDP as u8)?);
         }
     }
     Ok(iterators.into_iter().flatten())

src/integrations/linux/ffi/macros.rs

@@ -1,13 +1,3 @@
-#[allow(non_upper_case_globals)]
-#[allow(non_snake_case)]
-#[allow(unused)]
-mod linux_bindings {
-    include!(concat!(env!("OUT_DIR"), "/linux_bindings.rs"));
-}
-
-#[macro_use]
-mod ffi;
-
 mod api;
 mod ext;
 mod netlink_iterator;