Update our fork to the latest libpnet version

.github/dependabot.yml

@@ -5,3 +5,28 @@ updates:
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
+- package-ecosystem: cargo
+  directory: "/pnet_base"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+- package-ecosystem: cargo
+  directory: "/pnet_sys"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+- package-ecosystem: cargo
+  directory: "/pnet_datalink"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+- package-ecosystem: cargo
+  directory: "/pnet_transport"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+- package-ecosystem: cargo
+  directory: "/pnet_packet"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -2,21 +2,28 @@ name: Rust
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 env:
   CARGO_TERM_COLOR: always
   PNET_FEATURES: travis pcap serde
   PNET_MACROS_FEATURES: travis
+  VERBOSE: 1
 
 jobs:
+  spell-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: crate-ci/typos@master
+
   build-ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/cache@v2
+    - uses: actions/checkout@v3
+    - uses: actions/cache@v3
       with:
         path: |
           ~/.cargo/registry
@@ -33,9 +40,8 @@ jobs:
   build-macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-
-    - uses: actions/cache@v2
+    - uses: actions/checkout@v3
+    - uses: actions/cache@v3
       with:
         path: |
           ~/.cargo/registry
@@ -51,9 +57,9 @@ jobs:
     env:
         RUST_TEST_THREADS: 1
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       with:
         path: |
           ~/.cargo/registry

Cargo.toml

@@ -1,32 +1,63 @@
 [package]
 name = "pnet"
-version = "0.28.0"
+version = "0.35.0"
 authors = [ "Robert Clipsham <[email protected]>" ]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 homepage = "https://github.com/libpnet/libpnet"
 repository = "https://github.com/libpnet/libpnet"
 description = "Cross-platform, low level networking using the Rust programming language."
 readme = "README.md"
 keywords = ["networking", "transport", "datalink", "packet", "protocol"]
 categories = ["network-programming", "parser-implementations"]
 build = "build.rs"
+edition = "2021"
 
 [features]
 benchmark = []
 netmap = ["pnet_datalink/netmap_sys", "pnet_datalink/netmap"]
 pcap = ["pnet_datalink/pcap"]
 appveyor = []
 travis = []
-serde = ["pnet_base/serde", "pnet_datalink/serde"]
+serde = ["pnet_base/serde", "pnet_datalink?/serde"]
+std = ["pnet_base/std", "pnet_sys", "pnet_datalink", "pnet_transport", "ipnetwork"]
+default = ["std"]
 
 [dependencies]
-ipnetwork = "0.18.0"
+ipnetwork = { version = "0.20.0", optional = true }
 
-pnet_base = { path = "pnet_base", version = "0.28.0" }
-pnet_sys = { path = "pnet_sys", version = "0.28.0" }
-pnet_datalink = { path = "pnet_datalink", version = "0.28.0" }
-pnet_transport = { path = "pnet_transport", version = "0.28.0" }
-pnet_packet = { path = "pnet_packet", version = "0.28.0" }
+pnet_base = { path = "pnet_base", version = "0.35.0", default-features = false }
+pnet_sys = { path = "pnet_sys", version = "0.35.0", optional = true, default-features = false }
+pnet_datalink = { path = "pnet_datalink", version = "0.35.0", optional = true, default-features = false }
+pnet_transport = { path = "pnet_transport", version = "0.35.0", optional = true, default-features = false }
+pnet_packet = { path = "pnet_packet", version = "0.35.0", default-features = false }
 
 [dev-dependencies]
-time = "0.2.26"
+time = "0.3.23"
+
+[[example]]
+name = "ip_to_mac"
+required-features = ["std"]
+
+[[example]]
+name = "fanout"
+required-features = ["std"]
+
+[[example]]
+name = "list_interfaces"
+required-features = ["std"]
+
+[[example]]
+name = "packetdump"
+required-features = ["std"]
+
+[[example]]
+name = "transport_echo_server"
+required-features = ["std"]
+
+[[bench]]
+name = "rs_sender"
+required-features = ["std"]
+
+[[bench]]
+name = "rs_receiver"
+required-features = ["std"]

README.md

@@ -68,7 +68,7 @@ To use `libpnet` in your project, add the following to your Cargo.toml:
 
 ```
 [dependencies.pnet]
-version = "0.28.0"
+version = "0.35.0"
 ```
 
 `libpnet` should work with the latest stable version of Rust.

benches/rs_receiver.rs

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, 2015 Robert Clipsham <[email protected]>
+// Copyright (c) 2014, 2015, 2022 Robert Clipsham <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -10,6 +10,7 @@ extern crate pnet_datalink;
 extern crate time;
 
 use std::env;
+use time::OffsetDateTime;
 
 fn main() {
     use pnet_datalink::Channel::Ethernet;
@@ -33,14 +34,14 @@ fn main() {
 
     let mut i = 0usize;
     let mut timestamps = Vec::with_capacity(201);
-    timestamps.push(time::precise_time_ns() / 1_000);
+    timestamps.push(OffsetDateTime::now_utc().unix_timestamp());
 
     loop {
         match rx.next() {
             Ok(_) => {
                 i += 1;
                 if i == 1_000_000 {
-                    timestamps.push(time::precise_time_ns() / 1_000);
+                    timestamps.push(OffsetDateTime::now_utc().unix_timestamp());
                     if timestamps.len() == 201 {
                         break;
                     }

benches/rs_sender.rs

@@ -1,4 +1,4 @@
-// Copyright (c) 2014, 2015 Robert Clipsham <[email protected]>
+// Copyright (c) 2014, 2015, 2022 Robert Clipsham <[email protected]>
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -44,7 +44,7 @@ pub fn build_ipv4_header(packet: &mut [u8]) -> MutableIpv4Packet {
 pub fn build_udp_header(packet: &mut [u8]) -> MutableUdpPacket {
     let mut udp_header = MutableUdpPacket::new(packet).unwrap();
 
-    udp_header.set_source(1234); // Arbitary port number
+    udp_header.set_source(1234); // Arbitrary port number
     udp_header.set_destination(1234);
     udp_header.set_length((UDP_HEADER_LEN + TEST_DATA_LEN) as u16);
 
@@ -95,7 +95,7 @@ fn main() {
     {
         let mut mut_ethernet_header = MutableEthernetPacket::new(&mut buffer[..]).unwrap();
         mut_ethernet_header.set_destination(destination);
-        mut_ethernet_header.set_source(interface.mac_address());
+        mut_ethernet_header.set_source(interface.mac.unwrap());
         mut_ethernet_header.set_ethertype(EtherTypes::Ipv4);
         build_udp4_packet(mut_ethernet_header.payload_mut(), "rmesg");
     }

build.sh

@@ -23,13 +23,13 @@ MACROS_WITH_SYNTEX=0
 if [[ -n "$PNET_FEATURES" ]]; then
     PNET_CARGO_FLAGS="--no-default-features --features \"$PNET_FEATURES\""
 else
-    PNET_CARGO_FLAGS=
+    PNET_CARGO_FLAGS=""
 fi
 
 if [[ -n "$PNET_MACROS_FEATURES" ]]; then
     PNET_MACROS_CARGO_FLAGS="--no-default-features --features \"$PNET_MACROS_FEATURES\""
 else
-    PNET_MACROS_CARGO_FLAGS=
+    PNET_MACROS_CARGO_FLAGS=""
 fi
 
 # FIXME Need to get interface differently on Windows
@@ -38,6 +38,8 @@ IPROUTE2=$(which ip)
 
 echo $PNET_MACROS_FEATURES | grep -q with-syntex && MACROS_WITH_SYNTEX=1
 
+PNET_TEST_IFACE=""
+
 if [[ -x "$IFCONFIG" ]]; then
     PNET_TEST_IFACE=$($IFCONFIG | egrep 'UP| active' | \
                       perl -pe '/^[A-z0-9]+:([^\n]|\n\t)*status: active/' | \
@@ -60,6 +62,8 @@ if [[ -z "$PNET_TEST_IFACE" && "$SYSTEM" = "Linux" ]]; then
     done
 fi
 
+set -euo pipefail
+
 # FIXME Need to link libraries properly on Windows
 build() {
     if [[ -x "$CARGO" ]]; then
@@ -104,17 +108,17 @@ run_test() {
     export RUST_TEST_THREADS=1 &&
     case "$SYSTEM" in
         Linux)
-            "$SUDO" -E LD_LIBRARY_PATH=$LD_LIBRARY_PATH sh -c "$CARGO build $PNET_CARGO_FLAGS --release && \
-                                                             $CARGO test $PNET_CARGO_FLAGS && \
-                                                             $CARGO bench --no-run $PNET_CARGO_FLAGS && \
-                                                             $CARGO doc $PNET_CARGO_FLAGS"
+            "$SUDO" -E sh -c "$CARGO build $PNET_CARGO_FLAGS --release && \
+                              $CARGO test $PNET_CARGO_FLAGS && \
+                              $CARGO bench --no-run $PNET_CARGO_FLAGS && \
+                              $CARGO doc $PNET_CARGO_FLAGS"
         ;;
         FreeBSD|Darwin)
             export PNET_TEST_IFACE
-            "$SUDO" -E DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH bash -c "$CARGO build $PNET_CARGO_FLAGS && \
-                                                                   $CARGO test $PNET_CARGO_FLAGS && \
-                                                                   $CARGO bench --no-run $PNET_CARGO_FLAGS && \
-                                                                   $CARGO doc $PNET_CARGO_FLAGS"
+            "$SUDO" -E bash -c "$CARGO build $PNET_CARGO_FLAGS && \
+                                $CARGO test $PNET_CARGO_FLAGS && \
+                                $CARGO bench --no-run $PNET_CARGO_FLAGS && \
+                                $CARGO doc $PNET_CARGO_FLAGS"
         ;;
         MINGW*|MSYS*)
             PNET_TEST_IFACE=$PNET_TEST_IFACE RUST_TEST_THREADS=1 $TESTER
@@ -153,6 +157,7 @@ travis_script() {
         ;;
         *)
             echo "Unsupported travis platform"
+            exit 1
         ;;
     esac