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: Correctly manage bytes_in_flight during a rebinding event #1812

Merged
merged 2 commits into from
Apr 11, 2024
Merged

fix: Correctly manage bytes_in_flight during a rebinding event #1812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b5de65
fix: Correctly manage `bytes_in_flight` during a rebinding event
larseggert Apr 10, 2024
412dc22
Update comment. Remove incorrect `clippy::unused_self` while I'm here.
larseggert Apr 10, 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
11 changes: 6 additions & 5 deletions neqo-transport/src/cc/classic_cc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,9 @@ impl<T: WindowAdjustment> CongestionControl for ClassicCongestionControl<T> {
if pkt.pn < self.first_app_limited {
is_app_limited = false;
}
assert!(self.bytes_in_flight >= pkt.size);
self.bytes_in_flight -= pkt.size;
// BIF is set to 0 on a path change, but in case that was because of a simple rebinding
// event, we may still get ACKs for packets sent before the rebinding.
self.bytes_in_flight = self.bytes_in_flight.saturating_sub(pkt.size);

if !self.after_recovery_start(pkt) {
// Do not increase congestion window for packets sent before
Expand Down Expand Up @@ -271,8 +272,9 @@ impl<T: WindowAdjustment> CongestionControl for ClassicCongestionControl<T> {
pkt.pn,
pkt.size
);
assert!(self.bytes_in_flight >= pkt.size);
self.bytes_in_flight -= pkt.size;
// BIF is set to 0 on a path change, but in case that was because of a simple rebinding
// event, we may still declare packets lost that were sent before the rebinding.
self.bytes_in_flight = self.bytes_in_flight.saturating_sub(pkt.size);
}
qlog::metrics_updated(
&mut self.qlog,
Expand Down Expand Up @@ -516,7 +518,6 @@ impl<T: WindowAdjustment> ClassicCongestionControl<T> {
true
}

#[allow(clippy::unused_self)]
fn app_limited(&self) -> bool {
if self.bytes_in_flight >= self.congestion_window {
false
Expand Down