r1v3r/chalk_atuin_selected · Datasets at Hugging Face

repo string	pull_number int64	instance_id string	issue_numbers sequence	base_commit string	patch string	test_patch string	problem_statement string	hints_text string	created_at string	version string	updated_at string	environment_setup_commit string	FAIL_TO_PASS sequence	PASS_TO_PASS sequence	FAIL_TO_FAIL sequence	PASS_TO_FAIL sequence	source_dir string
imsnif/bandwhich	23	imsnif__bandwhich-23	[ "16" ]	408ec397c81bb99d6727f01d5dc058e814012714	diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Windows is not supported at the moment - if you'd like to contribute a windows p ### Usage ``` USAGE: - what [FLAGS] --interface <interface> + what [FLAGS] [OPTIONS] FLAGS: -h, --help Prints help information diff --git a/src/display/components/table.rs b/src/display/components/table.rs --- a/src/display/components/table.rs +++ b/src/display/components/table.rs @@ -64,7 +64,11 @@ impl<'a> Table<'a> { .iter() .map(\|(connection, connection_data)\| { vec![ - display_connection_string(&connection, &ip_to_host), + display_connection_string( + &connection, + &ip_to_host, + &connection_data.interface_name, + ), connection_data.process_name.to_string(), display_upload_and_download(*connection_data), ] diff --git a/src/display/ui.rs b/src/display/ui.rs --- a/src/display/ui.rs +++ b/src/display/ui.rs @@ -53,7 +53,11 @@ where write_to_stdout(format!( "connection: <{}> {} up/down Bps: {}/{} process: \"{}\"", timestamp, - display_connection_string(connection, ip_to_host), + display_connection_string( + connection, + ip_to_host, + &connection_network_data.interface_name + ), connection_network_data.total_bytes_uploaded, connection_network_data.total_bytes_downloaded, connection_network_data.process_name diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -20,6 +20,7 @@ pub struct ConnectionData { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, pub process_name: String, + pub interface_name: String, } impl Bandwidth for ConnectionData { diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -52,7 +53,7 @@ pub struct UIState { impl UIState { pub fn new( connections_to_procs: HashMap<Connection, String>, - network_utilization: Utilization, + mut network_utilization: Utilization, ) -> Self { let mut processes: BTreeMap<String, NetworkData> = BTreeMap::new(); let mut remote_addresses: BTreeMap<Ipv4Addr, NetworkData> = BTreeMap::new(); diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -60,32 +61,27 @@ impl UIState { let mut total_bytes_downloaded: u128 = 0; let mut total_bytes_uploaded: u128 = 0; for (connection, process_name) in connections_to_procs { - if let Some(connection_bandwidth_utilization) = - network_utilization.connections.get(&connection) - { + if let Some(connection_info) = network_utilization.connections.remove(&connection) { let data_for_remote_address = remote_addresses .entry(connection.remote_socket.ip) .or_default(); let connection_data = connections.entry(connection).or_default(); let data_for_process = processes.entry(process_name.clone()).or_default(); - data_for_process.total_bytes_downloaded += - &connection_bandwidth_utilization.total_bytes_downloaded; - data_for_process.total_bytes_uploaded += - &connection_bandwidth_utilization.total_bytes_uploaded; + data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; + data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; data_for_process.connection_count += 1; - connection_data.total_bytes_downloaded += - &connection_bandwidth_utilization.total_bytes_downloaded; - connection_data.total_bytes_uploaded += - &connection_bandwidth_utilization.total_bytes_uploaded; + connection_data.total_bytes_downloaded += connection_info.total_bytes_downloaded; + connection_data.total_bytes_uploaded += connection_info.total_bytes_uploaded; connection_data.process_name = process_name; + connection_data.interface_name = connection_info.interface_name; data_for_remote_address.total_bytes_downloaded += - connection_bandwidth_utilization.total_bytes_downloaded; + connection_info.total_bytes_downloaded; data_for_remote_address.total_bytes_uploaded += - connection_bandwidth_utilization.total_bytes_uploaded; + connection_info.total_bytes_uploaded; data_for_remote_address.connection_count += 1; - total_bytes_downloaded += connection_bandwidth_utilization.total_bytes_downloaded; - total_bytes_uploaded += connection_bandwidth_utilization.total_bytes_uploaded; + total_bytes_downloaded += connection_info.total_bytes_downloaded; + total_bytes_uploaded += connection_info.total_bytes_uploaded; } } UIState { diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -36,7 +36,7 @@ use structopt::StructOpt; pub struct Opt { #[structopt(short, long)] /// The network interface to listen on, eg. eth0 - interface: String, + interface: Option<String>, #[structopt(short, long)] /// Machine friendlier output raw: bool, diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -78,8 +78,8 @@ fn try_main() -> Result<(), failure::Error> { } pub struct OsInputOutput { - pub network_interface: NetworkInterface, - pub network_frames: Box<dyn DataLinkReceiver>, + pub network_interfaces: Vec<NetworkInterface>, + pub network_frames: Vec<Box<dyn DataLinkReceiver>>, pub get_open_sockets: fn() -> HashMap<Connection, String>, pub keyboard_events: Box<dyn Iterator<Item = Event> + Send>, pub dns_client: Option<dns::Client>, diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -105,7 +105,13 @@ where let raw_mode = opts.raw; - let mut sniffer = Sniffer::new(os_input.network_interface, os_input.network_frames); + let mut sniffers = os_input + .network_interfaces + .into_iter() + .zip(os_input.network_frames.into_iter()) + .map(\|(iface, frames)\| Sniffer::new(iface, frames)) + .collect::<Vec<Sniffer>>(); + let network_utilization = Arc::new(Mutex::new(Utilization::new())); let ui = Arc::new(Mutex::new(Ui::new(terminal_backend))); diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -196,10 +202,14 @@ where active_threads.push( thread::Builder::new() .name("sniffing_handler".to_string()) - .spawn(move \|\| { - while running.load(Ordering::Acquire) { + .spawn(move \|\| 'sniffing: loop { + for sniffer in sniffers.iter_mut() { if let Some(segment) = sniffer.next() { - network_utilization.lock().unwrap().update(&segment) + network_utilization.lock().unwrap().update(segment); + } + if !running.load(Ordering::Acquire) { + // Break from the outer loop and finish the thread + break 'sniffing; } } }) diff --git a/src/network/connection.rs b/src/network/connection.rs --- a/src/network/connection.rs +++ b/src/network/connection.rs @@ -52,9 +52,11 @@ pub fn display_ip_or_host(ip: Ipv4Addr, ip_to_host: &HashMap<Ipv4Addr, String>) pub fn display_connection_string( connection: &Connection, ip_to_host: &HashMap<Ipv4Addr, String>, + interface_name: &str, ) -> String { format!( - ":{} => {}:{} ({})", + "<{}>:{} => {}:{} ({})", + interface_name, connection.local_port, display_ip_or_host(connection.remote_socket.ip, ip_to_host), connection.remote_socket.port, diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -14,6 +14,7 @@ use ::std::net::{IpAddr, SocketAddr}; use crate::network::{Connection, Protocol}; pub struct Segment { + pub interface_name: String, pub connection: Connection, pub direction: Direction, pub data_length: u128, diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -81,6 +82,7 @@ impl Sniffer { } _ => return None, }; + let interface_name = self.network_interface.name.clone(); let direction = Direction::new(&self.network_interface.ips, &ip_packet); let from = SocketAddr::new(IpAddr::V4(ip_packet.get_source()), source_port); let to = SocketAddr::new(IpAddr::V4(ip_packet.get_destination()), destination_port); diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -90,6 +92,7 @@ impl Sniffer { Direction::Upload => Connection::new(to, source_port, protocol)?, }; Some(Segment { + interface_name, connection, data_length, direction, diff --git a/src/network/utilization.rs b/src/network/utilization.rs --- a/src/network/utilization.rs +++ b/src/network/utilization.rs @@ -3,14 +3,15 @@ use crate::network::{Connection, Direction, Segment}; use ::std::collections::HashMap; #[derive(Clone)] -pub struct TotalBandwidth { +pub struct ConnectionInfo { + pub interface_name: String, pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, } #[derive(Clone)] pub struct Utilization { - pub connections: HashMap<Connection, TotalBandwidth>, + pub connections: HashMap<Connection, ConnectionInfo>, } impl Utilization { diff --git a/src/network/utilization.rs b/src/network/utilization.rs --- a/src/network/utilization.rs +++ b/src/network/utilization.rs @@ -23,14 +24,15 @@ impl Utilization { self.connections.clear(); clone } - pub fn update(&mut self, seg: &Segment) { - let total_bandwidth = - self.connections - .entry(seg.connection.clone()) - .or_insert(TotalBandwidth { - total_bytes_downloaded: 0, - total_bytes_uploaded: 0, - }); + pub fn update(&mut self, seg: Segment) { + let total_bandwidth = self + .connections + .entry(seg.connection) + .or_insert(ConnectionInfo { + interface_name: seg.interface_name, + total_bytes_downloaded: 0, + total_bytes_uploaded: 0, + }); match seg.direction { Direction::Download => { total_bandwidth.total_bytes_downloaded += seg.data_length; diff --git a/src/os/shared.rs b/src/os/shared.rs --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -34,11 +34,11 @@ fn get_datalink_channel( interface: &NetworkInterface, ) -> Result<Box<dyn DataLinkReceiver>, failure::Error> { let mut config = Config::default(); - config.read_timeout = Some(time::Duration::new(0, 1)); + config.read_timeout = Some(time::Duration::new(0, 2_000_000)); match datalink::channel(interface, config) { Ok(Ethernet(_tx, rx)) => Ok(rx), Ok(_) => failure::bail!("Unknown interface type"), - Err(e) => failure::bail!("Failed to listen to network interface: {}", e), + Err(e) => failure::bail!("Failed to listen on network interface: {}", e), } } diff --git a/src/os/shared.rs b/src/os/shared.rs --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -76,15 +76,27 @@ fn create_write_to_stdout() -> Box<dyn FnMut(String) + Send> { }) } -pub fn get_input(interface_name: &str, resolve: bool) -> Result<OsInputOutput, failure::Error> { - let keyboard_events = Box::new(KeyboardEvents); - let network_interface = match get_interface(interface_name) { - Some(interface) => interface, - None => { - failure::bail!("Cannot find interface {}", interface_name); +pub fn get_input( + interface_name: &Option<String>, + resolve: bool, +) -> Result<OsInputOutput, failure::Error> { + let network_interfaces = if let Some(name) = interface_name { + match get_interface(&name) { + Some(interface) => vec![interface], + None => { + failure::bail!("Cannot find interface {}", name); + } } + } else { + datalink::interfaces() }; - let network_frames = get_datalink_channel(&network_interface)?; + + let network_frames = network_interfaces + .iter() + .map(\|iface\| get_datalink_channel(iface)) + .collect::<Result<Vec<_>, _>>()?; + + let keyboard_events = Box::new(KeyboardEvents); let write_to_stdout = create_write_to_stdout(); let (on_winch, cleanup) = sigwinch(); let dns_client = if resolve { diff --git a/src/os/shared.rs b/src/os/shared.rs --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -96,7 +108,7 @@ pub fn get_input(interface_name: &str, resolve: bool) -> Result<OsInputOutput, f }; Ok(OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events,	diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -46,14 +46,14 @@ Note that since `what` sniffs network packets, it requires root privileges - so ### raw_mode `what` also supports an easier-to-parse mode that can be piped or redirected to a file. For example, try: ``` -what -i eth0 --raw \| grep firefox +what --raw \| grep firefox ``` ### Contributing Contributions of any kind are very welcome. If you'd like a new feature (or found a bug), please open an issue or a PR. To set up your development environment: 1. Clone the project -2. `cargo run -- -i <network interface name>` (you can often find out the name with `ifconfig` or `iwconfig`). You might need root privileges to run this application, so be sure to use (for example) sudo. +2. `cargo run`, or if you prefer `cargo run -- -i <network interface name>` (you can often find out the name with `ifconfig` or `iwconfig`). You might need root privileges to run this application, so be sure to use (for example) sudo. To run tests: `cargo test` diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1,5 +1,5 @@ use crate::tests::fakes::{ - create_fake_dns_client, create_fake_on_winch, get_interface, get_open_sockets, KeyboardEvents, + create_fake_dns_client, create_fake_on_winch, get_interfaces, get_open_sockets, KeyboardEvents, NetworkFrames, TestBackend, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -12,6 +12,7 @@ use ::std::net::IpAddr; use packet_builder::payload::PayloadData; use packet_builder::; +use pnet::datalink::DataLinkReceiver; use pnet::packet::Packet; use pnet_base::MacAddr; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -65,13 +66,13 @@ fn one_packet_of_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![Some(build_tcp_packet( + let network_frames = vec![NetworkFrames::new(vec![Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", 443, 12345, b"I am a fake tcp packet", - ))]); + ))]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -84,7 +85,7 @@ fn one_packet_of_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -98,7 +99,7 @@ fn one_packet_of_traffic() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -108,7 +109,7 @@ fn one_packet_of_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -125,7 +126,7 @@ fn bi_directional_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -140,7 +141,7 @@ fn bi_directional_traffic() { 443, b"I am a fake tcp download packet", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -153,7 +154,7 @@ fn bi_directional_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -167,7 +168,7 @@ fn bi_directional_traffic() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -177,7 +178,7 @@ fn bi_directional_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -194,7 +195,7 @@ fn multiple_packets_of_traffic_from_different_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -209,7 +210,7 @@ fn multiple_packets_of_traffic_from_different_connections() { 443, b"I come from 2.2.2.2", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -224,7 +225,7 @@ fn multiple_packets_of_traffic_from_different_connections() { ); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let stdout = Arc::new(Mutex::new(Vec::new())); let write_to_stdout = Box::new({ diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -236,7 +237,7 @@ fn multiple_packets_of_traffic_from_different_connections() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, on_winch, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -246,7 +247,7 @@ fn multiple_packets_of_traffic_from_different_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -263,7 +264,7 @@ fn multiple_packets_of_traffic_from_single_connection() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -278,7 +279,7 @@ fn multiple_packets_of_traffic_from_single_connection() { 443, b"I've come from 1.1.1.1 too!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -291,7 +292,7 @@ fn multiple_packets_of_traffic_from_single_connection() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -305,7 +306,7 @@ fn multiple_packets_of_traffic_from_single_connection() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -315,7 +316,7 @@ fn multiple_packets_of_traffic_from_single_connection() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -332,7 +333,7 @@ fn one_process_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -347,7 +348,7 @@ fn one_process_with_multiple_connections() { 443, b"Funny that, I'm from 3.3.3.3", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -360,7 +361,7 @@ fn one_process_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -374,7 +375,7 @@ fn one_process_with_multiple_connections() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -384,7 +385,7 @@ fn one_process_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -401,7 +402,7 @@ fn multiple_processes_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -430,7 +431,7 @@ fn multiple_processes_with_multiple_connections() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -443,7 +444,7 @@ fn multiple_processes_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -457,7 +458,7 @@ fn multiple_processes_with_multiple_connections() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -467,7 +468,7 @@ fn multiple_processes_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -484,7 +485,7 @@ fn multiple_connections_from_remote_address() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -499,7 +500,7 @@ fn multiple_connections_from_remote_address() { 443, b"Me too, but on a different port", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -512,7 +513,7 @@ fn multiple_connections_from_remote_address() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -526,7 +527,7 @@ fn multiple_connections_from_remote_address() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -536,7 +537,7 @@ fn multiple_connections_from_remote_address() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -554,7 +555,7 @@ fn sustained_traffic_from_one_process() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -570,7 +571,7 @@ fn sustained_traffic_from_one_process() { 443, b"Same here, but one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -583,7 +584,7 @@ fn sustained_traffic_from_one_process() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -597,7 +598,7 @@ fn sustained_traffic_from_one_process() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -607,7 +608,7 @@ fn sustained_traffic_from_one_process() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -625,7 +626,7 @@ fn sustained_traffic_from_multiple_processes() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -655,7 +656,7 @@ fn sustained_traffic_from_multiple_processes() { 443, b"I come 3.3.3.3 one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -668,7 +669,7 @@ fn sustained_traffic_from_multiple_processes() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -682,7 +683,7 @@ fn sustained_traffic_from_multiple_processes() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -692,7 +693,7 @@ fn sustained_traffic_from_multiple_processes() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -710,7 +711,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -768,7 +769,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -781,7 +782,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -795,7 +796,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -805,7 +806,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -823,7 +824,7 @@ fn traffic_with_host_names() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -881,7 +882,7 @@ fn traffic_with_host_names() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -894,7 +895,7 @@ fn traffic_with_host_names() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -921,7 +922,7 @@ fn traffic_with_host_names() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -931,7 +932,7 @@ fn traffic_with_host_names() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -949,7 +950,7 @@ fn no_resolve_mode() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1007,7 +1008,7 @@ fn no_resolve_mode() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1020,7 +1021,7 @@ fn no_resolve_mode() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1047,7 +1048,7 @@ fn no_resolve_mode() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1057,7 +1058,7 @@ fn no_resolve_mode() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: true, }; diff --git a/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap b/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap --- a/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap @@ -3,6 +3,6 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 49/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 49/51 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 49/51 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 49/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap @@ -4,7 +4,7 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "3" up/down Bps: 0/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "3" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "3" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/95 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap @@ -4,8 +4,8 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "4" up/down Bps: 0/39 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 2.2.2.2 up/down Bps: 0/39 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap @@ -3,6 +3,6 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/91 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/91 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/91 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/91 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap @@ -6,10 +6,10 @@ process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "2" up/down Bps: 0/42 connections: 1 process: <TIMESTAMP_REMOVED> "4" up/down Bps: 0/53 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/45 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" -connection: <TIMESTAMP_REMOVED> :443 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 2.2.2.2 up/down Bps: 0/53 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/45 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap --- a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 57/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 34/37 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 57/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 34/37 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 37/36 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 32/46 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 37/36 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap b/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap --- a/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap @@ -3,6 +3,6 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 42/0 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 42/0 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 42/0 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 42/0 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap --- a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap @@ -4,8 +4,8 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/48 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/48 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/48 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/48 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/39 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/39 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 57/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 34/37 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 57/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 34/37 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 37/36 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 32/46 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 37/36 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap @@ -3,9 +3,9 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/51 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/51 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap --- a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 57/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 34/37 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => one.one.one.one:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => one.one.one.one:12345 (tcp) up/down Bps: 57/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: <TIMESTAMP_REMOVED> one.one.one.one up/down Bps: 57/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> three.three.three.three up/down Bps: 34/37 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 37/36 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 32/46 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => one.one.one.one:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => one.one.one.one:12345 (tcp) up/down Bps: 37/36 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: <TIMESTAMP_REMOVED> one.one.one.one up/down Bps: 37/36 connections: 1 remote_address: <TIMESTAMP_REMOVED> three.three.three.three up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap b/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap --- a/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap +++ b/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 49Bps/51Bps :443 => 1.1.1.1:12345 (tcp) 1 49Bps/51Bps + 1 1 49Bps/51Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 49Bps/51Bps diff --git a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps/53Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps - 5 1 0Bps/45Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 2 1 0Bps/42Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps + 4 1 0Bps/53Bps <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps + 5 1 0Bps/45Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 2 1 0Bps/42Bps <interface_name>:443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps - :443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps - :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - :443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps + <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps + <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps + <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + <interface_name>:443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :443 => 2.2.2.2:54321 (tcp) 0Bps/53Bps 2.2.2.2 0Bps/53Bps - :443 => 3.3.3.3:1337 (tcp) 0Bps/45Bps 3.3.3.3 0Bps/45Bps - :443 => 1.1.1.1:12345 (tcp) 0Bps/44Bps 1.1.1.1 0Bps/44Bps - :443 => 4.4.4.4:1337 (tcp) 0Bps/42Bps 4.4.4.4 0Bps/42Bps + <interface_name>:443 => 2.2.2.2:54321 (t 0Bps/53Bps 2.2.2.2 0Bps/53Bps + <interface_name>:443 => 3.3.3.3:1337 (tc 0Bps/45Bps 3.3.3.3 0Bps/45Bps + <interface_name>:443 => 1.1.1.1:12345 (t 0Bps/44Bps 1.1.1.1 0Bps/44Bps + <interface_name>:443 => 4.4.4.4:1337 (tc 0Bps/42Bps 4.4.4.4 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 0Bps/53Bps :443 => 2.2.2.2:54321 (tcp) 0Bps/53Bps - 5 0Bps/45Bps :443 => 3.3.3.3:1337 (tcp) 0Bps/45Bps - 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 0Bps/44Bps - 2 0Bps/42Bps :443 => 4.4.4.4:1337 (tcp) 0Bps/42Bps + 4 0Bps/53Bps <interface_name>:443 => 2.2.2.2:54321 (t 0Bps/53Bps + 5 0Bps/45Bps <interface_name>:443 => 3.3.3.3:1337 (tc 0Bps/45Bps + 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (t 0Bps/44Bps + 2 0Bps/42Bps <interface_name>:443 => 4.4.4.4:1337 (tc 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap --- a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 3 1 0Bps/51Bps :443 => 1.1.1.1:12346 (tcp) 3 0Bps/51Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 3 1 0Bps/51Bps <interface_name>:443 => 1.1.1.1:12346 (tcp) 3 0Bps/51Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 4 1 0Bps/39Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/39Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 4 1 0Bps/39Bps <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/39Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/91Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/91Bps + 1 1 0Bps/91Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/91Bps diff --git a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap --- a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps/53Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps - 5 1 0Bps/45Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 2 1 0Bps/42Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps + 4 1 0Bps/53Bps <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps + 5 1 0Bps/45Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 2 1 0Bps/42Bps <interface_name>:443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap --- a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 - 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 + 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 + 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode.snap b/src/tests/cases/snapshots/ui__no_resolve_mode.snap --- a/src/tests/cases/snapshots/ui__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps/61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps - 5 1 34Bps/37Bps :443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps + 1 1 57Bps/61Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps + 5 1 34Bps/37Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps diff --git a/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap b/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap --- a/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap +++ b/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 42Bps/0Bps :443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps + 1 1 42Bps/0Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps diff --git a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap --- a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 5 1 0Bps/48Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/48Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 5 1 0Bps/48Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/48Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 5 1 0Bps/39Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/39Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 5 1 0Bps/39Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/39Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 - 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 + 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 + 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps/61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps - 5 1 34Bps/37Bps :443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps + 1 1 57Bps/61Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps + 5 1 34Bps/37Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap --- a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 three.thre three.three:1337 (tcp) 5 32 46 - 1 7 6 one.one.on one:12345 (tcp) 1 7 6 + 5 32 46 three.thre three.three:13 5 32 46 + 1 7 6 one.one.on one:12345 (tcp 1 7 6 diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap --- a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps/61Bps :443 => one.one.one.one:12345 (tcp) 1 57Bps/61Bps - 5 1 34Bps/37Bps :443 => three.three.three.three:1337 (tcp) 5 34Bps/37Bps + 1 1 57Bps/61Bps <interface_name>:443 => one.one.one.one:12345 (tcp 1 57Bps/61Bps + 5 1 34Bps/37Bps <interface_name>:443 => three.three.three.three:13 5 34Bps/37Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap b/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap --- a/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[2]" - 1 1 42Bps/0Bps :443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps + 1 1 42Bps/0Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1,6 +1,6 @@ use crate::tests::fakes::TerminalEvent::; use crate::tests::fakes::{ - create_fake_dns_client, create_fake_on_winch, get_interface, get_open_sockets, KeyboardEvents, + create_fake_dns_client, create_fake_on_winch, get_interfaces, get_open_sockets, KeyboardEvents, NetworkFrames, TestBackend, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -13,6 +13,7 @@ use ::std::net::IpAddr; use packet_builder::payload::PayloadData; use packet_builder::*; +use pnet::datalink::DataLinkReceiver; use pnet::packet::Packet; use pnet_base::MacAddr; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -55,9 +56,9 @@ fn basic_startup() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ None, // sleep - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -70,14 +71,14 @@ fn basic_startup() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -87,7 +88,7 @@ fn basic_startup() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -110,13 +111,13 @@ fn one_packet_of_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![Some(build_tcp_packet( + let network_frames = vec![NetworkFrames::new(vec![Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", 443, 12345, b"I am a fake tcp packet", - ))]); + ))]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -129,14 +130,14 @@ fn one_packet_of_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -146,7 +147,7 @@ fn one_packet_of_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -172,7 +173,7 @@ fn bi_directional_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -187,7 +188,7 @@ fn bi_directional_traffic() { 443, b"I am a fake tcp download packet", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -200,14 +201,14 @@ fn bi_directional_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let cleanup = Box::new(\|\| {}); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -217,7 +218,7 @@ fn bi_directional_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -243,7 +244,7 @@ fn multiple_packets_of_traffic_from_different_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -258,7 +259,7 @@ fn multiple_packets_of_traffic_from_different_connections() { 443, b"I come from 2.2.2.2", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -273,12 +274,12 @@ fn multiple_packets_of_traffic_from_different_connections() { ); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, on_winch, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -288,7 +289,7 @@ fn multiple_packets_of_traffic_from_different_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -314,7 +315,7 @@ fn multiple_packets_of_traffic_from_single_connection() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -329,7 +330,7 @@ fn multiple_packets_of_traffic_from_single_connection() { 443, b"I've come from 1.1.1.1 too!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -342,14 +343,14 @@ fn multiple_packets_of_traffic_from_single_connection() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -359,7 +360,7 @@ fn multiple_packets_of_traffic_from_single_connection() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -385,7 +386,7 @@ fn one_process_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -400,7 +401,7 @@ fn one_process_with_multiple_connections() { 443, b"Funny that, I'm from 3.3.3.3", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -413,14 +414,14 @@ fn one_process_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -430,7 +431,7 @@ fn one_process_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -456,7 +457,7 @@ fn multiple_processes_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -485,7 +486,7 @@ fn multiple_processes_with_multiple_connections() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -498,14 +499,14 @@ fn multiple_processes_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -515,7 +516,7 @@ fn multiple_processes_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -541,7 +542,7 @@ fn multiple_connections_from_remote_address() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -556,7 +557,7 @@ fn multiple_connections_from_remote_address() { 443, b"Me too, but on a different port", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -569,14 +570,14 @@ fn multiple_connections_from_remote_address() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -586,7 +587,7 @@ fn multiple_connections_from_remote_address() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -613,7 +614,7 @@ fn sustained_traffic_from_one_process() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -629,7 +630,7 @@ fn sustained_traffic_from_one_process() { 443, b"Same here, but one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -642,14 +643,14 @@ fn sustained_traffic_from_one_process() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -659,7 +660,7 @@ fn sustained_traffic_from_one_process() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -686,7 +687,7 @@ fn sustained_traffic_from_multiple_processes() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -716,7 +717,7 @@ fn sustained_traffic_from_multiple_processes() { 443, b"I come 3.3.3.3 one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -729,14 +730,14 @@ fn sustained_traffic_from_multiple_processes() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -746,7 +747,7 @@ fn sustained_traffic_from_multiple_processes() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -773,7 +774,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -831,7 +832,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -844,14 +845,14 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -861,7 +862,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -888,7 +889,7 @@ fn traffic_with_host_names() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -946,7 +947,7 @@ fn traffic_with_host_names() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -959,7 +960,7 @@ fn traffic_with_host_names() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -979,7 +980,7 @@ fn traffic_with_host_names() { let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -989,7 +990,7 @@ fn traffic_with_host_names() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1016,7 +1017,7 @@ fn no_resolve_mode() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1074,7 +1075,7 @@ fn no_resolve_mode() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1087,7 +1088,7 @@ fn no_resolve_mode() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1107,7 +1108,7 @@ fn no_resolve_mode() { let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1117,7 +1118,7 @@ fn no_resolve_mode() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: true, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1143,13 +1144,13 @@ fn traffic_with_winch_event() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![Some(build_tcp_packet( + let network_frames = vec![NetworkFrames::new(vec![Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", 443, 12345, b"I am a fake tcp packet", - ))]); + ))]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1162,14 +1163,14 @@ fn traffic_with_winch_event() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(true); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1179,7 +1180,7 @@ fn traffic_with_winch_event() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1206,7 +1207,7 @@ fn layout_full_width_under_30_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1235,7 +1236,7 @@ fn layout_full_width_under_30_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(29)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1248,14 +1249,14 @@ fn layout_full_width_under_30_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1265,7 +1266,7 @@ fn layout_full_width_under_30_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1291,7 +1292,7 @@ fn layout_under_150_width_full_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1320,7 +1321,7 @@ fn layout_under_150_width_full_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(149)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1333,14 +1334,14 @@ fn layout_under_150_width_full_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1350,7 +1351,7 @@ fn layout_under_150_width_full_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1376,7 +1377,7 @@ fn layout_under_150_width_under_30_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1405,7 +1406,7 @@ fn layout_under_150_width_under_30_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(149)); let terminal_height = Arc::new(Mutex::new(29)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1418,14 +1419,14 @@ fn layout_under_150_width_under_30_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1435,7 +1436,7 @@ fn layout_under_150_width_under_30_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1461,7 +1462,7 @@ fn layout_under_120_width_full_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1490,7 +1491,7 @@ fn layout_under_120_width_full_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(119)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1503,14 +1504,14 @@ fn layout_under_120_width_full_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1520,7 +1521,7 @@ fn layout_under_120_width_full_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1546,7 +1547,7 @@ fn layout_under_120_width_under_30_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1575,7 +1576,7 @@ fn layout_under_120_width_under_30_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(119)); let terminal_height = Arc::new(Mutex::new(29)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1588,14 +1589,14 @@ fn layout_under_120_width_under_30_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(\|\| {}); let write_to_stdout = Box::new({ move \|_output: String\| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1605,7 +1606,7 @@ fn layout_under_120_width_under_30_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs --- a/src/tests/fakes/fake_input.rs +++ b/src/tests/fakes/fake_input.rs @@ -135,14 +135,14 @@ pub fn get_open_sockets() -> HashMap<Connection, String> { open_sockets } -pub fn get_interface() -> NetworkInterface { - NetworkInterface { +pub fn get_interfaces() -> Vec<NetworkInterface> { + vec![NetworkInterface { name: String::from("interface_name"), index: 42, mac: None, ips: vec![IpNetwork::V4("10.0.0.2".parse().unwrap())], flags: 42, - } + }] } pub fn create_fake_on_winch(should_send_winch_event: bool) -> Box<OnSigWinch> {	Listen on all interfaces `what` now listens on the interface given by the `-i` flag. The default behaviour should probably be "listen on all interfaces", with the -i flag being an optional override. Things that are needed to do this: 1. The OS layer (eg. `os/linux.rs`) needs to be adjusted. 2. The `OsInputOutput` struct needs to be adjusted to get multiple network interfaces. 3. The UI needs to be adjusted to display the name of the local interface where relevant (mostly in the connections table). Maybe something like `<eth0>:12345 => 1.1.1.1:54321` shrug emoji		2019-12-10T22:07:27Z	0.4	2019-12-22T09:53:02Z	408ec397c81bb99d6727f01d5dc058e814012714	[ "tests::cases::ui::basic_startup", "tests::cases::ui::layout_under_120_width_under_30_height", "tests::cases::ui::layout_under_150_width_under_30_height", "tests::cases::ui::layout_full_width_under_30_height", "tests::cases::ui::layout_under_120_width_full_height", "tests::cases::raw_mode::multiple_packets_of_traffic_from_single_connection", "tests::cases::raw_mode::one_process_with_multiple_connections", "tests::cases::raw_mode::one_packet_of_traffic", "tests::cases::raw_mode::multiple_connections_from_remote_address", "tests::cases::raw_mode::bi_directional_traffic", "tests::cases::raw_mode::multiple_packets_of_traffic_from_different_connections", "tests::cases::raw_mode::multiple_processes_with_multiple_connections", "tests::cases::ui::layout_under_150_width_full_height", "tests::cases::ui::multiple_packets_of_traffic_from_different_connections", "tests::cases::ui::multiple_processes_with_multiple_connections", "tests::cases::ui::multiple_connections_from_remote_address", "tests::cases::ui::one_packet_of_traffic", "tests::cases::ui::multiple_packets_of_traffic_from_single_connection", "tests::cases::ui::bi_directional_traffic", "tests::cases::ui::one_process_with_multiple_connections", "tests::cases::ui::traffic_with_winch_event", "tests::cases::raw_mode::no_resolve_mode", "tests::cases::ui::no_resolve_mode", "tests::cases::raw_mode::traffic_with_host_names", "tests::cases::raw_mode::sustained_traffic_from_one_process", "tests::cases::raw_mode::sustained_traffic_from_multiple_processes_bi_directional", "tests::cases::raw_mode::sustained_traffic_from_multiple_processes", "tests::cases::ui::sustained_traffic_from_one_process", "tests::cases::ui::sustained_traffic_from_multiple_processes_bi_directional", "tests::cases::ui::traffic_with_host_names", "tests::cases::ui::sustained_traffic_from_multiple_processes" ]	[]	[]	[]	auto_2025-06-07
imsnif/bandwhich	118	imsnif__bandwhich-118	[ "100" ]	e6bb39a5e992498e00bc3af47d92352865e3223d	"diff --git a/.gitignore b/.gitignore\n--- a/.gitignore\n+++ b/.gitignore\n@@ -11,4 +11,4 @@ debian/(...TRUNCATED)	"diff --git a/src/tests/cases/snapshots/ui__basic_only_addresses.snap b/src/tests/cases/snapshots/ui(...TRUNCATED)	"Option to change the default 'window' when terminal is small\nIs it possible to implement an option(...TRUNCATED)	"I'd be open to adding `--connections`, `--remote-ips` and `--processes` flags.\r\n\r\nThese would h(...TRUNCATED)	2020-01-14T23:51:55Z	0.14	2020-05-17T20:40:05Z	e6bb39a5e992498e00bc3af47d92352865e3223d	["tests::cases::ui::basic_processes_with_dns_queries","tests::cases::ui::basic_startup","tests::case(...TRUNCATED)	["tests::cases::raw_mode::bi_directional_traffic","tests::cases::raw_mode::multiple_connections_from(...TRUNCATED)	[]	[]	auto_2025-06-07
rust-fuzz/cargo-fuzz	388	rust-fuzz__cargo-fuzz-388	[ "386" ]	a608970259c3b0d575e70b0748c1c4cf79081031	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -165,6(...TRUNCATED)	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -265,6(...TRUNCATED)	"Fuzzing Windows DLL (cdylib) - Unresolved External Symbol Main\nHi cargo-fuzz devs! I am working on(...TRUNCATED)		2024-10-16T17:58:54Z	0.12	2024-11-05T18:55:01Z	a608970259c3b0d575e70b0748c1c4cf79081031	["rustc_version::tests::test_parsing_future_stable","rustc_version::tests::test_parsing_nightly","ru(...TRUNCATED)	[]	[]	[]	auto_2025-06-12
rust-fuzz/cargo-fuzz	344	rust-fuzz__cargo-fuzz-344	[ "343" ]	abb7a67c5b2e1263c3e5c7abfa8c70bb4dec7796	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -126,6(...TRUNCATED)	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -232,6(...TRUNCATED)	"Detect when code is reproducing a crash vs when it is fuzzing\nHi all,\r\n\r\nI have a lot of fun u(...TRUNCATED)	I would be in support of a `cfg(fuzz_repro)` or something.	2023-06-16T13:28:04Z	0.11	2023-06-18T17:12:28Z	abb7a67c5b2e1263c3e5c7abfa8c70bb4dec7796	["options::test::display_build_options","help","init_finds_parent_project","init_twice","add_twice",(...TRUNCATED)	[]	[]	[]	auto_2025-06-12
rust-fuzz/cargo-fuzz	264	rust-fuzz__cargo-fuzz-264	[ "263" ]	2e496ca9cfe11de7cfb3d89b2299e93359ebc72f	"diff --git a/src/project.rs b/src/project.rs\n--- a/src/project.rs\n+++ b/src/project.rs\n@@ -822,6(...TRUNCATED)	"diff --git a/src/project.rs b/src/project.rs\n--- a/src/project.rs\n+++ b/src/project.rs\n@@ -459,1(...TRUNCATED)	"[`fuzz run`] Bad discovered input should display custom fuzz dir \nCurrently, when `fuzz run someTa(...TRUNCATED)		2021-05-23T01:27:42Z	0.10	2021-05-25T17:16:22Z	78965346c161a3800166c41304f61717e9d7e85c	["options::test::display_build_options","help","init_finds_parent_project","init_twice","add_twice",(...TRUNCATED)	[]	[]	[]	auto_2025-06-12
rust-fuzz/cargo-fuzz	262	rust-fuzz__cargo-fuzz-262	[ "238" ]	089dfae55534ae29a6323b4e0368ae6ebe9b34f8	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -13,8 (...TRUNCATED)	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -186,6(...TRUNCATED)	"Support for non-standard project directories\n`fuzz` is currently the only possible directory name (...TRUNCATED)	"That the directory containing the fuzzing code _has to be_ called \"fuzz\" (and cannot be renamed n(...TRUNCATED)	2021-05-08T19:52:56Z	0.10	2021-05-13T17:23:13Z	78965346c161a3800166c41304f61717e9d7e85c	["options::test::display_build_options","help","init_finds_parent_project","list","init_twice","add_(...TRUNCATED)	[]	[]	[]	auto_2025-06-12
rust-fuzz/cargo-fuzz	234	rust-fuzz__cargo-fuzz-234	[ "228" ]	9f2f36888d10504f0a219bf1a91b72837d9fba56	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -15,7 (...TRUNCATED)	"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -110,3(...TRUNCATED)	"Recommended reproduction command ignores arguments\nWhen running the fuzzer with specific sanitizer(...TRUNCATED)	"Thanks for reporting! Here's the code that needs to change:\r\n\r\nhttps://github.com/rust-fuzz/car(...TRUNCATED)	2020-07-02T12:19:45Z	0.8	2020-07-06T18:55:01Z	9f2f36888d10504f0a219bf1a91b72837d9fba56	[ "help", "init_finds_parent_project", "add_twice", "init_twice", "list" ]	[]	[]	[]	auto_2025-06-12
rust-fuzz/cargo-fuzz	231	rust-fuzz__cargo-fuzz-231	[ "230" ]	87c36a1deee8ca9b550fe034623a7445d7e8c770	"diff --git a/src/main.rs b/src/main.rs\n--- a/src/main.rs\n+++ b/src/main.rs\n@@ -40,7 +40,11 @@ fu(...TRUNCATED)	"diff --git a/src/project.rs b/src/project.rs\n--- a/src/project.rs\n+++ b/src/project.rs\n@@ -182,7(...TRUNCATED)	"Fuzzing with default settings is much slower than it needs to be\n`cargo fuzz run` currently defaul(...TRUNCATED)	"For reference, AFL already defaults to release mode with overflow checks and debug assertions: http(...TRUNCATED)	2020-06-20T21:45:55Z	0.7	2020-11-11T18:48:06Z	87c36a1deee8ca9b550fe034623a7445d7e8c770	[ "help", "init_finds_parent_project", "add_twice", "init_twice", "list" ]	[]	[]	[]	auto_2025-06-12
rust-lang/chalk	75	rust-lang__chalk-75	[ "74" ]	f4f9dfa86c497aa222864fd6abc9e955ca23ce80	"diff --git a/chalk-parse/src/ast.rs b/chalk-parse/src/ast.rs\n--- a/chalk-parse/src/ast.rs\n+++ b/c(...TRUNCATED)	"diff --git a/src/lib.rs b/src/lib.rs\n--- a/src/lib.rs\n+++ b/src/lib.rs\n@@ -2,6 +2,7 @@\n #![cfg_(...TRUNCATED)	"fallback clauses considered harmful / how to handle projection equality\nIn working on https://gith(...TRUNCATED)		2018-01-19T09:17:56Z	0.1	2018-01-20T12:30:20Z	154020e4884e7b9fe41a93a6970cfff78783cdcc	["lower::test::goal_quantifiers","lower::test::atc_accounting","solve::test::mixed_indices_normalize(...TRUNCATED)	["lower::test::concrete_impl_and_blanket_impl","lower::test::nonoverlapping_assoc_types","lower::tes(...TRUNCATED)	[]	[]	auto_2025-06-13
rust-lang/chalk	55	rust-lang__chalk-55	[ "25" ]	7eb0f085b86986159097da1cb34dc065f2a6c8cd	"diff --git a/src/fold/instantiate.rs b/src/fold/instantiate.rs\n--- a/src/fold/instantiate.rs\n+++ (...TRUNCATED)	"diff --git a/src/solve/infer/test.rs b/src/solve/infer/test.rs\n--- a/src/solve/infer/test.rs\n+++ (...TRUNCATED)	"refactor occurs check into a folder\nThe occurs check code in `src/solve/infer/unify.rs` (specifica(...TRUNCATED)	"Working on it.\n@fabric-and-ink cool, feel free to come to gitter channel with questions, if any ar(...TRUNCATED)	2017-08-05T18:28:06Z	0.1	2017-10-10T11:21:48Z	154020e4884e7b9fe41a93a6970cfff78783cdcc	["solve::infer::test::cycle_error","solve::infer::test::cycle_indirect","solve::infer::test::univers(...TRUNCATED)	[]	[]	[]	auto_2025-06-13

imsnif/bandwhich

23

imsnif__bandwhich-23

[ "16" ]

408ec397c81bb99d6727f01d5dc058e814012714

diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Windows is not supported at the moment - if you'd like to contribute a windows p ### Usage ``` USAGE: - what [FLAGS] --interface <interface> + what [FLAGS] [OPTIONS] FLAGS: -h, --help Prints help information diff --git a/src/display/components/table.rs b/src/display/components/table.rs --- a/src/display/components/table.rs +++ b/src/display/components/table.rs @@ -64,7 +64,11 @@ impl<'a> Table<'a> { .iter() .map(|(connection, connection_data)| { vec![ - display_connection_string(&connection, &ip_to_host), + display_connection_string( + &connection, + &ip_to_host, + &connection_data.interface_name, + ), connection_data.process_name.to_string(), display_upload_and_download(*connection_data), ] diff --git a/src/display/ui.rs b/src/display/ui.rs --- a/src/display/ui.rs +++ b/src/display/ui.rs @@ -53,7 +53,11 @@ where write_to_stdout(format!( "connection: <{}> {} up/down Bps: {}/{} process: \"{}\"", timestamp, - display_connection_string(connection, ip_to_host), + display_connection_string( + connection, + ip_to_host, + &connection_network_data.interface_name + ), connection_network_data.total_bytes_uploaded, connection_network_data.total_bytes_downloaded, connection_network_data.process_name diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -20,6 +20,7 @@ pub struct ConnectionData { pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, pub process_name: String, + pub interface_name: String, } impl Bandwidth for ConnectionData { diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -52,7 +53,7 @@ pub struct UIState { impl UIState { pub fn new( connections_to_procs: HashMap<Connection, String>, - network_utilization: Utilization, + mut network_utilization: Utilization, ) -> Self { let mut processes: BTreeMap<String, NetworkData> = BTreeMap::new(); let mut remote_addresses: BTreeMap<Ipv4Addr, NetworkData> = BTreeMap::new(); diff --git a/src/display/ui_state.rs b/src/display/ui_state.rs --- a/src/display/ui_state.rs +++ b/src/display/ui_state.rs @@ -60,32 +61,27 @@ impl UIState { let mut total_bytes_downloaded: u128 = 0; let mut total_bytes_uploaded: u128 = 0; for (connection, process_name) in connections_to_procs { - if let Some(connection_bandwidth_utilization) = - network_utilization.connections.get(&connection) - { + if let Some(connection_info) = network_utilization.connections.remove(&connection) { let data_for_remote_address = remote_addresses .entry(connection.remote_socket.ip) .or_default(); let connection_data = connections.entry(connection).or_default(); let data_for_process = processes.entry(process_name.clone()).or_default(); - data_for_process.total_bytes_downloaded += - &connection_bandwidth_utilization.total_bytes_downloaded; - data_for_process.total_bytes_uploaded += - &connection_bandwidth_utilization.total_bytes_uploaded; + data_for_process.total_bytes_downloaded += connection_info.total_bytes_downloaded; + data_for_process.total_bytes_uploaded += connection_info.total_bytes_uploaded; data_for_process.connection_count += 1; - connection_data.total_bytes_downloaded += - &connection_bandwidth_utilization.total_bytes_downloaded; - connection_data.total_bytes_uploaded += - &connection_bandwidth_utilization.total_bytes_uploaded; + connection_data.total_bytes_downloaded += connection_info.total_bytes_downloaded; + connection_data.total_bytes_uploaded += connection_info.total_bytes_uploaded; connection_data.process_name = process_name; + connection_data.interface_name = connection_info.interface_name; data_for_remote_address.total_bytes_downloaded += - connection_bandwidth_utilization.total_bytes_downloaded; + connection_info.total_bytes_downloaded; data_for_remote_address.total_bytes_uploaded += - connection_bandwidth_utilization.total_bytes_uploaded; + connection_info.total_bytes_uploaded; data_for_remote_address.connection_count += 1; - total_bytes_downloaded += connection_bandwidth_utilization.total_bytes_downloaded; - total_bytes_uploaded += connection_bandwidth_utilization.total_bytes_uploaded; + total_bytes_downloaded += connection_info.total_bytes_downloaded; + total_bytes_uploaded += connection_info.total_bytes_uploaded; } } UIState { diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -36,7 +36,7 @@ use structopt::StructOpt; pub struct Opt { #[structopt(short, long)] /// The network interface to listen on, eg. eth0 - interface: String, + interface: Option<String>, #[structopt(short, long)] /// Machine friendlier output raw: bool, diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -78,8 +78,8 @@ fn try_main() -> Result<(), failure::Error> { } pub struct OsInputOutput { - pub network_interface: NetworkInterface, - pub network_frames: Box<dyn DataLinkReceiver>, + pub network_interfaces: Vec<NetworkInterface>, + pub network_frames: Vec<Box<dyn DataLinkReceiver>>, pub get_open_sockets: fn() -> HashMap<Connection, String>, pub keyboard_events: Box<dyn Iterator<Item = Event> + Send>, pub dns_client: Option<dns::Client>, diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -105,7 +105,13 @@ where let raw_mode = opts.raw; - let mut sniffer = Sniffer::new(os_input.network_interface, os_input.network_frames); + let mut sniffers = os_input + .network_interfaces + .into_iter() + .zip(os_input.network_frames.into_iter()) + .map(|(iface, frames)| Sniffer::new(iface, frames)) + .collect::<Vec<Sniffer>>(); + let network_utilization = Arc::new(Mutex::new(Utilization::new())); let ui = Arc::new(Mutex::new(Ui::new(terminal_backend))); diff --git a/src/main.rs b/src/main.rs --- a/src/main.rs +++ b/src/main.rs @@ -196,10 +202,14 @@ where active_threads.push( thread::Builder::new() .name("sniffing_handler".to_string()) - .spawn(move || { - while running.load(Ordering::Acquire) { + .spawn(move || 'sniffing: loop { + for sniffer in sniffers.iter_mut() { if let Some(segment) = sniffer.next() { - network_utilization.lock().unwrap().update(&segment) + network_utilization.lock().unwrap().update(segment); + } + if !running.load(Ordering::Acquire) { + // Break from the outer loop and finish the thread + break 'sniffing; } } }) diff --git a/src/network/connection.rs b/src/network/connection.rs --- a/src/network/connection.rs +++ b/src/network/connection.rs @@ -52,9 +52,11 @@ pub fn display_ip_or_host(ip: Ipv4Addr, ip_to_host: &HashMap<Ipv4Addr, String>) pub fn display_connection_string( connection: &Connection, ip_to_host: &HashMap<Ipv4Addr, String>, + interface_name: &str, ) -> String { format!( - ":{} => {}:{} ({})", + "<{}>:{} => {}:{} ({})", + interface_name, connection.local_port, display_ip_or_host(connection.remote_socket.ip, ip_to_host), connection.remote_socket.port, diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -14,6 +14,7 @@ use ::std::net::{IpAddr, SocketAddr}; use crate::network::{Connection, Protocol}; pub struct Segment { + pub interface_name: String, pub connection: Connection, pub direction: Direction, pub data_length: u128, diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -81,6 +82,7 @@ impl Sniffer { } _ => return None, }; + let interface_name = self.network_interface.name.clone(); let direction = Direction::new(&self.network_interface.ips, &ip_packet); let from = SocketAddr::new(IpAddr::V4(ip_packet.get_source()), source_port); let to = SocketAddr::new(IpAddr::V4(ip_packet.get_destination()), destination_port); diff --git a/src/network/sniffer.rs b/src/network/sniffer.rs --- a/src/network/sniffer.rs +++ b/src/network/sniffer.rs @@ -90,6 +92,7 @@ impl Sniffer { Direction::Upload => Connection::new(to, source_port, protocol)?, }; Some(Segment { + interface_name, connection, data_length, direction, diff --git a/src/network/utilization.rs b/src/network/utilization.rs --- a/src/network/utilization.rs +++ b/src/network/utilization.rs @@ -3,14 +3,15 @@ use crate::network::{Connection, Direction, Segment}; use ::std::collections::HashMap; #[derive(Clone)] -pub struct TotalBandwidth { +pub struct ConnectionInfo { + pub interface_name: String, pub total_bytes_downloaded: u128, pub total_bytes_uploaded: u128, } #[derive(Clone)] pub struct Utilization { - pub connections: HashMap<Connection, TotalBandwidth>, + pub connections: HashMap<Connection, ConnectionInfo>, } impl Utilization { diff --git a/src/network/utilization.rs b/src/network/utilization.rs --- a/src/network/utilization.rs +++ b/src/network/utilization.rs @@ -23,14 +24,15 @@ impl Utilization { self.connections.clear(); clone } - pub fn update(&mut self, seg: &Segment) { - let total_bandwidth = - self.connections - .entry(seg.connection.clone()) - .or_insert(TotalBandwidth { - total_bytes_downloaded: 0, - total_bytes_uploaded: 0, - }); + pub fn update(&mut self, seg: Segment) { + let total_bandwidth = self + .connections + .entry(seg.connection) + .or_insert(ConnectionInfo { + interface_name: seg.interface_name, + total_bytes_downloaded: 0, + total_bytes_uploaded: 0, + }); match seg.direction { Direction::Download => { total_bandwidth.total_bytes_downloaded += seg.data_length; diff --git a/src/os/shared.rs b/src/os/shared.rs --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -34,11 +34,11 @@ fn get_datalink_channel( interface: &NetworkInterface, ) -> Result<Box<dyn DataLinkReceiver>, failure::Error> { let mut config = Config::default(); - config.read_timeout = Some(time::Duration::new(0, 1)); + config.read_timeout = Some(time::Duration::new(0, 2_000_000)); match datalink::channel(interface, config) { Ok(Ethernet(_tx, rx)) => Ok(rx), Ok(_) => failure::bail!("Unknown interface type"), - Err(e) => failure::bail!("Failed to listen to network interface: {}", e), + Err(e) => failure::bail!("Failed to listen on network interface: {}", e), } } diff --git a/src/os/shared.rs b/src/os/shared.rs --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -76,15 +76,27 @@ fn create_write_to_stdout() -> Box<dyn FnMut(String) + Send> { }) } -pub fn get_input(interface_name: &str, resolve: bool) -> Result<OsInputOutput, failure::Error> { - let keyboard_events = Box::new(KeyboardEvents); - let network_interface = match get_interface(interface_name) { - Some(interface) => interface, - None => { - failure::bail!("Cannot find interface {}", interface_name); +pub fn get_input( + interface_name: &Option<String>, + resolve: bool, +) -> Result<OsInputOutput, failure::Error> { + let network_interfaces = if let Some(name) = interface_name { + match get_interface(&name) { + Some(interface) => vec![interface], + None => { + failure::bail!("Cannot find interface {}", name); + } } + } else { + datalink::interfaces() }; - let network_frames = get_datalink_channel(&network_interface)?; + + let network_frames = network_interfaces + .iter() + .map(|iface| get_datalink_channel(iface)) + .collect::<Result<Vec<_>, _>>()?; + + let keyboard_events = Box::new(KeyboardEvents); let write_to_stdout = create_write_to_stdout(); let (on_winch, cleanup) = sigwinch(); let dns_client = if resolve { diff --git a/src/os/shared.rs b/src/os/shared.rs --- a/src/os/shared.rs +++ b/src/os/shared.rs @@ -96,7 +108,7 @@ pub fn get_input(interface_name: &str, resolve: bool) -> Result<OsInputOutput, f }; Ok(OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events,

diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -46,14 +46,14 @@ Note that since `what` sniffs network packets, it requires root privileges - so ### raw_mode `what` also supports an easier-to-parse mode that can be piped or redirected to a file. For example, try: ``` -what -i eth0 --raw | grep firefox +what --raw | grep firefox ``` ### Contributing Contributions of any kind are very welcome. If you'd like a new feature (or found a bug), please open an issue or a PR. To set up your development environment: 1. Clone the project -2. `cargo run -- -i <network interface name>` (you can often find out the name with `ifconfig` or `iwconfig`). You might need root privileges to run this application, so be sure to use (for example) sudo. +2. `cargo run`, or if you prefer `cargo run -- -i <network interface name>` (you can often find out the name with `ifconfig` or `iwconfig`). You might need root privileges to run this application, so be sure to use (for example) sudo. To run tests: `cargo test` diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1,5 +1,5 @@ use crate::tests::fakes::{ - create_fake_dns_client, create_fake_on_winch, get_interface, get_open_sockets, KeyboardEvents, + create_fake_dns_client, create_fake_on_winch, get_interfaces, get_open_sockets, KeyboardEvents, NetworkFrames, TestBackend, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -12,6 +12,7 @@ use ::std::net::IpAddr; use packet_builder::payload::PayloadData; use packet_builder::*; +use pnet::datalink::DataLinkReceiver; use pnet::packet::Packet; use pnet_base::MacAddr; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -65,13 +66,13 @@ fn one_packet_of_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![Some(build_tcp_packet( + let network_frames = vec![NetworkFrames::new(vec![Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", 443, 12345, b"I am a fake tcp packet", - ))]); + ))]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -84,7 +85,7 @@ fn one_packet_of_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -98,7 +99,7 @@ fn one_packet_of_traffic() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -108,7 +109,7 @@ fn one_packet_of_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -125,7 +126,7 @@ fn bi_directional_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -140,7 +141,7 @@ fn bi_directional_traffic() { 443, b"I am a fake tcp download packet", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -153,7 +154,7 @@ fn bi_directional_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -167,7 +168,7 @@ fn bi_directional_traffic() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -177,7 +178,7 @@ fn bi_directional_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -194,7 +195,7 @@ fn multiple_packets_of_traffic_from_different_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -209,7 +210,7 @@ fn multiple_packets_of_traffic_from_different_connections() { 443, b"I come from 2.2.2.2", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -224,7 +225,7 @@ fn multiple_packets_of_traffic_from_different_connections() { ); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let stdout = Arc::new(Mutex::new(Vec::new())); let write_to_stdout = Box::new({ diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -236,7 +237,7 @@ fn multiple_packets_of_traffic_from_different_connections() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, on_winch, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -246,7 +247,7 @@ fn multiple_packets_of_traffic_from_different_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -263,7 +264,7 @@ fn multiple_packets_of_traffic_from_single_connection() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -278,7 +279,7 @@ fn multiple_packets_of_traffic_from_single_connection() { 443, b"I've come from 1.1.1.1 too!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -291,7 +292,7 @@ fn multiple_packets_of_traffic_from_single_connection() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -305,7 +306,7 @@ fn multiple_packets_of_traffic_from_single_connection() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -315,7 +316,7 @@ fn multiple_packets_of_traffic_from_single_connection() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -332,7 +333,7 @@ fn one_process_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -347,7 +348,7 @@ fn one_process_with_multiple_connections() { 443, b"Funny that, I'm from 3.3.3.3", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -360,7 +361,7 @@ fn one_process_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -374,7 +375,7 @@ fn one_process_with_multiple_connections() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -384,7 +385,7 @@ fn one_process_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -401,7 +402,7 @@ fn multiple_processes_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -430,7 +431,7 @@ fn multiple_processes_with_multiple_connections() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -443,7 +444,7 @@ fn multiple_processes_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -457,7 +458,7 @@ fn multiple_processes_with_multiple_connections() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -467,7 +468,7 @@ fn multiple_processes_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -484,7 +485,7 @@ fn multiple_connections_from_remote_address() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -499,7 +500,7 @@ fn multiple_connections_from_remote_address() { 443, b"Me too, but on a different port", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -512,7 +513,7 @@ fn multiple_connections_from_remote_address() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -526,7 +527,7 @@ fn multiple_connections_from_remote_address() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -536,7 +537,7 @@ fn multiple_connections_from_remote_address() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -554,7 +555,7 @@ fn sustained_traffic_from_one_process() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -570,7 +571,7 @@ fn sustained_traffic_from_one_process() { 443, b"Same here, but one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -583,7 +584,7 @@ fn sustained_traffic_from_one_process() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -597,7 +598,7 @@ fn sustained_traffic_from_one_process() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -607,7 +608,7 @@ fn sustained_traffic_from_one_process() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -625,7 +626,7 @@ fn sustained_traffic_from_multiple_processes() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -655,7 +656,7 @@ fn sustained_traffic_from_multiple_processes() { 443, b"I come 3.3.3.3 one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -668,7 +669,7 @@ fn sustained_traffic_from_multiple_processes() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -682,7 +683,7 @@ fn sustained_traffic_from_multiple_processes() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -692,7 +693,7 @@ fn sustained_traffic_from_multiple_processes() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -710,7 +711,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -768,7 +769,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -781,7 +782,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -795,7 +796,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -805,7 +806,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -823,7 +824,7 @@ fn traffic_with_host_names() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -881,7 +882,7 @@ fn traffic_with_host_names() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -894,7 +895,7 @@ fn traffic_with_host_names() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -921,7 +922,7 @@ fn traffic_with_host_names() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -931,7 +932,7 @@ fn traffic_with_host_names() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: false, }; diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -949,7 +950,7 @@ fn no_resolve_mode() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1007,7 +1008,7 @@ fn no_resolve_mode() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1020,7 +1021,7 @@ fn no_resolve_mode() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1047,7 +1048,7 @@ fn no_resolve_mode() { }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -1057,7 +1058,7 @@ fn no_resolve_mode() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: true, no_resolve: true, }; diff --git a/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap b/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap --- a/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__bi_directional_traffic.snap @@ -3,6 +3,6 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 49/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 49/51 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 49/51 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 49/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap @@ -4,7 +4,7 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "3" up/down Bps: 0/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "3" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "3" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/95 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap @@ -4,8 +4,8 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "4" up/down Bps: 0/39 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 2.2.2.2 up/down Bps: 0/39 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_single_connection.snap @@ -3,6 +3,6 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/91 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/91 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/91 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/91 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap --- a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap @@ -6,10 +6,10 @@ process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "2" up/down Bps: 0/42 connections: 1 process: <TIMESTAMP_REMOVED> "4" up/down Bps: 0/53 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/45 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" -connection: <TIMESTAMP_REMOVED> :443 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 2.2.2.2 up/down Bps: 0/53 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/45 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap --- a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 57/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 34/37 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 57/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 34/37 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 37/36 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 32/46 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 37/36 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap b/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap --- a/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap +++ b/src/tests/cases/snapshots/raw_mode__one_packet_of_traffic.snap @@ -3,6 +3,6 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 42/0 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 42/0 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 42/0 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 42/0 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap --- a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap @@ -4,8 +4,8 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/48 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/48 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/48 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/48 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/39 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/39 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 0/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 0/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 57/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 34/37 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 57/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 34/37 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 37/36 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 32/46 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 37/36 connections: 1 remote_address: <TIMESTAMP_REMOVED> 3.3.3.3 up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_one_process.snap @@ -3,9 +3,9 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/44 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/44 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 0/51 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/51 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/51 process: "1" remote_address: <TIMESTAMP_REMOVED> 1.1.1.1 up/down Bps: 0/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap --- a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap @@ -4,14 +4,14 @@ expression: formatted --- process: <TIMESTAMP_REMOVED> "1" up/down Bps: 57/61 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 34/37 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => one.one.one.one:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => one.one.one.one:12345 (tcp) up/down Bps: 57/61 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: <TIMESTAMP_REMOVED> one.one.one.one up/down Bps: 57/61 connections: 1 remote_address: <TIMESTAMP_REMOVED> three.three.three.three up/down Bps: 34/37 connections: 1 process: <TIMESTAMP_REMOVED> "1" up/down Bps: 37/36 connections: 1 process: <TIMESTAMP_REMOVED> "5" up/down Bps: 32/46 connections: 1 -connection: <TIMESTAMP_REMOVED> :443 => one.one.one.one:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: <TIMESTAMP_REMOVED> :443 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => one.one.one.one:12345 (tcp) up/down Bps: 37/36 process: "1" +connection: <TIMESTAMP_REMOVED> <interface_name>:443 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: <TIMESTAMP_REMOVED> one.one.one.one up/down Bps: 37/36 connections: 1 remote_address: <TIMESTAMP_REMOVED> three.three.three.three up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap b/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap --- a/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap +++ b/src/tests/cases/snapshots/ui__bi_directional_traffic-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 49Bps/51Bps :443 => 1.1.1.1:12345 (tcp) 1 49Bps/51Bps + 1 1 49Bps/51Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 49Bps/51Bps diff --git a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps/53Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps - 5 1 0Bps/45Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 2 1 0Bps/42Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps + 4 1 0Bps/53Bps <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps + 5 1 0Bps/45Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 2 1 0Bps/42Bps <interface_name>:443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps - :443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps - :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - :443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps + <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps + <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps + <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + <interface_name>:443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :443 => 2.2.2.2:54321 (tcp) 0Bps/53Bps 2.2.2.2 0Bps/53Bps - :443 => 3.3.3.3:1337 (tcp) 0Bps/45Bps 3.3.3.3 0Bps/45Bps - :443 => 1.1.1.1:12345 (tcp) 0Bps/44Bps 1.1.1.1 0Bps/44Bps - :443 => 4.4.4.4:1337 (tcp) 0Bps/42Bps 4.4.4.4 0Bps/42Bps + <interface_name>:443 => 2.2.2.2:54321 (t 0Bps/53Bps 2.2.2.2 0Bps/53Bps + <interface_name>:443 => 3.3.3.3:1337 (tc 0Bps/45Bps 3.3.3.3 0Bps/45Bps + <interface_name>:443 => 1.1.1.1:12345 (t 0Bps/44Bps 1.1.1.1 0Bps/44Bps + <interface_name>:443 => 4.4.4.4:1337 (tc 0Bps/42Bps 4.4.4.4 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap --- a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 0Bps/53Bps :443 => 2.2.2.2:54321 (tcp) 0Bps/53Bps - 5 0Bps/45Bps :443 => 3.3.3.3:1337 (tcp) 0Bps/45Bps - 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 0Bps/44Bps - 2 0Bps/42Bps :443 => 4.4.4.4:1337 (tcp) 0Bps/42Bps + 4 0Bps/53Bps <interface_name>:443 => 2.2.2.2:54321 (t 0Bps/53Bps + 5 0Bps/45Bps <interface_name>:443 => 3.3.3.3:1337 (tc 0Bps/45Bps + 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (t 0Bps/44Bps + 2 0Bps/42Bps <interface_name>:443 => 4.4.4.4:1337 (tc 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap --- a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 3 1 0Bps/51Bps :443 => 1.1.1.1:12346 (tcp) 3 0Bps/51Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 3 1 0Bps/51Bps <interface_name>:443 => 1.1.1.1:12346 (tcp) 3 0Bps/51Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 4 1 0Bps/39Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/39Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 4 1 0Bps/39Bps <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/39Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_single_connection-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/91Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/91Bps + 1 1 0Bps/91Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/91Bps diff --git a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap --- a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps/53Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps - 5 1 0Bps/45Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 2 1 0Bps/42Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps + 4 1 0Bps/53Bps <interface_name>:443 => 2.2.2.2:54321 (tcp) 4 0Bps/53Bps + 5 1 0Bps/45Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/45Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 2 1 0Bps/42Bps <interface_name>:443 => 4.4.4.4:1337 (tcp) 2 0Bps/42Bps diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap --- a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 - 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 + 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 + 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode.snap b/src/tests/cases/snapshots/ui__no_resolve_mode.snap --- a/src/tests/cases/snapshots/ui__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps/61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps - 5 1 34Bps/37Bps :443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps + 1 1 57Bps/61Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps + 5 1 34Bps/37Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps diff --git a/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap b/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap --- a/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap +++ b/src/tests/cases/snapshots/ui__one_packet_of_traffic-2.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 42Bps/0Bps :443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps + 1 1 42Bps/0Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps diff --git a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap --- a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 5 1 0Bps/48Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/48Bps - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 5 1 0Bps/48Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/48Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps - 5 1 0Bps/39Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps/39Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 5 1 0Bps/39Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 0Bps/39Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 - 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 + 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 + 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps/61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps - 5 1 34Bps/37Bps :443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps + 1 1 57Bps/61Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 57Bps/61Bps + 5 1 34Bps/37Bps <interface_name>:443 => 3.3.3.3:1337 (tcp) 5 34Bps/37Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_one_process.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps/44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps + 1 1 0Bps/44Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 0Bps/44Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap --- a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 three.thre three.three:1337 (tcp) 5 32 46 - 1 7 6 one.one.on one:12345 (tcp) 1 7 6 + 5 32 46 three.thre three.three:13 5 32 46 + 1 7 6 one.one.on one:12345 (tcp 1 7 6 diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap --- a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 57Bps/61Bps :443 => one.one.one.one:12345 (tcp) 1 57Bps/61Bps - 5 1 34Bps/37Bps :443 => three.three.three.three:1337 (tcp) 5 34Bps/37Bps + 1 1 57Bps/61Bps <interface_name>:443 => one.one.one.one:12345 (tcp 1 57Bps/61Bps + 5 1 34Bps/37Bps <interface_name>:443 => three.three.three.three:13 5 34Bps/37Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap b/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap --- a/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_winch_event-3.snap @@ -6,7 +6,7 @@ expression: "&terminal_draw_events_mirror[2]" - 1 1 42Bps/0Bps :443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps + 1 1 42Bps/0Bps <interface_name>:443 => 1.1.1.1:12345 (tcp) 1 42Bps/0Bps diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1,6 +1,6 @@ use crate::tests::fakes::TerminalEvent::*; use crate::tests::fakes::{ - create_fake_dns_client, create_fake_on_winch, get_interface, get_open_sockets, KeyboardEvents, + create_fake_dns_client, create_fake_on_winch, get_interfaces, get_open_sockets, KeyboardEvents, NetworkFrames, TestBackend, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -13,6 +13,7 @@ use ::std::net::IpAddr; use packet_builder::payload::PayloadData; use packet_builder::*; +use pnet::datalink::DataLinkReceiver; use pnet::packet::Packet; use pnet_base::MacAddr; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -55,9 +56,9 @@ fn basic_startup() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ None, // sleep - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -70,14 +71,14 @@ fn basic_startup() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -87,7 +88,7 @@ fn basic_startup() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -110,13 +111,13 @@ fn one_packet_of_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![Some(build_tcp_packet( + let network_frames = vec![NetworkFrames::new(vec![Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", 443, 12345, b"I am a fake tcp packet", - ))]); + ))]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -129,14 +130,14 @@ fn one_packet_of_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -146,7 +147,7 @@ fn one_packet_of_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -172,7 +173,7 @@ fn bi_directional_traffic() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -187,7 +188,7 @@ fn bi_directional_traffic() { 443, b"I am a fake tcp download packet", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -200,14 +201,14 @@ fn bi_directional_traffic() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let write_to_stdout = Box::new({ move |_output: String| {} }); let cleanup = Box::new(|| {}); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -217,7 +218,7 @@ fn bi_directional_traffic() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -243,7 +244,7 @@ fn multiple_packets_of_traffic_from_different_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -258,7 +259,7 @@ fn multiple_packets_of_traffic_from_different_connections() { 443, b"I come from 2.2.2.2", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -273,12 +274,12 @@ fn multiple_packets_of_traffic_from_different_connections() { ); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, on_winch, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -288,7 +289,7 @@ fn multiple_packets_of_traffic_from_different_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -314,7 +315,7 @@ fn multiple_packets_of_traffic_from_single_connection() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -329,7 +330,7 @@ fn multiple_packets_of_traffic_from_single_connection() { 443, b"I've come from 1.1.1.1 too!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -342,14 +343,14 @@ fn multiple_packets_of_traffic_from_single_connection() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -359,7 +360,7 @@ fn multiple_packets_of_traffic_from_single_connection() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -385,7 +386,7 @@ fn one_process_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -400,7 +401,7 @@ fn one_process_with_multiple_connections() { 443, b"Funny that, I'm from 3.3.3.3", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -413,14 +414,14 @@ fn one_process_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -430,7 +431,7 @@ fn one_process_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -456,7 +457,7 @@ fn multiple_processes_with_multiple_connections() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -485,7 +486,7 @@ fn multiple_processes_with_multiple_connections() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -498,14 +499,14 @@ fn multiple_processes_with_multiple_connections() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -515,7 +516,7 @@ fn multiple_processes_with_multiple_connections() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -541,7 +542,7 @@ fn multiple_connections_from_remote_address() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -556,7 +557,7 @@ fn multiple_connections_from_remote_address() { 443, b"Me too, but on a different port", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -569,14 +570,14 @@ fn multiple_connections_from_remote_address() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -586,7 +587,7 @@ fn multiple_connections_from_remote_address() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -613,7 +614,7 @@ fn sustained_traffic_from_one_process() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -629,7 +630,7 @@ fn sustained_traffic_from_one_process() { 443, b"Same here, but one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -642,14 +643,14 @@ fn sustained_traffic_from_one_process() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -659,7 +660,7 @@ fn sustained_traffic_from_one_process() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -686,7 +687,7 @@ fn sustained_traffic_from_multiple_processes() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -716,7 +717,7 @@ fn sustained_traffic_from_multiple_processes() { 443, b"I come 3.3.3.3 one second later", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -729,14 +730,14 @@ fn sustained_traffic_from_multiple_processes() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -746,7 +747,7 @@ fn sustained_traffic_from_multiple_processes() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -773,7 +774,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -831,7 +832,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -844,14 +845,14 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -861,7 +862,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -888,7 +889,7 @@ fn traffic_with_host_names() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -946,7 +947,7 @@ fn traffic_with_host_names() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -959,7 +960,7 @@ fn traffic_with_host_names() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -979,7 +980,7 @@ fn traffic_with_host_names() { let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -989,7 +990,7 @@ fn traffic_with_host_names() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1016,7 +1017,7 @@ fn no_resolve_mode() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1074,7 +1075,7 @@ fn no_resolve_mode() { 12345, b"10.0.0.2 forever!", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1087,7 +1088,7 @@ fn no_resolve_mode() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let mut ips_to_hostnames = HashMap::new(); ips_to_hostnames.insert( IpAddr::V4("1.1.1.1".parse().unwrap()), diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1107,7 +1108,7 @@ fn no_resolve_mode() { let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1117,7 +1118,7 @@ fn no_resolve_mode() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: true, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1143,13 +1144,13 @@ fn traffic_with_winch_event() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![Some(build_tcp_packet( + let network_frames = vec![NetworkFrames::new(vec![Some(build_tcp_packet( "10.0.0.2", "1.1.1.1", 443, 12345, b"I am a fake tcp packet", - ))]); + ))]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1162,14 +1163,14 @@ fn traffic_with_winch_event() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(true); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1179,7 +1180,7 @@ fn traffic_with_winch_event() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1206,7 +1207,7 @@ fn layout_full_width_under_30_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1235,7 +1236,7 @@ fn layout_full_width_under_30_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(190)); let terminal_height = Arc::new(Mutex::new(29)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1248,14 +1249,14 @@ fn layout_full_width_under_30_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1265,7 +1266,7 @@ fn layout_full_width_under_30_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1291,7 +1292,7 @@ fn layout_under_150_width_full_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1320,7 +1321,7 @@ fn layout_under_150_width_full_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(149)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1333,14 +1334,14 @@ fn layout_under_150_width_full_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1350,7 +1351,7 @@ fn layout_under_150_width_full_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1376,7 +1377,7 @@ fn layout_under_150_width_under_30_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1405,7 +1406,7 @@ fn layout_under_150_width_under_30_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(149)); let terminal_height = Arc::new(Mutex::new(29)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1418,14 +1419,14 @@ fn layout_under_150_width_under_30_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1435,7 +1436,7 @@ fn layout_under_150_width_under_30_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1461,7 +1462,7 @@ fn layout_under_120_width_full_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1490,7 +1491,7 @@ fn layout_under_120_width_full_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(119)); let terminal_height = Arc::new(Mutex::new(50)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1503,14 +1504,14 @@ fn layout_under_120_width_full_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1520,7 +1521,7 @@ fn layout_under_120_width_full_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1546,7 +1547,7 @@ fn layout_under_120_width_under_30_height() { None, // sleep Some(Event::Key(Key::Ctrl('c'))), ])); - let network_frames = NetworkFrames::new(vec![ + let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( "1.1.1.1", "10.0.0.2", diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1575,7 +1576,7 @@ fn layout_under_120_width_under_30_height() { 443, b"I'm partial to 4.4.4.4", )), - ]); + ]) as Box<dyn DataLinkReceiver>]; let terminal_width = Arc::new(Mutex::new(119)); let terminal_height = Arc::new(Mutex::new(29)); diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1588,14 +1589,14 @@ fn layout_under_120_width_under_30_height() { terminal_width, terminal_height, ); - let network_interface = get_interface(); + let network_interfaces = get_interfaces(); let dns_client = create_fake_dns_client(HashMap::new()); let on_winch = create_fake_on_winch(false); let cleanup = Box::new(|| {}); let write_to_stdout = Box::new({ move |_output: String| {} }); let os_input = OsInputOutput { - network_interface, + network_interfaces, network_frames, get_open_sockets, keyboard_events, diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1605,7 +1606,7 @@ fn layout_under_120_width_under_30_height() { write_to_stdout, }; let opts = Opt { - interface: String::from("interface_name"), + interface: Some(String::from("interface_name")), raw: false, no_resolve: false, }; diff --git a/src/tests/fakes/fake_input.rs b/src/tests/fakes/fake_input.rs --- a/src/tests/fakes/fake_input.rs +++ b/src/tests/fakes/fake_input.rs @@ -135,14 +135,14 @@ pub fn get_open_sockets() -> HashMap<Connection, String> { open_sockets } -pub fn get_interface() -> NetworkInterface { - NetworkInterface { +pub fn get_interfaces() -> Vec<NetworkInterface> { + vec![NetworkInterface { name: String::from("interface_name"), index: 42, mac: None, ips: vec![IpNetwork::V4("10.0.0.2".parse().unwrap())], flags: 42, - } + }] } pub fn create_fake_on_winch(should_send_winch_event: bool) -> Box<OnSigWinch> {

Listen on all interfaces `what` now listens on the interface given by the `-i` flag. The default behaviour should probably be "listen on all interfaces", with the -i flag being an optional override. Things that are needed to do this: 1. The OS layer (eg. `os/linux.rs`) needs to be adjusted. 2. The `OsInputOutput` struct needs to be adjusted to get multiple network interfaces. 3. The UI needs to be adjusted to display the name of the local interface where relevant (mostly in the connections table). Maybe something like `<eth0>:12345 => 1.1.1.1:54321` *shrug emoji*

2019-12-10T22:07:27Z

0.4

2019-12-22T09:53:02Z

408ec397c81bb99d6727f01d5dc058e814012714

[ "tests::cases::ui::basic_startup", "tests::cases::ui::layout_under_120_width_under_30_height", "tests::cases::ui::layout_under_150_width_under_30_height", "tests::cases::ui::layout_full_width_under_30_height", "tests::cases::ui::layout_under_120_width_full_height", "tests::cases::raw_mode::multiple_packets_of_traffic_from_single_connection", "tests::cases::raw_mode::one_process_with_multiple_connections", "tests::cases::raw_mode::one_packet_of_traffic", "tests::cases::raw_mode::multiple_connections_from_remote_address", "tests::cases::raw_mode::bi_directional_traffic", "tests::cases::raw_mode::multiple_packets_of_traffic_from_different_connections", "tests::cases::raw_mode::multiple_processes_with_multiple_connections", "tests::cases::ui::layout_under_150_width_full_height", "tests::cases::ui::multiple_packets_of_traffic_from_different_connections", "tests::cases::ui::multiple_processes_with_multiple_connections", "tests::cases::ui::multiple_connections_from_remote_address", "tests::cases::ui::one_packet_of_traffic", "tests::cases::ui::multiple_packets_of_traffic_from_single_connection", "tests::cases::ui::bi_directional_traffic", "tests::cases::ui::one_process_with_multiple_connections", "tests::cases::ui::traffic_with_winch_event", "tests::cases::raw_mode::no_resolve_mode", "tests::cases::ui::no_resolve_mode", "tests::cases::raw_mode::traffic_with_host_names", "tests::cases::raw_mode::sustained_traffic_from_one_process", "tests::cases::raw_mode::sustained_traffic_from_multiple_processes_bi_directional", "tests::cases::raw_mode::sustained_traffic_from_multiple_processes", "tests::cases::ui::sustained_traffic_from_one_process", "tests::cases::ui::sustained_traffic_from_multiple_processes_bi_directional", "tests::cases::ui::traffic_with_host_names", "tests::cases::ui::sustained_traffic_from_multiple_processes" ]

[]

auto_2025-06-07

imsnif/bandwhich

118

imsnif__bandwhich-118

[ "100" ]

e6bb39a5e992498e00bc3af47d92352865e3223d

"diff --git a/.gitignore b/.gitignore\n--- a/.gitignore\n+++ b/.gitignore\n@@ -11,4 +11,4 @@ debian/(...TRUNCATED)

"diff --git a/src/tests/cases/snapshots/ui__basic_only_addresses.snap b/src/tests/cases/snapshots/ui(...TRUNCATED)

"Option to change the default 'window' when terminal is small\nIs it possible to implement an option(...TRUNCATED)

"I'd be open to adding `--connections`, `--remote-ips` and `--processes` flags.\r\n\r\nThese would h(...TRUNCATED)

2020-01-14T23:51:55Z

0.14

2020-05-17T20:40:05Z

e6bb39a5e992498e00bc3af47d92352865e3223d

["tests::cases::ui::basic_processes_with_dns_queries","tests::cases::ui::basic_startup","tests::case(...TRUNCATED)

["tests::cases::raw_mode::bi_directional_traffic","tests::cases::raw_mode::multiple_connections_from(...TRUNCATED)

[]

auto_2025-06-07

rust-fuzz/cargo-fuzz

388

rust-fuzz__cargo-fuzz-388

[ "386" ]

a608970259c3b0d575e70b0748c1c4cf79081031

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -165,6(...TRUNCATED)

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -265,6(...TRUNCATED)

"Fuzzing Windows DLL (cdylib) - Unresolved External Symbol Main\nHi cargo-fuzz devs! I am working on(...TRUNCATED)

2024-10-16T17:58:54Z

0.12

2024-11-05T18:55:01Z

a608970259c3b0d575e70b0748c1c4cf79081031

["rustc_version::tests::test_parsing_future_stable","rustc_version::tests::test_parsing_nightly","ru(...TRUNCATED)

[]

auto_2025-06-12

rust-fuzz/cargo-fuzz

344

rust-fuzz__cargo-fuzz-344

[ "343" ]

abb7a67c5b2e1263c3e5c7abfa8c70bb4dec7796

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -126,6(...TRUNCATED)

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -232,6(...TRUNCATED)

"Detect when code is reproducing a crash vs when it is fuzzing\nHi all,\r\n\r\nI have a lot of fun u(...TRUNCATED)

I would be in support of a `cfg(fuzz_repro)` or something.

2023-06-16T13:28:04Z

0.11

2023-06-18T17:12:28Z

abb7a67c5b2e1263c3e5c7abfa8c70bb4dec7796

["options::test::display_build_options","help","init_finds_parent_project","init_twice","add_twice",(...TRUNCATED)

[]

auto_2025-06-12

rust-fuzz/cargo-fuzz

264

rust-fuzz__cargo-fuzz-264

[ "263" ]

2e496ca9cfe11de7cfb3d89b2299e93359ebc72f

"diff --git a/src/project.rs b/src/project.rs\n--- a/src/project.rs\n+++ b/src/project.rs\n@@ -822,6(...TRUNCATED)

"diff --git a/src/project.rs b/src/project.rs\n--- a/src/project.rs\n+++ b/src/project.rs\n@@ -459,1(...TRUNCATED)

"[`fuzz run`] Bad discovered input should display custom fuzz dir \nCurrently, when `fuzz run someTa(...TRUNCATED)

2021-05-23T01:27:42Z

0.10

2021-05-25T17:16:22Z

78965346c161a3800166c41304f61717e9d7e85c

["options::test::display_build_options","help","init_finds_parent_project","init_twice","add_twice",(...TRUNCATED)

[]

auto_2025-06-12

rust-fuzz/cargo-fuzz

262

rust-fuzz__cargo-fuzz-262

[ "238" ]

089dfae55534ae29a6323b4e0368ae6ebe9b34f8

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -13,8 (...TRUNCATED)

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -186,6(...TRUNCATED)

"Support for non-standard project directories\n`fuzz` is currently the only possible directory name (...TRUNCATED)

"That the directory containing the fuzzing code _has to be_ called \"fuzz\" (and cannot be renamed n(...TRUNCATED)

2021-05-08T19:52:56Z

0.10

2021-05-13T17:23:13Z

78965346c161a3800166c41304f61717e9d7e85c

["options::test::display_build_options","help","init_finds_parent_project","list","init_twice","add_(...TRUNCATED)

[]

auto_2025-06-12

rust-fuzz/cargo-fuzz

234

rust-fuzz__cargo-fuzz-234

[ "228" ]

9f2f36888d10504f0a219bf1a91b72837d9fba56

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -15,7 (...TRUNCATED)

"diff --git a/src/options.rs b/src/options.rs\n--- a/src/options.rs\n+++ b/src/options.rs\n@@ -110,3(...TRUNCATED)

"Recommended reproduction command ignores arguments\nWhen running the fuzzer with specific sanitizer(...TRUNCATED)

"Thanks for reporting! Here's the code that needs to change:\r\n\r\nhttps://github.com/rust-fuzz/car(...TRUNCATED)

2020-07-02T12:19:45Z

0.8

2020-07-06T18:55:01Z

9f2f36888d10504f0a219bf1a91b72837d9fba56

[ "help", "init_finds_parent_project", "add_twice", "init_twice", "list" ]

[]

auto_2025-06-12

rust-fuzz/cargo-fuzz

231

rust-fuzz__cargo-fuzz-231

[ "230" ]

87c36a1deee8ca9b550fe034623a7445d7e8c770

"diff --git a/src/main.rs b/src/main.rs\n--- a/src/main.rs\n+++ b/src/main.rs\n@@ -40,7 +40,11 @@ fu(...TRUNCATED)

"diff --git a/src/project.rs b/src/project.rs\n--- a/src/project.rs\n+++ b/src/project.rs\n@@ -182,7(...TRUNCATED)

"Fuzzing with default settings is much slower than it needs to be\n`cargo fuzz run` currently defaul(...TRUNCATED)

"For reference, AFL already defaults to release mode with overflow checks and debug assertions: http(...TRUNCATED)

2020-06-20T21:45:55Z

0.7

2020-11-11T18:48:06Z

87c36a1deee8ca9b550fe034623a7445d7e8c770

[ "help", "init_finds_parent_project", "add_twice", "init_twice", "list" ]

[]

auto_2025-06-12

rust-lang/chalk

75

rust-lang__chalk-75

[ "74" ]

f4f9dfa86c497aa222864fd6abc9e955ca23ce80

"diff --git a/chalk-parse/src/ast.rs b/chalk-parse/src/ast.rs\n--- a/chalk-parse/src/ast.rs\n+++ b/c(...TRUNCATED)

"diff --git a/src/lib.rs b/src/lib.rs\n--- a/src/lib.rs\n+++ b/src/lib.rs\n@@ -2,6 +2,7 @@\n #![cfg_(...TRUNCATED)

"fallback clauses considered harmful / how to handle projection equality\nIn working on https://gith(...TRUNCATED)

2018-01-19T09:17:56Z

0.1

2018-01-20T12:30:20Z

154020e4884e7b9fe41a93a6970cfff78783cdcc

["lower::test::goal_quantifiers","lower::test::atc_accounting","solve::test::mixed_indices_normalize(...TRUNCATED)

["lower::test::concrete_impl_and_blanket_impl","lower::test::nonoverlapping_assoc_types","lower::tes(...TRUNCATED)

[]

auto_2025-06-13

rust-lang/chalk

55

rust-lang__chalk-55

[ "25" ]

7eb0f085b86986159097da1cb34dc065f2a6c8cd

"diff --git a/src/fold/instantiate.rs b/src/fold/instantiate.rs\n--- a/src/fold/instantiate.rs\n+++ (...TRUNCATED)

"diff --git a/src/solve/infer/test.rs b/src/solve/infer/test.rs\n--- a/src/solve/infer/test.rs\n+++ (...TRUNCATED)

"refactor occurs check into a folder\nThe occurs check code in `src/solve/infer/unify.rs` (specifica(...TRUNCATED)

"Working on it.\n@fabric-and-ink cool, feel free to come to gitter channel with questions, if any ar(...TRUNCATED)

2017-08-05T18:28:06Z

0.1

2017-10-10T11:21:48Z

154020e4884e7b9fe41a93a6970cfff78783cdcc

["solve::infer::test::cycle_error","solve::infer::test::cycle_indirect","solve::infer::test::univers(...TRUNCATED)

[]

auto_2025-06-13