Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(iroh-net): Also check the last packet in MagicSock::poll_recv #2650

Merged
merged 7 commits into from
Aug 26, 2024
Merged

fix(iroh-net): Also check the last packet in MagicSock::poll_recv #2650

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
473df5e
fix(iroh-net): Don't drop the last packet in a transmit read
matheus23 Aug 20, 2024
2d9a5e7
refactor: Use `chunks_mut` in favor of custom iteration logic
matheus23 Aug 20, 2024
b9132e9
Update iroh-net/src/magicsock.rs
matheus23 Aug 26, 2024
3cdaf08
Update iroh-net/src/magicsock.rs
matheus23 Aug 26, 2024
318b3fa
Add `recv_gro_packets` metric
matheus23 Aug 26, 2024
ba30fa9
Merge branch 'main' into matheus23/more-packets
matheus23 Aug 26, 2024
f71a02f
rename `recv_gro_packets` to `recv_gro_datagrams`
matheus23 Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions iroh-net/src/magicsock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,17 +697,11 @@ impl MagicSock {
let mut quic_packets_total = 0;

for (meta, buf) in metas.iter_mut().zip(bufs.iter_mut()).take(msgs) {
let mut start = 0;
let mut is_quic = false;
let mut quic_packets_count = 0;

// find disco and stun packets and forward them to the actor
loop {
let end = start + meta.stride;
if end > meta.len {
break;
}
let packet = &buf[start..end];
for packet in buf[..meta.len].chunks_mut(meta.stride) {
let packet_is_quic = if stun::is(packet) {
trace!(src = %meta.addr, len = %meta.stride, "UDP recv: stun packet");
let packet2 = Bytes::copy_from_slice(packet);
Expand All @@ -725,9 +719,9 @@ impl MagicSock {
} else {
trace!(src = %meta.addr, len = %meta.stride, "UDP recv: quic packet");
if from_ipv4 {
inc_by!(MagicsockMetrics, recv_data_ipv4, buf.len() as _);
inc_by!(MagicsockMetrics, recv_data_ipv4, packet.len() as _);
} else {
inc_by!(MagicsockMetrics, recv_data_ipv6, buf.len() as _);
inc_by!(MagicsockMetrics, recv_data_ipv6, packet.len() as _);
}
true
};
Expand All @@ -740,9 +734,8 @@ impl MagicSock {
// this makes quinn reliably and quickly ignore the packet as long as
// [`quinn::EndpointConfig::grease_quic_bit`] is set to `false`
// (which we always do in Endpoint::bind).
buf[start] = 0u8;
packet[0] = 0u8;
}
start = end;
}

if is_quic {
Expand Down
Loading