github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-28 10:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(connlib): print GRO metadata in wire::net::recv log (#7353)

Browse Source 
Previously, we printed only the size of each individual packet in the
`wire::net` logs. This makes it impossible to tell whether or not GRO
was used to receive this packet. The total number of bytes can still be
computed by calculating `num_packets * segment_size + trailing_bytes`.
Thus, the new log is strictly superior.
This commit is contained in:
Thomas Eizinger
2024-11-15 16:11:03 +00:00
committed by GitHub
parent 2b3469954a
commit f34f596d8d
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rust/socket-factory/src/lib.rs
View File

@@ -237,12 +237,7 @@ impl UdpSocket {
};
match meta.stride.cmp(&meta.len) {
std::cmp::Ordering::Equal => {}
std::cmp::Ordering::Less => {
let num_packets = meta.len / meta.stride;
tracing::trace!(%num_packets, size = %meta.stride, "Read packets using GRO");
}
std::cmp::Ordering::Equal | std::cmp::Ordering::Less => {}
std::cmp::Ordering::Greater => {
return Poll::Ready(Err(io::Error::new(
io::ErrorKind::InvalidData,
@@ -256,15 +251,18 @@ impl UdpSocket {
let local = SocketAddr::new(local_ip, *port);
let segment_size = meta.stride;
let num_packets = meta.len / segment_size;
let trailing_bytes = meta.len % segment_size;
tracing::trace!(target: "wire::net::recv", src = %meta.addr, dst = %local, %num_packets, %segment_size, %trailing_bytes);
let iter = buffer[..meta.len]
.chunks(meta.stride)
.map(move |packet| DatagramIn {
local,
from: meta.addr,
packet,
})
.inspect(|r| {
tracing::trace!(target: "wire::net::recv", src = %r.from, dst = %r.local, num_bytes = %r.packet.len());
});
return Poll::Ready(Ok(iter));