Merge pull request #17 from ohadravid/chore/fix-ffi-and-libc

Fix ffi and libc related issues

Author: ohadravid

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: "1.69.0"
+          toolchain: "1.82.0"
           default: true
 
       - run: cargo test
@@ -37,5 +37,6 @@ jobs:
       - name: run cross build for iOS (on macOS)
         run: |
           cargo install cross
+          rustup target add aarch64-apple-ios
           cross build --target aarch64-apple-ios
         if: matrix.os == 'macos-latest'

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "netstat2"
-version = "0.9.1"
+version = "0.10.0"
 authors = ["Ohad Ravid <ohad.rv@gmail.com>", "ivxvm <ivxvm@protonmail.com>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/ohadravid/netstat2-rs"
@@ -15,8 +15,18 @@ Cross-platform library to retrieve network sockets information.
 
 [dependencies]
 libc = "0.2"
-bitflags = "1.0"
-thiserror = "1"
+bitflags = "2"
+thiserror = "2"
+
+[dev-dependencies]
+criterion = { version = "0.4" }
+
+[[bench]]
+name = "get_sockets_info_benchmark"
+harness = false
+
+[target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "linux", target_os = "android"))'.build-dependencies]
+bindgen = "0.65"
 
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 num-derive = "0.3"

README.md

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

benches/get_sockets_info_benchmark.rs

@@ -1,17 +1,13 @@
-#![feature(test)]
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use netstat2::*;
 
-extern crate test;
-
-#[cfg(test)]
-mod tests {
-    use netstat2::*;
-
-    #[bench]
-    fn bench_new(b: &mut test::Bencher) {
-        b.iter(|| {
-            let af_flags = AddressFamilyFlags::IPV4 | AddressFamilyFlags::IPV6;
-            let proto_flags = ProtocolFlags::TCP | ProtocolFlags::UDP;
-            get_sockets_info(af_flags, proto_flags).unwrap();
-        });
-    }
+fn criterion_benchmark(c: &mut Criterion) {
+    c.bench_function("get_sockets_info", |b| b.iter(|| {
+        let af_flags = AddressFamilyFlags::IPV4 | AddressFamilyFlags::IPV6;
+        let proto_flags = ProtocolFlags::TCP | ProtocolFlags::UDP;
+        let _result = get_sockets_info(black_box(af_flags), proto_flags).unwrap();
+    }));
 }
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);

build.rs

@@ -0,0 +1,49 @@
+use std::env;
+use std::path::Path;
+
+#[cfg(any(target_os = "macos", target_os = "ios"))]
+fn main() {
+    let bindings = bindgen::builder()
+        .header_contents("libproc_rs.h", "#include <libproc.h>")
+        .layout_tests(false)
+        .clang_args(&["-x", "c++", "-I", "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/"])
+        .generate()
+        .expect("Failed to build libproc bindings");
+
+    let output_path = Path::new(&env::var("OUT_DIR")
+        .expect("OUT_DIR env var was not defined"))
+        .join("libproc_bindings.rs");
+
+    bindings
+        .write_to_file(output_path)
+        .expect("Failed to write libproc bindings");
+}
+
+#[cfg(any(target_os = "linux", target_os = "android"))]
+fn main() {
+    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");
+}
+
+#[cfg(target_os = "windows")]
+fn main() {}
+
+#[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "linux", target_os = "android", target_os = "windows")))]
+fn main() {}

cargo-linux.sh

@@ -1,10 +1,4 @@
 #[macro_use]
 mod macros;
-mod enums;
-mod structs;
-mod types;
 
-pub use self::enums::*;
 pub use self::macros::*;
-pub use self::structs::*;
-pub use self::types::*;