Skip to content

refactor(transport): move UDP datagram limit calc outside loop #3045

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

Merged
mxinden merged 1 commit into from
Oct 14, 2025
Merged

refactor(transport): move UDP datagram limit calc outside loop #3045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions neqo-transport/src/connection/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2656,6 +2656,15 @@ impl Connection {
let grease_quic_bit = self.can_grease_quic_bit();
let version = self.version();

// Determine the size limit and padding for this UDP datagram.
let limit = if path.borrow().pmtud().needs_probe() {
needs_padding = true;
debug_assert!(path.borrow().pmtud().probe_size() >= profile.limit());
path.borrow().pmtud().probe_size()
} else {
profile.limit()
};

// Frames for different epochs must go in different packets, but then these
// packets can go in a single datagram
for space in PacketNumberSpace::iter() {
Expand All @@ -2668,15 +2677,6 @@ impl Connection {

let header_start = encoder.len();

// Configure the limits and padding for this packet.
let limit = if path.borrow().pmtud().needs_probe() {
needs_padding = true;
debug_assert!(path.borrow().pmtud().probe_size() >= profile.limit());
path.borrow().pmtud().probe_size() - aead_expansion
} else {
profile.limit() - aead_expansion
};

let (pt, mut builder) = Self::build_packet_header(
&path.borrow(),
epoch,
Expand All @@ -2685,7 +2685,9 @@ impl Connection {
&self.address_validation,
version,
grease_quic_bit,
limit,
// Limit the packet builder further to leave space for AEAD
// expansion added in `builder.build` below.
limit - aead_expansion,
);
let pn = Self::add_packet_number(
&mut builder,
Expand Down
Loading