Revert "chore(packages): use pnet fork until they fix the pselect bug (…

…#83)"

This reverts commit 351e4dd.

Cargo.toml

@@ -17,7 +17,7 @@ license = "MIT"
 exclude = ["src/tests/*", "demo.gif"]
 
 [dependencies]
-pnet_bandwhich_fork = "0.23.0"
+pnet = "0.23.0"
 ipnetwork = "0.15.0"
 tui = "0.5"
 termion = "1.5"
@@ -36,7 +36,6 @@ procfs = "0.7.4"
 
 [dev-dependencies]
 insta = "0.12.0"
-pnet = "0.23.0"
 pnet_base = "0.23.0"
 cargo-insta = "0.11.0"
 packet-builder = "0.4.0"

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};

src/network/sniffer.rs

@@ -1,12 +1,12 @@
 use ::std::boxed::Box;
 
-use ::pnet_bandwhich_fork::datalink::{DataLinkReceiver, NetworkInterface};
-use ::pnet_bandwhich_fork::packet::ethernet::{EtherType, EthernetPacket};
-use ::pnet_bandwhich_fork::packet::ip::IpNextHeaderProtocol;
-use ::pnet_bandwhich_fork::packet::ipv4::Ipv4Packet;
-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::{EtherType, EthernetPacket};
+use ::pnet::packet::ip::IpNextHeaderProtocol;
+use ::pnet::packet::ipv4::Ipv4Packet;
+use ::pnet::packet::tcp::TcpPacket;
+use ::pnet::packet::udp::UdpPacket;
+use ::pnet::packet::Packet;
 
 use ::ipnetwork::IpNetwork;
 use ::std::net::{IpAddr, SocketAddr};

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, Write};
 use ::termion::event::Event;
 use ::termion::input::TermRead;

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 pnet_base::MacAddr;
 
 use crate::tests::cases::test_utils::{

src/tests/cases/test_utils.rs

@@ -7,7 +7,7 @@ use std::iter;
 use crate::network::dns::Client;
 use crate::{Opt, OsInputOutput};
 use ::termion::event::{Event, Key};
-use pnet_bandwhich_fork::datalink::DataLinkReceiver;
+use pnet::datalink::DataLinkReceiver;
 use std::collections::HashMap;
 use std::io::Write;
 use std::sync::{Arc, Mutex};

src/tests/cases/ui.rs

@@ -13,8 +13,8 @@ use crate::tests::cases::test_utils::{
 };
 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 pnet_base::MacAddr;
 
 use crate::{start, Opt, OsInputOutput};

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::future::Future;
 use ::std::net::{IpAddr, Ipv4Addr, SocketAddr};