gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-09-19 01:36:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce PathData::is_validating_path and fix send logic

Browse Source
This commit is contained in:
Philipp Krüger
2025-11-22 16:49:41 +01:00
committed by Diva Martínez
parent 4da495fe67
commit fe22a2bf37
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quinn-proto/src/connection/mod.rs
+18 -17
View File
@@ -811,7 +811,7 @@ impl Connection {
// for the path to be opened we need to send a packet on the path. Sending a challenge
// guarantees this
data.challenge_pending = true;
data.send_new_challenge = true;
let path = vacant_entry.insert(PathState { data, prev: None });
@@ -1591,9 +1591,10 @@ impl Connection {
path_id: PathId,
) -> Option<Transmit> {
let (prev_cid, prev_path) = self.paths.get_mut(&path_id)?.prev.as_mut()?;
if !prev_path.challenge_pending {
if !prev_path.send_new_challenge {
return None;
};
prev_path.send_new_challenge = false;
let token = self.rng.random();
prev_path.challenges_sent.insert(token, now);
let destination = prev_path.remote;
@@ -1847,14 +1848,14 @@ impl Connection {
path.data = prev;
}
path.data.challenges_sent.clear();
path.data.challenge_pending = false;
path.data.send_new_challenge = false;
}
PathTimer::PathOpen => {
let Some(path) = self.path_mut(path_id) else {
continue;
};
path.challenges_sent.clear();
path.challenge_pending = false;
path.send_new_challenge = false;
debug!("new path validation failed");
if let Err(err) = self.close_path(
now,
@@ -2404,7 +2405,7 @@ impl Connection {
.remove_in_flight(&info);
let app_limited = self.app_limited;
let path = self.path_data_mut(path_id);
if info.ack_eliciting && path.challenges_sent.is_empty() {
if info.ack_eliciting && !path.challenges_sent.is_empty() {
// Only pass ACKs to the congestion controller if we are not validating the current
// path, so as to ignore any ACKs from older paths still coming in.
let rtt = path.rtt;
@@ -4039,7 +4040,7 @@ impl Connection {
self.timers
.stop(Timer::PerPath(path_id, PathTimer::PathOpen));
path.data.challenges_sent.clear();
path.data.challenge_pending = false;
path.data.send_new_challenge = false;
path.data.validated = true;
path.data.rtt.update(
Duration::ZERO,
@@ -4059,7 +4060,7 @@ impl Connection {
}
if let Some((_, ref mut prev)) = path.prev {
prev.challenges_sent.clear();
prev.challenge_pending = false;
prev.send_new_challenge = false;
}
} else {
debug!(token, "ignoring invalid PATH_RESPONSE");
@@ -4655,12 +4656,12 @@ impl Connection {
}));
}
}
new_path.challenge_pending = true;
new_path.send_new_challenge = true;
let mut prev = mem::replace(path, new_path);
// Don't clobber the original path if the previous one hasn't been validated yet
if !prev.validated {
prev.challenge_pending = true;
if !prev.challenges_sent.is_empty() {
prev.send_new_challenge = true;
// We haven't updated the remote CID yet, this captures the remote CID we were using on
// the previous path.
@@ -4921,10 +4922,10 @@ impl Connection {
}
// PATH_CHALLENGE
if buf.remaining_mut() > 9 && space_id == SpaceId::Data && !path.validated {
if buf.remaining_mut() > 9 && space_id == SpaceId::Data {
// Transmit challenges with every outgoing packet on an unvalidated path
if !path.validated {
// Generate a new challenge every time we send a new PC
if path.is_validating_path() {
// Generate a new challenge every time we send a new PATH_CHALLENGE
let token = self.rng.random();
path.challenges_sent.insert(token, now);
sent.non_retransmits = true;
@@ -4934,13 +4935,13 @@ impl Connection {
buf.write(token);
self.stats.frame_tx.path_challenge += 1;
if is_multipath_negotiated && path.challenge_pending {
if is_multipath_negotiated && !path.validated && path.send_new_challenge {
// queue informing the path status along with the challenge
space.pending.path_status.insert(path_id);
}
// But only send a packet solely for that purpose at most once
path.challenge_pending = false;
path.send_new_challenge = false;
// Always include an OBSERVED_ADDR frame with a PATH_CHALLENGE, regardless
// of whether one has already been sent on this path.
@@ -5755,11 +5756,11 @@ impl Connection {
/// may need to be sent.
fn can_send_1rtt(&self, path_id: PathId, max_size: usize) -> SendableFrames {
let path_exclusive = self.paths.get(&path_id).is_some_and(|path| {
path.data.challenge_pending
path.data.send_new_challenge
|| path
.prev
.as_ref()
.is_some_and(|(_, path)| path.challenge_pending)
.is_some_and(|(_, path)| path.send_new_challenge)
|| !path.data.path_responses.is_empty()
});
let other = self.streams.can_send_stream_data()
quinn-proto/src/connection/paths.rs
+10 -3
View File
@@ -129,8 +129,10 @@ pub(super) struct PathData {
pub(super) congestion: Box<dyn congestion::Controller>,
/// Pacing state
pub(super) pacing: Pacer,
/// Actually sent challenges (on the wire)
pub(super) challenges_sent: IntMap<u64, Instant>,
pub(super) challenge_pending: bool,
/// Whether to *immediately* trigger another PATH_CHALLENGE (via Connection::can_send)
pub(super) send_new_challenge: bool,
/// Pending responses to PATH_CHALLENGE frames
pub(super) path_responses: PathResponses,
/// Whether we're certain the peer can both send and receive on this address
@@ -226,7 +228,7 @@ impl PathData {
),
congestion,
challenges_sent: Default::default(),
challenge_pending: Default::default(),
send_new_challenge: false,
path_responses: PathResponses::default(),
validated: false,
total_sent: 0,
@@ -280,7 +282,7 @@ impl PathData {
sending_ecn: true,
congestion,
challenges_sent: Default::default(),
challenge_pending: Default::default(),
send_new_challenge: false,
path_responses: PathResponses::default(),
validated: false,
total_sent: 0,
@@ -302,6 +304,11 @@ impl PathData {
}
}
/// Whether we're in the process of validating this path with PATH_CHALLENGEs
pub(super) fn is_validating_path(&self) -> bool {
!self.challenges_sent.is_empty() || self.send_new_challenge
}
/// Resets RTT, congestion control and MTU states.
///
/// This is useful when it is known the underlying path has changed.