Skip to content

fix: Do not send off-path data when closing #358

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
divagant-martian merged 4 commits into from
Jan 26, 2026
Merged

fix: Do not send off-path data when closing #358

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
507fd34
fix: Do not send off-path data when closing
flub Jan 22, 2026
15a07c0
maybe fix
flub Jan 22, 2026
c36b90b
revert that. it was wrong
flub Jan 22, 2026
a14cfac
Apply suggestion from @matheus23
flub Jan 26, 2026
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
12 changes: 7 additions & 5 deletions quinn-proto/src/connection/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ impl Connection {
// datagrams for one destination address are produced for each poll_transmit call.

// Check whether we need to send a close message
let close = match self.state.as_type() {
let connection_close_pending = match self.state.as_type() {
StateType::Drained => {
self.app_limited = true;
return None;
Expand Down Expand Up @@ -1091,7 +1091,9 @@ impl Connection {
let mut congestion_blocked = false;

for &path_id in &path_ids {
if let Some(transmit) = self.poll_transmit_off_path(now, buf, path_id) {
if !connection_close_pending
&& let Some(transmit) = self.poll_transmit_off_path(now, buf, path_id)
{
return Some(transmit);
}

Expand All @@ -1102,7 +1104,7 @@ impl Connection {
path_id,
max_datagrams,
have_available_path,
close,
connection_close_pending,
) {
PollPathStatus::Send(transmit) => {
return Some(transmit);
Expand Down Expand Up @@ -1214,7 +1216,7 @@ impl Connection {
path_id: PathId,
max_datagrams: NonZeroUsize,
have_available_path: bool,
close: bool,
connection_close_pending: bool,
) -> PollPathStatus {
// Check if there is at least one active CID to use for sending
let Some(remote_cid) = self.remote_cids.get(&path_id).map(CidQueue::active) else {
Expand Down Expand Up @@ -1259,7 +1261,7 @@ impl Connection {
space_id,
remote_cid,
have_available_path,
close,
connection_close_pending,
pad_datagram,
) {
PollPathSpaceStatus::NothingToSend {
Expand Down
Loading