From 5b651dd3043ee310eedae50a602008e614d48f16 Mon Sep 17 00:00:00 2001
From: cyqsimon <28627918+cyqsimon@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:50:37 +0800
Subject: [PATCH] Rollback `pnet*` crates to v0.34.0

`packet-builder` has issues with v0.35.0
---
 Cargo.lock | 129 ++++++++---------------------------------------------
 Cargo.toml |   6 +--
 2 files changed, 22 insertions(+), 113 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a5d0aca..b9635e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -190,9 +190,9 @@ dependencies = [
  "netstat2",
  "once_cell",
  "packet-builder",
- "pnet 0.35.0",
- "pnet_base 0.35.0",
- "pnet_macros_support 0.35.0",
+ "pnet",
+ "pnet_base",
+ "pnet_macros_support",
  "procfs",
  "ratatui",
  "regex",
@@ -1308,8 +1308,8 @@ source = "git+https://github.com/cyqsimon/packet_builder.git?branch=patch-update
 dependencies = [
  "derive-new",
  "ipnetwork",
- "pnet 0.34.0",
- "pnet_datalink 0.34.0",
+ "pnet",
+ "pnet_datalink",
 ]
 
 [[package]]
@@ -1382,25 +1382,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "130c5b738eeda2dc5796fe2671e49027e6935e817ab51b930a36ec9e6a206a64"
 dependencies = [
  "ipnetwork",
- "pnet_base 0.34.0",
- "pnet_datalink 0.34.0",
- "pnet_packet 0.34.0",
- "pnet_sys 0.34.0",
- "pnet_transport 0.34.0",
-]
-
-[[package]]
-name = "pnet"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "682396b533413cc2e009fbb48aadf93619a149d3e57defba19ff50ce0201bd0d"
-dependencies = [
- "ipnetwork",
- "pnet_base 0.35.0",
- "pnet_datalink 0.35.0",
- "pnet_packet 0.35.0",
- "pnet_sys 0.35.0",
- "pnet_transport 0.35.0",
+ "pnet_base",
+ "pnet_datalink",
+ "pnet_packet",
+ "pnet_sys",
+ "pnet_transport",
 ]
 
 [[package]]
@@ -1412,15 +1398,6 @@ dependencies = [
  "no-std-net",
 ]
 
-[[package]]
-name = "pnet_base"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7"
-dependencies = [
- "no-std-net",
-]
-
 [[package]]
 name = "pnet_datalink"
 version = "0.34.0"
@@ -1429,21 +1406,8 @@ checksum = "ad5854abf0067ebbd3967f7d45ebc8976ff577ff0c7bd101c4973ae3c70f98fe"
 dependencies = [
  "ipnetwork",
  "libc",
- "pnet_base 0.34.0",
- "pnet_sys 0.34.0",
- "winapi",
-]
-
-[[package]]
-name = "pnet_datalink"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7"
-dependencies = [
- "ipnetwork",
- "libc",
- "pnet_base 0.35.0",
- "pnet_sys 0.35.0",
+ "pnet_base",
+ "pnet_sys",
  "winapi",
 ]
 
@@ -1459,34 +1423,13 @@ dependencies = [
  "syn 2.0.79",
 ]
 
-[[package]]
-name = "pnet_macros"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863"
-dependencies = [
- "proc-macro2",
- "quote",
- "regex",
- "syn 2.0.79",
-]
-
 [[package]]
 name = "pnet_macros_support"
 version = "0.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56"
 dependencies = [
- "pnet_base 0.34.0",
-]
-
-[[package]]
-name = "pnet_macros_support"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab"
-dependencies = [
- "pnet_base 0.35.0",
+ "pnet_base",
 ]
 
 [[package]]
@@ -1496,21 +1439,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba"
 dependencies = [
  "glob",
- "pnet_base 0.34.0",
- "pnet_macros 0.34.0",
- "pnet_macros_support 0.34.0",
-]
-
-[[package]]
-name = "pnet_packet"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f"
-dependencies = [
- "glob",
- "pnet_base 0.35.0",
- "pnet_macros 0.35.0",
- "pnet_macros_support 0.35.0",
+ "pnet_base",
+ "pnet_macros",
+ "pnet_macros_support",
 ]
 
 [[package]]
@@ -1523,16 +1454,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "pnet_sys"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "pnet_transport"
 version = "0.34.0"
@@ -1540,21 +1461,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2637e14d7de974ee2f74393afccbc8704f3e54e6eb31488715e72481d1662cc3"
 dependencies = [
  "libc",
- "pnet_base 0.34.0",
- "pnet_packet 0.34.0",
- "pnet_sys 0.34.0",
-]
-
-[[package]]
-name = "pnet_transport"
-version = "0.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f604d98bc2a6591cf719b58d3203fd882bdd6bf1db696c4ac97978e9f4776bf"
-dependencies = [
- "libc",
- "pnet_base 0.35.0",
- "pnet_packet 0.35.0",
- "pnet_sys 0.35.0",
+ "pnet_base",
+ "pnet_packet",
+ "pnet_sys",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 85e2921..2c1484e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,8 +37,8 @@ ipnetwork = "0.20.0"
 itertools = "0.13.0"
 log = "0.4.22"
 once_cell = "1.20.2"
-pnet = "0.35.0"
-pnet_macros_support = "0.35.0"
+pnet = "0.34.0"
+pnet_macros_support = "0.34.0"
 ratatui = "0.28.1"
 resolv-conf = "0.7.0"
 simplelog = "0.12.2"
@@ -61,7 +61,7 @@ sysinfo = "0.32.0"
 [dev-dependencies]
 insta = "1.40.0"
 packet-builder = { version = "0.7.0", git = "https://github.com/cyqsimon/packet_builder.git", branch = "patch-update" }
-pnet_base = "0.35.0"
+pnet_base = "0.34.0"
 regex = "1.11.0"
 rstest = "0.23.0"