Skip to content

Fix complete_io() for non-blocking IO #2586

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
merged 5 commits into from
Jul 29, 2025
Merged

Fix complete_io() for non-blocking IO #2586

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebb081c
rustls-test: add helper for non-blocking IO tests
ctz Jul 29, 2025
773cb9c
rustls-test: withdraw `FailsReads` helper
ctz Jul 29, 2025
c155b34
Exit `complete_io` loop as soon as no progress is made
ctz Jul 29, 2025
a1aa8c8
`complete_io`: make non-blocking error return reachable
ctz Jul 29, 2025
ab1d978
Improve testing of non-blocking `complete_io()`
ctz Jul 29, 2025
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
Prev Previous commit
Next Next commit
complete_io: make non-blocking error return reachable 
This function is complex because it does too much (we should fix that)
but roughly either operates in "handshake" or "data" mode.

The condition here is unreachable in "data" mode (thanks to the line above).

In "handshake" mode IO flips between reading and writing rather than doing
both at once, so it is rare that both reading and writing are attempted in
one loop.
  • Loading branch information
@ctz
ctz committed Jul 29, 2025
commit a1aa8c8da99d07b37ff5d6dfb9c1d3fbeec3a138
2 changes: 1 addition & 1 deletion rustls/src/conn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,9 +661,9 @@ impl<Data> ConnectionCommon<Data> {
let blocked = blocked_write.zip(blocked_read);
match (eof, until_handshaked, self.is_handshaking(), blocked) {
(_, true, false, _) => return Ok((rdlen, wrlen)),
(_, _, _, Some((e, _))) if rdlen == 0 && wrlen == 0 => return Err(e),
(_, false, _, _) => return Ok((rdlen, wrlen)),
(true, true, true, _) => return Err(io::Error::from(io::ErrorKind::UnexpectedEof)),
(_, _, _, Some((e, _))) => return Err(e),
_ => {}
}
}
Expand Down