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 /src | |
parent | 648eb0a66906035858794977cfaa2a03a75f0210 (diff) |
chore(deps): remove pnet_bandwhich_fork and upgrade to latest pnet + packet_builder releases
Diffstat (limited to 'src')
-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 |
7 files changed, 20 insertions, 20 deletions
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}; |