diff options
author | Aram Drevekenin <aram@poor.dev> | 2020-05-03 18:45:57 +0200 |
---|---|---|
committer | Aram Drevekenin <aram@poor.dev> | 2020-05-03 18:45:57 +0200 |
commit | b663b563a64b3c9031424cac1af569d98c45c2c7 (patch) | |
tree | fc949175312e957777c5a218080f95fcb8b8b8d7 | |
parent | 648eb0a66906035858794977cfaa2a03a75f0210 (diff) |
chore(deps): remove pnet_bandwhich_fork and upgrade to latest pnet + packet_builder releases
-rw-r--r-- | Cargo.lock | 178 | ||||
-rw-r--r-- | Cargo.toml | 9 | ||||
-rw-r--r-- | src/main.rs | 2 | ||||
-rw-r--r-- | src/network/sniffer.rs | 18 | ||||
-rw-r--r-- | src/os/shared.rs | 6 | ||||
-rw-r--r-- | src/tests/cases/raw_mode.rs | 4 | ||||
-rw-r--r-- | src/tests/cases/test_utils.rs | 4 | ||||
-rw-r--r-- | src/tests/cases/ui.rs | 2 | ||||
-rw-r--r-- | src/tests/fakes/fake_input.rs | 4 |
9 files changed, 69 insertions, 158 deletions
@@ -7,14 +7,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "aho-corasick" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "aho-corasick" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -87,12 +79,11 @@ dependencies = [ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "packet-builder 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_bandwhich_fork 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "packet-builder 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "procfs 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -577,7 +568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ipnetwork" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -751,15 +742,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "packet-builder" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "derive-new 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", "ipnetwork 0.12.8 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_datalink 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_macros_support 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_datalink 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_macros_support 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -842,107 +833,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pnet" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_datalink 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_packet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_transport 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pnet_bandwhich_fork" -version = "0.23.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base_bandwhich_fork 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_datalink_bandwhich_fork 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_packet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys_bandwhich_fork 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_transport 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_datalink 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_packet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_transport 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pnet_base" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "pnet_base_bandwhich_fork" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pnet_datalink" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pnet_datalink_bandwhich_fork" -version = "0.23.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base_bandwhich_fork 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys_bandwhich_fork 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pnet_macros" -version = "0.21.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_syntax 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pnet_macros_support" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pnet_packet" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_macros 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_macros_support 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_macros 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_macros_support 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", "syntex 0.42.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pnet_sys" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pnet_sys_bandwhich_fork" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", @@ -952,13 +903,13 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.23.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_packet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pnet_sys 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_packet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1198,18 +1149,6 @@ dependencies = [ [[package]] name = "regex" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "regex" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ @@ -1221,14 +1160,6 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "regex-syntax" version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1649,11 +1580,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "ucd-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "unicode-bidi" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1705,11 +1631,6 @@ dependencies = [ ] [[package]] -name = "utf8-ranges" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "uuid" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1824,7 +1745,6 @@ dependencies = [ [metadata] "checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -"checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" "checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92" @@ -1888,7 +1808,7 @@ dependencies = [ "checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" "checksum ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f" "checksum ipnetwork 0.12.8 (registry+https://github.com/rust-lang/crates.io-index)" = "70783119ac90828aaba91eae39db32c6c1b8838deea3637e5238efa0130801ab" -"checksum ipnetwork 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bf7762e2b430ad80cbef992a1d4f15a15d9d4068bdd8e57acb0a3d21d0cf7f40" +"checksum ipnetwork 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e" "checksum itertools 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "87fa75c9dea7b07be3138c49abbb83fd4bea199b5cdc76f9804458edc5da0d6e" "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" @@ -1911,7 +1831,7 @@ dependencies = [ "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -"checksum packet-builder 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c3a4c42f976f5e39b18002d165d238fadb0a897e1252cf96e39109f515e85aa8" +"checksum packet-builder 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "369f20d8356b3f1cfd362c5b3775d3ca71e0290f259eeff6154420fd06d578d6" "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" @@ -1921,18 +1841,14 @@ dependencies = [ "checksum pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547" "checksum pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991" "checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" -"checksum pnet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5cf9ef46222a90a9d1e35bb4fa208e1076c6663a02d8ecf3e264fd5001ab6e8e" -"checksum pnet_bandwhich_fork 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e146697b998acfb2491f2524d1570f81f650a017402ce45b99539c5a5935a605" -"checksum pnet_base 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d818b94d0897cd22f7a18f6c2a94f7ae1dfcedc194bf1665880f6c1155e051" -"checksum pnet_base_bandwhich_fork 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f0886cdc1878c06687cbee7d3ed5045380e57b164bf69f036570559c07f6de88" -"checksum pnet_datalink 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "557ff7deb5ad2b35ac17a495d629d64dfeacf02e7f4834974dceb5e2cc544d55" -"checksum pnet_datalink_bandwhich_fork 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "697cdb8110661cb4eea5aa08684ab50b0b2ab9b0ca88e9bcef2aa232f7c41369" -"checksum pnet_macros 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d228096fd739d4e3e60dee9e1e4f07d9ae0f3f309c876834192538748e561e4" -"checksum pnet_macros_support 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6158bbc3627b9ce01526f5ff8b9895224a0dc96c27baaf79cda0f703a4898ea" -"checksum pnet_packet 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7efa93f5572ed735852737232ba7539977799861642aaba05de87b6a03dc0f74" -"checksum pnet_sys 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab2f8311f738773513fc8192a77e8f77461d97333184c23597a23cb9eb0bd0eb" -"checksum pnet_sys_bandwhich_fork 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "019c5cdc431afe23ae950d145cdf6cc321a8ef4ece501a4cb92c79c3ed4cdabf" -"checksum pnet_transport 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "40851df523364df420e1c85e4885319656904a189a9352657ececcb3c2314fc0" +"checksum pnet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c62df42dcd72f6f2a658bcf38509f1027df1440ac85f1af4badbe034418302dc" +"checksum pnet_base 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7cd5f7e15220afa66b0a9a62841ea10089f39dcaa1c29752c0b22dfc03111b5" +"checksum pnet_datalink 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7318ae1d6e0b7fa1e49933233c9473f2b72d3d18b97e70e2716c6415dde5f915" +"checksum pnet_macros 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bbbd5c52c6e04aa720400f9c71cd0e8bcb38cd13421d5caabd9035e9efa47de9" +"checksum pnet_macros_support 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "daf9c5c0c36766d0a4da9ab268c0700771b8ec367b9463fd678109fa28463c5b" +"checksum pnet_packet 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89e26a864d71d0ac51a549cf40283c44ed1b8f98168545638a4730ef9f560283" +"checksum pnet_sys 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73f0de0c52609f157b25d79ce24d9016ab1bbf10cde761397200d634a833872c" +"checksum pnet_transport 0.26.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6712ab76534340494d849e3c51c64a6261e4b451337b7c05bd3681e384c48b10" "checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" "checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" @@ -1960,9 +1876,7 @@ dependencies = [ "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" "checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" -"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb" "checksum rle-decode-fast 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac" @@ -2010,7 +1924,6 @@ dependencies = [ "checksum tui 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ff64c925f5e20d7a393c598a33b6afc9c9942e7ebc530085588f5b7667ea559" "checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" "checksum ucd-trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8f00ed7be0c1ff1e24f46c3d2af4859f7e863672ba3a6e92e7cff702bf9f06c2" -"checksum ucd-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa9b3b49edd3468c0e6565d85783f51af95212b6fa3986a5500954f00b460874" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" "checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" "checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" @@ -2019,7 +1932,6 @@ dependencies = [ "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" -"checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" "checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" @@ -19,8 +19,8 @@ license = "MIT" exclude = ["src/tests/*", "demo.gif"] [dependencies] -pnet_bandwhich_fork = "0.23.1" -ipnetwork = "0.15.0" +pnet = "0.26.0" +ipnetwork = "0.16.0" tui = "0.5" termion = "1.5" structopt = "0.3" @@ -38,8 +38,7 @@ procfs = "0.7.4" [dev-dependencies] insta = "0.12.0" -pnet = "0.23.0" -pnet_base = "0.23.0" +pnet_base = "0.26.0" cargo-insta = "0.11.0" -packet-builder = "0.4.0" +packet-builder = "0.5.0" regex = "1" diff --git a/src/main.rs b/src/main.rs index d91430a..8c91731 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ use network::{ }; use os::OnSigWinch; -use ::pnet_bandwhich_fork::datalink::{DataLinkReceiver, NetworkInterface}; +use ::pnet::datalink::{DataLinkReceiver, NetworkInterface}; use ::std::collections::HashMap; use ::std::sync::atomic::{AtomicBool, Ordering}; use ::std::sync::{Arc, Mutex}; diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs index 9d44275..405a35a 100644 --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -1,13 +1,13 @@ use ::std::boxed::Box; -use ::pnet_bandwhich_fork::datalink::{DataLinkReceiver, NetworkInterface}; -use ::pnet_bandwhich_fork::packet::ethernet::{EtherTypes, EthernetPacket}; -use ::pnet_bandwhich_fork::packet::ip::{IpNextHeaderProtocol, IpNextHeaderProtocols}; -use ::pnet_bandwhich_fork::packet::ipv4::Ipv4Packet; -use ::pnet_bandwhich_fork::packet::ipv6::Ipv6Packet; -use ::pnet_bandwhich_fork::packet::tcp::TcpPacket; -use ::pnet_bandwhich_fork::packet::udp::UdpPacket; -use ::pnet_bandwhich_fork::packet::Packet; +use ::pnet::datalink::{DataLinkReceiver, NetworkInterface}; +use ::pnet::packet::ethernet::{EtherTypes, EthernetPacket}; +use ::pnet::packet::ip::{IpNextHeaderProtocol, IpNextHeaderProtocols}; +use ::pnet::packet::ipv4::Ipv4Packet; +use ::pnet::packet::ipv6::Ipv6Packet; +use ::pnet::packet::tcp::TcpPacket; +use ::pnet::packet::udp::UdpPacket; +use ::pnet::packet::Packet; use ::ipnetwork::IpNetwork; use ::std::net::{IpAddr, SocketAddr}; @@ -29,7 +29,7 @@ pub enum Direction { } impl Direction { - pub fn new(network_interface_ips: &[IpNetwork], source: IpAddr) -> Self { + pub fn new(network_interface_ips: &Vec<IpNetwork>, source: IpAddr) -> Self { if network_interface_ips .iter() .any(|ip_network| ip_network.ip() == source) diff --git a/src/os/shared.rs b/src/os/shared.rs index 5d3360b..462f269 100644 --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -1,6 +1,6 @@ -use ::pnet_bandwhich_fork::datalink::Channel::Ethernet; -use ::pnet_bandwhich_fork::datalink::DataLinkReceiver; -use ::pnet_bandwhich_fork::datalink::{self, Config, NetworkInterface}; +use ::pnet::datalink::Channel::Ethernet; +use ::pnet::datalink::DataLinkReceiver; +use ::pnet::datalink::{self, Config, NetworkInterface}; use ::std::io::{self, stdin, ErrorKind, Write}; use ::termion::event::Event; use ::termion::input::TermRead; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs index 636abb1..3b4453f 100644 --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -8,8 +8,8 @@ use ::std::net::IpAddr; use packet_builder::payload::PayloadData; use packet_builder::*; -use pnet_bandwhich_fork::datalink::DataLinkReceiver; -use pnet_bandwhich_fork::packet::Packet; +use pnet::datalink::DataLinkReceiver; +use pnet::packet::Packet; use crate::tests::cases::test_utils::{ build_tcp_packet, opts_raw, os_input_output_dns, os_input_output_stdout, test_backend_factory, diff --git a/src/tests/cases/test_utils.rs b/src/tests/cases/test_utils.rs index aba5bc8..0cdcc5b 100644 --- a/src/tests/cases/test_utils.rs +++ b/src/tests/cases/test_utils.rs @@ -8,13 +8,13 @@ use crate::network::dns::Client; use crate::{Opt, OsInputOutput, RenderOpts}; use ::termion::event::{Event, Key}; use packet_builder::*; -use pnet_bandwhich_fork::datalink::DataLinkReceiver; +use pnet::datalink::DataLinkReceiver; use std::collections::HashMap; use std::io::Write; use std::sync::{Arc, Mutex}; use packet_builder::payload::PayloadData; -use pnet_bandwhich_fork::packet::Packet; +use pnet::packet::Packet; use pnet_base::MacAddr; pub fn sleep_and_quit_events(sleep_num: usize) -> Box<KeyboardEvents> { diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs index 824f55e..6464272 100644 --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -13,7 +13,7 @@ use crate::tests::cases::test_utils::{ sleep_and_quit_events, test_backend_factory, }; use ::termion::event::{Event, Key}; -use pnet_bandwhich_fork::datalink::DataLinkReceiver; +use pnet::datalink::DataLinkReceiver; use std::iter; use crate::tests::fakes::KeyboardEvents; diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs index 3290ac2..b0f7d19 100644 --- a/src/tests/fakes/fake_input.rs +++ b/src/tests/fakes/fake_input.rs @@ -1,7 +1,7 @@ use ::async_trait::async_trait; use ::ipnetwork::IpNetwork; -use ::pnet_bandwhich_fork::datalink::DataLinkReceiver; -use ::pnet_bandwhich_fork::datalink::NetworkInterface; +use ::pnet::datalink::DataLinkReceiver; +use ::pnet::datalink::NetworkInterface; use ::std::collections::HashMap; use ::std::net::{IpAddr, Ipv4Addr, SocketAddr}; use ::std::{thread, time}; |