Skip to content

feat(proto): Better NAT probe retry intervals #623

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
flub merged 3 commits into from
May 6, 2026
Merged

feat(proto): Better NAT probe retry intervals #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4759df8
feat(proto): Better NAT probe retry intervals
flub Apr 29, 2026
6e2ebb5
Merge branch 'main' into flub/nat-probe-retry-timing
flub May 5, 2026
99fb41c
Merge branch 'main' into flub/nat-probe-retry-timing
flub May 6, 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
25 changes: 14 additions & 11 deletions noq-proto/src/connection/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2447,9 +2447,10 @@ impl Connection {
}
}
ConnTimer::NatTraversalProbeRetry => {
if self.n0_nat_traversal.queue_retries(self.is_ipv6()) {
let delay =
RttEstimator::new(self.config.initial_rtt).pto_base() * 2 / 3;
self.n0_nat_traversal.queue_retries(self.is_ipv6());
if let Some(delay) =
self.n0_nat_traversal.retry_delay(self.config.initial_rtt)
{
self.timers.set(
Timer::Conn(ConnTimer::NatTraversalProbeRetry),
now + delay,
Expand Down Expand Up @@ -5535,12 +5536,15 @@ impl Connection {

if server_state.current_round() > round_before {
// A new round was started, reset the NAT probe retry timer.
let delay = RttEstimator::new(self.config.initial_rtt).pto_base() * 2 / 3;
self.timers.set(
Timer::Conn(ConnTimer::NatTraversalProbeRetry),
now + delay,
self.qlog.with_time(now),
);
if let Some(delay) =
self.n0_nat_traversal.retry_delay(self.config.initial_rtt)
{
self.timers.set(
Timer::Conn(ConnTimer::NatTraversalProbeRetry),
now + delay,
self.qlog.with_time(now),
);
}
}
}
}
Expand Down Expand Up @@ -7137,8 +7141,7 @@ impl Connection {
let client_state = self.n0_nat_traversal.client_side_mut()?;
let (mut reach_out_frames, probed_addrs) =
client_state.initiate_nat_traversal_round(ipv6)?;
if !probed_addrs.is_empty() {
let delay = RttEstimator::new(self.config.initial_rtt).pto_base() * 2 / 3;
if let Some(delay) = self.n0_nat_traversal.retry_delay(self.config.initial_rtt) {
self.timers.set(
Timer::Conn(ConnTimer::NatTraversalProbeRetry),
now + delay,
Expand Down
Loading
Loading