Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion quest/m2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,4 +205,3 @@ quests that require them.
- [Cut readiness](/quest/m2/cut-gate/README.md) - the checks the cut needs that break nothing: main no slower than release, vendored fixes ported, and moq-c at parity
- [Probe](/quest/m2/probe/README.md) - a session probes up to the bitrate it wants to send or receive, so a stopped simulcast rendition resumes and a viewer up-switches; browser padding is parked in m3 (held in m2 by open claims; moves to m3)
- [Finish the milestone re-cut](/quest/m2/recut-held.md) - claim-held epics move to the milestone their kind and priority give them once their claims merge
- [moq-tokio's resolved config reports "off" as None](/quest/m2/tokio-resolved-options.md) - resolved timeouts and backoff accessors use `Option` while the text knobs keep `0` = off
36 changes: 0 additions & 36 deletions quest/m2/tokio-resolved-options.md

This file was deleted.

8 changes: 4 additions & 4 deletions rs/moq-c/src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ pub extern "C" fn moq_client_defaults() -> moq_client_config {
let config = crate::client::Config::default();

let connect = config.connect.resolve();
dst.connect_timeout_us = micros(connect.timeout);
dst.connect_timeout_us = micros(connect.timeout.unwrap_or_default());
dst.has_connect_timeout = true;
dst.failover_delay_us = micros(connect.race);
dst.has_failover_delay = true;
Expand All @@ -1611,15 +1611,15 @@ pub extern "C" fn moq_client_defaults() -> moq_client_config {
dst.has_backoff_initial = true;
dst.backoff_multiplier = config.connect.backoff.multiplier;
dst.has_backoff_multiplier = true;
dst.backoff_max_us = micros(config.connect.backoff.max());
dst.backoff_max_us = micros(config.connect.backoff.max().unwrap_or_default());
dst.has_backoff_max = true;
dst.backoff_timeout_us = micros(config.connect.backoff.timeout());
dst.backoff_timeout_us = micros(config.connect.backoff.timeout().unwrap_or_default());
dst.has_backoff_timeout = true;

let quic = config.quic.resolve();
dst.quic_max_streams = quic.max_streams;
dst.has_quic_max_streams = true;
dst.quic_idle_timeout_us = micros(quic.idle_timeout);
dst.quic_idle_timeout_us = micros(quic.idle_timeout.unwrap_or_default());
dst.has_quic_idle_timeout = true;
if let Some(keep_alive) = quic.keep_alive {
dst.quic_keep_alive_us = micros(keep_alive);
Expand Down
17 changes: 13 additions & 4 deletions rs/moq-c/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7435,7 +7435,10 @@ fn defaults_report_what_a_zeroed_config_dials() {
let connect = expected.connect.resolve();

assert!(config.has_connect_timeout);
assert_eq!(config.connect_timeout_us, connect.timeout.as_micros() as u64);
assert_eq!(
config.connect_timeout_us,
connect.timeout.unwrap_or_default().as_micros() as u64
);
assert!(config.has_failover_delay);
assert_eq!(config.failover_delay_us, connect.race.as_micros() as u64);
assert!(config.has_resolution_delay);
Expand All @@ -7449,10 +7452,13 @@ fn defaults_report_what_a_zeroed_config_dials() {
assert!(config.has_backoff_multiplier);
assert_eq!(config.backoff_multiplier, expected.connect.backoff.multiplier);
assert!(config.has_backoff_max);
assert_eq!(config.backoff_max_us, expected.connect.backoff.max().as_micros() as u64);
assert_eq!(
config.backoff_max_us,
expected.connect.backoff.max().unwrap_or_default().as_micros() as u64
);
assert!(config.has_backoff_timeout);
assert_eq!(
expected.connect.backoff.timeout(),
expected.connect.backoff.timeout().unwrap_or_default(),
std::time::Duration::from_micros(config.backoff_timeout_us)
);

Expand All @@ -7465,7 +7471,10 @@ fn defaults_report_what_a_zeroed_config_dials() {
assert!(config.has_quic_max_streams);
assert_eq!(config.quic_max_streams, quic.max_streams);
assert!(config.has_quic_idle_timeout);
assert_eq!(config.quic_idle_timeout_us, quic.idle_timeout.as_micros() as u64);
assert_eq!(
config.quic_idle_timeout_us,
quic.idle_timeout.unwrap_or_default().as_micros() as u64
);
assert_eq!(
config.has_quic_keep_alive.then_some(config.quic_keep_alive_us),
quic.keep_alive.map(|d| d.as_micros() as u64)
Expand Down
8 changes: 4 additions & 4 deletions rs/moq-ffi/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,12 @@ pub fn moq_client_defaults() -> MoqClientConfig {
let quic = moq_tokio::quic::Config::default().resolve();

MoqClientConfig {
timeout: Some(resolved.timeout),
timeout: Some(resolved.timeout.unwrap_or_default()),
race: Some(resolved.race),
resolution_delay: Some(resolved.resolution_delay),
quic: MoqQuicConfig {
max_streams: Some(quic.max_streams),
idle_timeout: Some(quic.idle_timeout),
idle_timeout: Some(quic.idle_timeout.unwrap_or_default()),
// Unset: derived from the idle timeout the peers negotiate.
keep_alive: quic.keep_alive,
..Default::default()
Expand All @@ -265,8 +265,8 @@ pub fn moq_client_defaults() -> MoqClientConfig {
backoff: MoqBackoff {
initial: Some(backoff.initial()),
multiplier: Some(backoff.multiplier),
max: Some(backoff.max()),
timeout: Some(backoff.timeout()),
max: Some(backoff.max().unwrap_or_default()),
timeout: Some(backoff.timeout().unwrap_or_default()),
},
..Default::default()
}
Expand Down
6 changes: 3 additions & 3 deletions rs/moq-ffi/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6571,7 +6571,7 @@ async fn client_defaults_are_what_an_unset_config_dials_with() {
let defaults = moq_client_defaults();

let connect = moq_tokio::connect::Config::default().resolve();
assert_eq!(defaults.timeout, Some(connect.timeout));
assert_eq!(defaults.timeout, connect.timeout);
assert_eq!(defaults.race, Some(connect.race));
assert_eq!(defaults.resolution_delay, Some(connect.resolution_delay));

Expand All @@ -6584,8 +6584,8 @@ async fn client_defaults_are_what_an_unset_config_dials_with() {
assert_eq!(defaults.websocket.enabled, Some(true));
let backoff = moq_tokio::connection::Backoff::default();
assert_eq!(defaults.backoff.initial, Some(backoff.initial()));
assert_eq!(defaults.backoff.max, Some(backoff.max()));
assert_eq!(defaults.backoff.timeout, Some(backoff.timeout()));
assert_eq!(defaults.backoff.max, Some(backoff.max().unwrap_or_default()));
assert_eq!(defaults.backoff.timeout, Some(backoff.timeout().unwrap_or_default()));

// The backend picks these, so there is no single value to report.
assert_eq!(defaults.tls.system_roots, None);
Expand Down
8 changes: 4 additions & 4 deletions rs/moq-gst/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub(crate) fn properties() -> Vec<glib::ParamSpec> {
glib::ParamSpecUInt64::builder("quic-idle-timeout")
.nick("QUIC idle timeout")
.blurb("QUIC idle timeout in milliseconds, 0 to disable locally")
.default_value(duration_millis(quic.idle_timeout))
.default_value(duration_millis(quic.idle_timeout.unwrap_or_default()))
.mutable_ready()
.build(),
glib::ParamSpecUInt64::builder("quic-keep-alive")
Expand Down Expand Up @@ -70,7 +70,7 @@ impl Settings {
"tls-disable-verify" => self.tls_disable_verify.to_value(),
"quic-idle-timeout" => duration_millis(
self.quic_idle_timeout
.unwrap_or_else(|| moq_tokio::quic::Resolved::default().idle_timeout),
.unwrap_or_else(|| moq_tokio::quic::Resolved::default().idle_timeout.unwrap_or_default()),
)
.to_value(),
"quic-keep-alive" => duration_millis(self.quic_keep_alive.unwrap_or_default()).to_value(),
Expand Down Expand Up @@ -165,8 +165,8 @@ mod tests {
assert_eq!(connect.tls.insecure, Some(true));
assert_eq!(connect.backoff.timeout, Some(Duration::ZERO.into()));
let quic = quic.resolve();
assert_eq!(quic.idle_timeout, Duration::from_secs(15));
assert_eq!(quic.keep_alive, Some(Duration::ZERO));
assert_eq!(quic.idle_timeout, Some(Duration::from_secs(15)));
assert_eq!(quic.keep_alive, None);
assert!(quic.keylog.is_some());
settings.set("connect-version", &"moq-lite-99".to_value());
assert!(settings.resolve().unwrap_err().to_string().contains("moq-lite-99"));
Expand Down
6 changes: 3 additions & 3 deletions rs/moq-gst/src/sink/imp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2629,7 +2629,7 @@ mod tests {

let resolved = ResolvedSettings::try_from(sink.imp().settings.lock().unwrap().clone()).unwrap();
let quic = super::super::session::quic_config(&resolved).resolve();
assert_eq!(quic.idle_timeout, Duration::from_secs(15));
assert_eq!(quic.idle_timeout, Some(Duration::from_secs(15)));
assert_eq!(quic.keep_alive, Some(Duration::from_secs(3)));
assert!(!sink.property::<bool>("quic-keylog"));
assert!(quic.keylog.is_none());
Expand All @@ -2639,8 +2639,8 @@ mod tests {
sink.set_property("quic-keylog", true);
let resolved = ResolvedSettings::try_from(sink.imp().settings.lock().unwrap().clone()).unwrap();
let quic = super::super::session::quic_config(&resolved).resolve();
assert_eq!(quic.idle_timeout, Duration::ZERO);
assert_eq!(quic.keep_alive, Some(Duration::ZERO));
assert_eq!(quic.idle_timeout, None);
assert_eq!(quic.keep_alive, None);
assert!(quic.keylog.is_some());
}

Expand Down
2 changes: 1 addition & 1 deletion rs/moq-relay/src/cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2333,7 +2333,7 @@ impl Cluster {
bind.set_port(0);
connect.bind = Some(bind);
}
if connect.backoff.timeout().is_zero() {
if connect.backoff.timeout().is_none() {
connect.backoff.timeout = Some(PEER_RETRY.into());
}
if target.is_some_and(|target| target.lan) {
Expand Down
3 changes: 2 additions & 1 deletion rs/moq-relay/src/uring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,8 @@ fn transport(quic: &moq_tokio::quic::Resolved) -> anyhow::Result<moq_uring::quic
);
tracing::info!(dir = %dir.display(), "writing qlog");
}
transport.idle_timeout = quic.idle_timeout;
// The uring transport spells "no idle timeout" as zero.
transport.idle_timeout = quic.idle_timeout.unwrap_or_default();
transport.keep_alive = quic.keep_alive;
transport.mtu_discovery = quic.mtu_discovery;
// `[quic]` resolves every limit, defaults included, so both runtimes run
Expand Down
6 changes: 5 additions & 1 deletion rs/moq-relay/tests/drills.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,11 @@ async fn cross_cluster(lane: Lane, link: PeerLink) {
};
let mut config = relay_config();
config.quic = relay_quic();
let relay_idle = config.quic.resolve().idle_timeout;
let relay_idle = config
.quic
.resolve()
.idle_timeout
.expect("the relay has an idle timeout");
let origin = RelayHost::start(config).await;
let seed = seed(lane);
let peer = match (link, lane) {
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-relay/tests/integration/goaway_cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ async fn goaway_handover_is_enforced_while_the_replacement_dial_hangs_inner() {
let healthy = Duration::from_millis(100);
config.backoff.healthy = Some(healthy.into());
// Past the handover, so only the handover can end the old session.
assert!(config.resolve().timeout > handover);
assert!(config.resolve().timeout.is_none_or(|timeout| timeout > handover));

let connection = within(
"client connects",
Expand Down
2 changes: 1 addition & 1 deletion rs/moq-tokio/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ impl Client {
let mut policy = moq_net::reconnect::Config::default();
policy.backoff = config.backoff.resolve();
policy.goaway = config.goaway.resolve();
policy.timeout = Some(resolved.timeout).filter(|timeout| !timeout.is_zero());
policy.timeout = resolved.timeout;
policy.pinned = !config.tls.fingerprint.is_empty();

let mut moq = moq_net::Client::new()
Expand Down
9 changes: 5 additions & 4 deletions rs/moq-tokio/src/connect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,8 @@ impl Config {
.resolution_delay
.map(Into::into)
.unwrap_or(DEFAULT_RESOLUTION_DELAY),
timeout: self.timeout.map(Into::into).unwrap_or(DEFAULT_TIMEOUT),
// A configured zero turns the deadline off.
timeout: Some(self.timeout.map(Into::into).unwrap_or(DEFAULT_TIMEOUT)).filter(|timeout| !timeout.is_zero()),
}
}
}
Expand All @@ -782,8 +783,8 @@ pub struct Resolved {
pub race: std::time::Duration,
/// How long the IPv4-only lookup waits for the full DNS answer.
pub resolution_delay: std::time::Duration,
/// The deadline one connection attempt gets, dial and handshake together.
pub timeout: std::time::Duration,
/// The deadline one connection attempt gets, dial and handshake together, or `None` for none.
pub timeout: Option<std::time::Duration>,
}

#[cfg(test)]
Expand Down Expand Up @@ -835,6 +836,6 @@ mod duration_tests {
timeout,
"--connect-timeout",
|c: &Config| c.resolve().timeout,
|d| d
|d: std::time::Duration| Some(d).filter(|d| !d.is_zero())
);
}
18 changes: 9 additions & 9 deletions rs/moq-tokio/src/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,14 @@ impl Backoff {
self.resolve().initial
}

/// The configured retry-delay cap, or its default; zero leaves the delay uncapped.
pub fn max(&self) -> Duration {
self.resolve().max.unwrap_or_default()
/// The configured retry-delay cap, or its default; `None` leaves the delay uncapped.
pub fn max(&self) -> Option<Duration> {
self.resolve().max
}

/// The retry deadline window, or its default; zero retries forever.
pub fn timeout(&self) -> Duration {
self.resolve().timeout.unwrap_or_default()
/// The retry deadline window, or its default; `None` retries forever.
pub fn timeout(&self) -> Option<Duration> {
self.resolve().timeout
}

/// The policy these knobs configure, with each unset one at its default.
Expand Down Expand Up @@ -1557,7 +1557,7 @@ mod tests {
assert_eq!(parsed.backoff.initial, Some((Duration::from_secs(7)).into()));
assert_eq!(parsed.backoff.multiplier, 5);
assert_eq!(parsed.backoff.max, Some((Duration::from_secs(11)).into()));
assert_eq!(parsed.backoff.timeout(), Duration::ZERO, "0 means retry forever");
assert_eq!(parsed.backoff.timeout(), None, "0 means retry forever");

// With no flags, the parser defaults resolve to the policy's defaults.
let parsed = Wrapper::parse_from(&[]).unwrap();
Expand Down Expand Up @@ -3036,15 +3036,15 @@ mod duration_tests {
max,
"--connect-backoff-max",
|c: &Backoff| c.max(),
|d| d
|d: Duration| Some(d).filter(|d| !d.is_zero())
);
crate::cli::duration::test_config_duration!(
timeout_set_in_code_beats_parser_default,
Backoff,
timeout,
"--connect-backoff-timeout",
|c: &Backoff| c.timeout(),
|d| d
|d: Duration| Some(d).filter(|d| !d.is_zero())
);
crate::cli::duration::test_config_duration!(
handover_set_in_code_beats_parser_default,
Expand Down
Loading
Loading