mirror of
https://github.com/domcyrus/rustnet.git
synced 2026-05-19 12:08:39 -05:00
Apply cargo fmt to fix CI formatting check
This commit is contained in:
@@ -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));
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
+2
-1
@@ -24,7 +24,8 @@ fn populate_connections(n: usize) -> DashMap<String, Connection> {
|
||||
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
|
||||
|
||||
+9
-3
@@ -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);
|
||||
}
|
||||
})?;
|
||||
|
||||
@@ -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);
|
||||
|
||||
+48
-12
@@ -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::<Connection>());
|
||||
println!("RateTracker: {} bytes", std::mem::size_of::<RateTracker>());
|
||||
println!("RateSample: {} bytes", std::mem::size_of::<RateSample>());
|
||||
println!("DpiInfo: {} bytes", std::mem::size_of::<DpiInfo>());
|
||||
println!("ApplicationProtocol: {} bytes", std::mem::size_of::<ApplicationProtocol>());
|
||||
println!("TcpAnalytics: {} bytes", std::mem::size_of::<TcpAnalytics>());
|
||||
println!("ProtocolState: {} bytes", std::mem::size_of::<ProtocolState>());
|
||||
println!("GeoIpInfo: {} bytes", std::mem::size_of::<GeoIpInfo>());
|
||||
println!("ParsedPacket: {} bytes", std::mem::size_of::<ParsedPacket>());
|
||||
println!("CryptoFrameReassembler:{} bytes", std::mem::size_of::<CryptoFrameReassembler>());
|
||||
println!("TrafficHistory: {} bytes", std::mem::size_of::<TrafficHistory>());
|
||||
println!("Protocol: {} bytes", std::mem::size_of::<Protocol>());
|
||||
println!(
|
||||
"Connection: {} bytes",
|
||||
std::mem::size_of::<Connection>()
|
||||
);
|
||||
println!(
|
||||
"RateTracker: {} bytes",
|
||||
std::mem::size_of::<RateTracker>()
|
||||
);
|
||||
println!(
|
||||
"RateSample: {} bytes",
|
||||
std::mem::size_of::<RateSample>()
|
||||
);
|
||||
println!(
|
||||
"DpiInfo: {} bytes",
|
||||
std::mem::size_of::<DpiInfo>()
|
||||
);
|
||||
println!(
|
||||
"ApplicationProtocol: {} bytes",
|
||||
std::mem::size_of::<ApplicationProtocol>()
|
||||
);
|
||||
println!(
|
||||
"TcpAnalytics: {} bytes",
|
||||
std::mem::size_of::<TcpAnalytics>()
|
||||
);
|
||||
println!(
|
||||
"ProtocolState: {} bytes",
|
||||
std::mem::size_of::<ProtocolState>()
|
||||
);
|
||||
println!(
|
||||
"GeoIpInfo: {} bytes",
|
||||
std::mem::size_of::<GeoIpInfo>()
|
||||
);
|
||||
println!(
|
||||
"ParsedPacket: {} bytes",
|
||||
std::mem::size_of::<ParsedPacket>()
|
||||
);
|
||||
println!(
|
||||
"CryptoFrameReassembler:{} bytes",
|
||||
std::mem::size_of::<CryptoFrameReassembler>()
|
||||
);
|
||||
println!(
|
||||
"TrafficHistory: {} bytes",
|
||||
std::mem::size_of::<TrafficHistory>()
|
||||
);
|
||||
println!(
|
||||
"Protocol: {} bytes",
|
||||
std::mem::size_of::<Protocol>()
|
||||
);
|
||||
println!("=================================================");
|
||||
|
||||
// Sanity: Connection should be reasonable (flag if it balloons)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user