From 432d41ce3f4eb828d6c668d46c74e7ce7c8deef2 Mon Sep 17 00:00:00 2001 From: Marco Cadetg Date: Sun, 15 Mar 2026 16:45:13 +0100 Subject: [PATCH] Apply cargo fmt to fix CI formatting check --- benches/connection_merge.rs | 14 +++++---- benches/snapshot.rs | 3 +- src/main.rs | 12 ++++++-- src/network/merge.rs | 6 ++-- src/network/types.rs | 60 +++++++++++++++++++++++++++++-------- src/ui.rs | 4 +-- 6 files changed, 71 insertions(+), 28 deletions(-) diff --git a/benches/connection_merge.rs b/benches/connection_merge.rs index 8542273..9e9d01d 100644 --- a/benches/connection_merge.rs +++ b/benches/connection_merge.rs @@ -9,13 +9,19 @@ use std::time::SystemTime; fn make_connection_with_samples(n_samples: usize) -> Connection { let local = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(192, 168, 1, 100)), 54321); let remote = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(93, 184, 216, 34)), 443); - let mut conn = Connection::new(Protocol::Tcp, local, remote, ProtocolState::Tcp(TcpState::Established)); + let mut conn = Connection::new( + Protocol::Tcp, + local, + remote, + ProtocolState::Tcp(TcpState::Established), + ); // Simulate rate tracker updates to fill it with samples for _ in 0..n_samples { conn.bytes_sent += 100; conn.bytes_received += 200; - conn.rate_tracker.update(conn.bytes_sent, conn.bytes_received); + conn.rate_tracker + .update(conn.bytes_sent, conn.bytes_received); conn.packets_sent += 1; conn.packets_received += 1; } @@ -65,9 +71,7 @@ fn bench_merge(c: &mut Criterion) { &n_samples, |b, &n| { let mut conn = make_connection_with_samples(n); - b.iter(|| { - merge_packet_into_connection(&mut conn, &parsed, now) - }); + b.iter(|| merge_packet_into_connection(&mut conn, &parsed, now)); }, ); diff --git a/benches/snapshot.rs b/benches/snapshot.rs index 4548ede..4b95592 100644 --- a/benches/snapshot.rs +++ b/benches/snapshot.rs @@ -24,7 +24,8 @@ fn populate_connections(n: usize) -> DashMap { conn.bytes_received = 15000; conn.packets_sent = 10; conn.packets_received = 30; - conn.rate_tracker.update(conn.bytes_sent, conn.bytes_received); + conn.rate_tracker + .update(conn.bytes_sent, conn.bytes_received); map.insert(key, conn); } map diff --git a/src/main.rs b/src/main.rs index 4c7c09b..ba10351 100644 --- a/src/main.rs +++ b/src/main.rs @@ -488,9 +488,15 @@ where } else { None }; - if let Err(err) = - ui::draw(f, app, &ui_state, &connections, grouped, &stats, &mut click_regions) - { + if let Err(err) = ui::draw( + f, + app, + &ui_state, + &connections, + grouped, + &stats, + &mut click_regions, + ) { error!("UI draw error: {}", err); } })?; diff --git a/src/network/merge.rs b/src/network/merge.rs index c15ee4f..8b22fc0 100644 --- a/src/network/merge.rs +++ b/src/network/merge.rs @@ -933,8 +933,7 @@ mod tests { let mut conn = create_test_connection(); let packet = create_test_packet(true, false); - let _tcp_events = - merge_packet_into_connection(&mut conn, &packet, SystemTime::now()); + let _tcp_events = merge_packet_into_connection(&mut conn, &packet, SystemTime::now()); assert_eq!(conn.packets_sent, 1); assert_eq!(conn.bytes_sent, 100); @@ -963,8 +962,7 @@ mod tests { // Now simulate merging another packet let packet2 = create_test_packet(true, false); - let _tcp_events = - merge_packet_into_connection(&mut conn, &packet2, SystemTime::now()); + let _tcp_events = merge_packet_into_connection(&mut conn, &packet2, SystemTime::now()); // Bytes should have increased assert_eq!(conn.bytes_sent, 200); diff --git a/src/network/types.rs b/src/network/types.rs index 4e02c9b..0106df3 100644 --- a/src/network/types.rs +++ b/src/network/types.rs @@ -3154,18 +3154,54 @@ mod tests { use crate::network::parser::ParsedPacket; println!("=== Struct Size Report (stack-resident bytes) ==="); - println!("Connection: {} bytes", std::mem::size_of::()); - println!("RateTracker: {} bytes", std::mem::size_of::()); - println!("RateSample: {} bytes", std::mem::size_of::()); - println!("DpiInfo: {} bytes", std::mem::size_of::()); - println!("ApplicationProtocol: {} bytes", std::mem::size_of::()); - println!("TcpAnalytics: {} bytes", std::mem::size_of::()); - println!("ProtocolState: {} bytes", std::mem::size_of::()); - println!("GeoIpInfo: {} bytes", std::mem::size_of::()); - println!("ParsedPacket: {} bytes", std::mem::size_of::()); - println!("CryptoFrameReassembler:{} bytes", std::mem::size_of::()); - println!("TrafficHistory: {} bytes", std::mem::size_of::()); - println!("Protocol: {} bytes", std::mem::size_of::()); + println!( + "Connection: {} bytes", + std::mem::size_of::() + ); + println!( + "RateTracker: {} bytes", + std::mem::size_of::() + ); + println!( + "RateSample: {} bytes", + std::mem::size_of::() + ); + println!( + "DpiInfo: {} bytes", + std::mem::size_of::() + ); + println!( + "ApplicationProtocol: {} bytes", + std::mem::size_of::() + ); + println!( + "TcpAnalytics: {} bytes", + std::mem::size_of::() + ); + println!( + "ProtocolState: {} bytes", + std::mem::size_of::() + ); + println!( + "GeoIpInfo: {} bytes", + std::mem::size_of::() + ); + println!( + "ParsedPacket: {} bytes", + std::mem::size_of::() + ); + println!( + "CryptoFrameReassembler:{} bytes", + std::mem::size_of::() + ); + println!( + "TrafficHistory: {} bytes", + std::mem::size_of::() + ); + println!( + "Protocol: {} bytes", + std::mem::size_of::() + ); println!("================================================="); // Sanity: Connection should be reasonable (flag if it balloons) diff --git a/src/ui.rs b/src/ui.rs index 20b8ed6..ffadf68 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -1322,9 +1322,7 @@ fn draw_connections_list( // Format addresses - use hostnames when DNS resolution is enabled and show_hostnames is true let local_addr_display = conn.local_addr.to_string(); - let remote_addr_display = if ui_state.show_hostnames - && conn.protocol != Protocol::Arp - { + let remote_addr_display = if ui_state.show_hostnames && conn.protocol != Protocol::Arp { if let Some(resolver) = dns_resolver { if let Some(hostname) = resolver.get_hostname(&conn.remote_addr.ip()) { // Truncate hostname if too long, but always show port