From d6a43e95a5ec1c49df3397e38beeb74866562600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= Date: Wed, 29 Apr 2026 15:42:23 +0200 Subject: [PATCH 1/8] feat(iroh): Update QNT config defaults & update to latest noq main --- Cargo.lock | 21 ++++++++++++++------- Cargo.toml | 5 +++++ deny.toml | 4 +++- iroh/src/endpoint/quic.rs | 16 +++++++++------- iroh/src/socket.rs | 15 +++++++++++++-- 5 files changed, 44 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4275725e9ed..4612a7d484f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3201,8 +3201,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b969bd157c3bd3bab239a1a8b14f67f2033fa012770367fcbd5b42d71ae3548" +source = "git+https://github.com/n0-computer/noq?branch=main#e25d7dd60a277162680c1bc2d0fd0d6dc826a24b" dependencies = [ "bytes", "cfg_aliases", @@ -3223,8 +3222,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdec6f5039d98ee5377b2f532d495a555eb664c53161b1b5780dcaeac678b60e" +source = "git+https://github.com/n0-computer/noq?branch=main#e25d7dd60a277162680c1bc2d0fd0d6dc826a24b" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3237,11 +3235,12 @@ dependencies = [ "lru-slab", "n0-qlog", "rand 0.10.1", + "rand_pcg", "ring", "rustc-hash", "rustls", "rustls-pki-types", - "rustls-platform-verifier 0.6.2", + "rustls-platform-verifier 0.7.0", "slab", "sorted-index-buffer", "thiserror 2.0.18", @@ -3253,8 +3252,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91b05f4f3353290936ba1f3233518868fb4e2da99cb4c90d1f8cebb064e527" +source = "git+https://github.com/n0-computer/noq?branch=main#e25d7dd60a277162680c1bc2d0fd0d6dc826a24b" dependencies = [ "cfg_aliases", "libc", @@ -3982,6 +3980,15 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +[[package]] +name = "rand_pcg" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +dependencies = [ + "rand_core 0.10.0", +] + [[package]] name = "rand_xorshift" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 9206d2105c3..475b5f6bc78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,3 +41,8 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l [workspace.lints.clippy] unused-async = "warn" + +[patch.crates-io] +noq = { git = "https://github.com/n0-computer/noq", branch = "main" } +noq-udp = { git = "https://github.com/n0-computer/noq", branch = "main" } +noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" } \ No newline at end of file diff --git a/deny.toml b/deny.toml index fb93f218860..be4b77d7986 100644 --- a/deny.toml +++ b/deny.toml @@ -26,4 +26,6 @@ ignore = [ ] [sources] -allow-git = [] +allow-git = [ + "https://github.com/n0-computer/noq", +] diff --git a/iroh/src/endpoint/quic.rs b/iroh/src/endpoint/quic.rs index 426f80cb562..229af4538b3 100644 --- a/iroh/src/endpoint/quic.rs +++ b/iroh/src/endpoint/quic.rs @@ -83,7 +83,9 @@ pub use noq_proto::{ }; use tracing::warn; -use crate::socket::{HEARTBEAT_INTERVAL, MAX_MULTIPATH_PATHS, PATH_MAX_IDLE_TIMEOUT}; +use crate::socket::{ + HEARTBEAT_INTERVAL, MAX_MULTIPATH_PATHS, MAX_QNT_ADDRESSES, PATH_MAX_IDLE_TIMEOUT, +}; /// Builder for a [`QuicTransportConfig`]. #[derive(Debug, Clone)] @@ -154,8 +156,8 @@ impl QuicTransportConfigBuilder { cfg.keep_alive_interval(Some(HEARTBEAT_INTERVAL)); cfg.default_path_keep_alive_interval(Some(HEARTBEAT_INTERVAL)); cfg.default_path_max_idle_timeout(Some(PATH_MAX_IDLE_TIMEOUT)); - cfg.max_concurrent_multipath_paths(MAX_MULTIPATH_PATHS + 1); - cfg.set_max_remote_nat_traversal_addresses(MAX_MULTIPATH_PATHS as u8); + cfg.max_concurrent_multipath_paths(MAX_MULTIPATH_PATHS); + cfg.max_remote_nat_traversal_addresses(MAX_QNT_ADDRESSES); Self(cfg) } @@ -528,10 +530,10 @@ impl QuicTransportConfigBuilder { /// /// This implementation expects the multipath extension to be enabled as well. If not yet /// enabled via [`Self::max_concurrent_multipath_paths`], a default value of - /// 12 will be used. + /// 8 will be used. /// - /// Note: this method will ignore values less than the recommended 12 and will log a warning. - pub fn set_max_remote_nat_traversal_addresses(mut self, max_addresses: u8) -> Self { + /// Note: this method will ignore values less than the recommended 8 and will log a warning. + pub fn max_remote_nat_traversal_addresses(mut self, max_addresses: u8) -> Self { if max_addresses < MAX_MULTIPATH_PATHS as u8 { warn!( "QuicTransportConfig::max_remote_nat_traversal_addresses must be at least {}, ignoring user supplied value", @@ -539,7 +541,7 @@ impl QuicTransportConfigBuilder { ); return self; } - self.0.set_max_remote_nat_traversal_addresses(max_addresses); + self.0.max_remote_nat_traversal_addresses(max_addresses); self } diff --git a/iroh/src/socket.rs b/iroh/src/socket.rs index bbb695a58e9..7ba7def4bf5 100644 --- a/iroh/src/socket.rs +++ b/iroh/src/socket.rs @@ -128,8 +128,19 @@ pub(crate) const RELAY_PATH_MAX_IDLE_TIMEOUT: Duration = Duration::from_secs(30) /// Maximum number of concurrent QUIC multipath paths per connection. /// -/// Pretty arbitrary and high right now. -pub(crate) const MAX_MULTIPATH_PATHS: u32 = 12; +/// We expect 1 relay path, and then leave space for ~3 IP and custom transport paths. +/// On top of that, when we expect a network change, we might be closing these paths +/// (except for the relay path) and open new ones, and give us 3 more paths to spare. +/// And finally we round that up to 8 for good measure. +pub(crate) const MAX_MULTIPATH_PATHS: u32 = 8; + +/// Maximum number of n0 QUIC NAT Traversal addresses that the QUIC stack should allow. +/// +/// This needs to be big enough to accommodate for machines which have lots of network +/// interfaces enabled. We've seen MacOS machines with >25 interfaces in the wild +/// (mostly due to VPN TUN and docket interfaces), so this seems like a reasonable +/// value. +pub(crate) const MAX_QNT_ADDRESSES: u8 = 32; /// Error returned when the endpoint state actor stopped while waiting for a reply. #[stack_error(add_meta, derive)] From 7049dd2960a5763a6ddb09edfdfafd13a1157735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= Date: Wed, 29 Apr 2026 17:34:22 +0200 Subject: [PATCH 2/8] Fix rustdoc --- iroh/src/endpoint/quic.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iroh/src/endpoint/quic.rs b/iroh/src/endpoint/quic.rs index 229af4538b3..788798a1e42 100644 --- a/iroh/src/endpoint/quic.rs +++ b/iroh/src/endpoint/quic.rs @@ -113,7 +113,7 @@ pub struct QuicTransportConfigBuilder(noq::TransportConfig); /// - [`QuicTransportConfigBuilder::default_path_keep_alive_interval`] /// - [`QuicTransportConfigBuilder::default_path_max_idle_timeout`] /// - [`QuicTransportConfigBuilder::max_concurrent_multipath_paths`] -/// - [`QuicTransportConfigBuilder::set_max_remote_nat_traversal_addresses`] +/// - [`QuicTransportConfigBuilder::max_remote_nat_traversal_addresses`] /// /// # Examples /// ``` From 3dbec6a07a03ef05b8d4cde3502fedd840e4ba3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Kr=C3=BCger?= Date: Thu, 30 Apr 2026 15:06:31 +0200 Subject: [PATCH 3/8] Update noq version --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4612a7d484f..82ff35cb273 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1384,7 +1384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3201,7 +3201,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "git+https://github.com/n0-computer/noq?branch=main#e25d7dd60a277162680c1bc2d0fd0d6dc826a24b" +source = "git+https://github.com/n0-computer/noq?branch=main#c7119679e60ad5a4f0beddb30d7117b267ee69d4" dependencies = [ "bytes", "cfg_aliases", @@ -3222,7 +3222,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=main#e25d7dd60a277162680c1bc2d0fd0d6dc826a24b" +source = "git+https://github.com/n0-computer/noq?branch=main#c7119679e60ad5a4f0beddb30d7117b267ee69d4" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3252,7 +3252,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "git+https://github.com/n0-computer/noq?branch=main#e25d7dd60a277162680c1bc2d0fd0d6dc826a24b" +source = "git+https://github.com/n0-computer/noq?branch=main#c7119679e60ad5a4f0beddb30d7117b267ee69d4" dependencies = [ "cfg_aliases", "libc", @@ -3276,7 +3276,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4272,7 +4272,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4365,7 +4365,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4386,7 +4386,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4491,7 +4491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4749,7 +4749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4974,7 +4974,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5874,7 +5874,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 475b5f6bc78..75cc8ba5cf5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,4 +45,4 @@ unused-async = "warn" [patch.crates-io] noq = { git = "https://github.com/n0-computer/noq", branch = "main" } noq-udp = { git = "https://github.com/n0-computer/noq", branch = "main" } -noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" } \ No newline at end of file +noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" } From 08d0ab59c84388d66eecfd33d9d859de2a503b43 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Mon, 4 May 2026 17:23:55 +0200 Subject: [PATCH 4/8] test noq branch --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44b50fbf63f..3a3a37e262c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1372,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3184,7 +3184,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "git+https://github.com/n0-computer/noq?branch=main#c7119679e60ad5a4f0beddb30d7117b267ee69d4" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#1cbf055c3d81e70d3d3ff9e7172b6f5156855f82" dependencies = [ "bytes", "cfg_aliases", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=main#c7119679e60ad5a4f0beddb30d7117b267ee69d4" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#1cbf055c3d81e70d3d3ff9e7172b6f5156855f82" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "git+https://github.com/n0-computer/noq?branch=main#c7119679e60ad5a4f0beddb30d7117b267ee69d4" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#1cbf055c3d81e70d3d3ff9e7172b6f5156855f82" dependencies = [ "cfg_aliases", "libc", @@ -3259,7 +3259,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4255,7 +4255,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4348,7 +4348,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4369,7 +4369,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4474,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4732,7 +4732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4957,7 +4957,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5857,7 +5857,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 75cc8ba5cf5..4d20f100098 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,6 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l unused-async = "warn" [patch.crates-io] -noq = { git = "https://github.com/n0-computer/noq", branch = "main" } -noq-udp = { git = "https://github.com/n0-computer/noq", branch = "main" } -noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" } +noq = { git = "https://github.com/n0-computer/noq", branch = "flub/log-network-paths" } +noq-udp = { git = "https://github.com/n0-computer/noq", branch = "flub/log-network-paths" } +noq-proto = { git = "https://github.com/n0-computer/noq", branch = "flub/log-network-paths" } From 0a85166f11a3ad185eeb14b0729979fd9d6cadff Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Mon, 4 May 2026 17:45:23 +0200 Subject: [PATCH 5/8] test new version --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a3a37e262c..3c80fb79e15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1372,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3184,7 +3184,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#1cbf055c3d81e70d3d3ff9e7172b6f5156855f82" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#91def2afd949d0fa92ed83a61c3927701bc20a89" dependencies = [ "bytes", "cfg_aliases", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#1cbf055c3d81e70d3d3ff9e7172b6f5156855f82" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#91def2afd949d0fa92ed83a61c3927701bc20a89" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#1cbf055c3d81e70d3d3ff9e7172b6f5156855f82" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#91def2afd949d0fa92ed83a61c3927701bc20a89" dependencies = [ "cfg_aliases", "libc", @@ -3259,7 +3259,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4255,7 +4255,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4348,7 +4348,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4369,7 +4369,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4474,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4732,7 +4732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4957,7 +4957,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5857,7 +5857,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] From a46a10440b7ccf4d6596c88f8a390cb1e4788778 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Mon, 4 May 2026 18:39:29 +0200 Subject: [PATCH 6/8] bump again --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c80fb79e15..18ddc616dcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1372,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3184,7 +3184,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#91def2afd949d0fa92ed83a61c3927701bc20a89" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#546615756d5b791b73c0bde861d27b29a572d561" dependencies = [ "bytes", "cfg_aliases", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#91def2afd949d0fa92ed83a61c3927701bc20a89" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#546615756d5b791b73c0bde861d27b29a572d561" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#91def2afd949d0fa92ed83a61c3927701bc20a89" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#546615756d5b791b73c0bde861d27b29a572d561" dependencies = [ "cfg_aliases", "libc", @@ -3259,7 +3259,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4255,7 +4255,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4348,7 +4348,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4369,7 +4369,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4474,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4732,7 +4732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4957,7 +4957,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5857,7 +5857,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] From 8bda0451ea90f2c91e7f9f24b89e288f15876c2c Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Tue, 5 May 2026 12:28:41 +0200 Subject: [PATCH 7/8] try new version --- Cargo.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18ddc616dcf..fb21810ee1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -1372,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3184,7 +3184,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#546615756d5b791b73c0bde861d27b29a572d561" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#0b4c02bc026947c782686c4f6f34540458f8b02c" dependencies = [ "bytes", "cfg_aliases", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#546615756d5b791b73c0bde861d27b29a572d561" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#0b4c02bc026947c782686c4f6f34540458f8b02c" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#546615756d5b791b73c0bde861d27b29a572d561" +source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#0b4c02bc026947c782686c4f6f34540458f8b02c" dependencies = [ "cfg_aliases", "libc", @@ -3259,7 +3259,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4255,7 +4255,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4348,7 +4348,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4369,7 +4369,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4474,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4732,7 +4732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -4957,7 +4957,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -5857,7 +5857,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] From 764325c40d9f2763d2f9a2fb171dc889b3ac2085 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Tue, 5 May 2026 13:39:20 +0200 Subject: [PATCH 8/8] Update to main again --- Cargo.lock | 28 ++++++++++++++-------------- Cargo.toml | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb21810ee1c..7ff952fdde0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,7 +131,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -142,7 +142,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1372,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -3184,7 +3184,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" [[package]] name = "noq" version = "0.18.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#0b4c02bc026947c782686c4f6f34540458f8b02c" +source = "git+https://github.com/n0-computer/noq?branch=main#9e1f1ad77911fb0c8795d171c26d326c481dce3d" dependencies = [ "bytes", "cfg_aliases", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "noq-proto" version = "0.17.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#0b4c02bc026947c782686c4f6f34540458f8b02c" +source = "git+https://github.com/n0-computer/noq?branch=main#9e1f1ad77911fb0c8795d171c26d326c481dce3d" dependencies = [ "aes-gcm", "aws-lc-rs", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "noq-udp" version = "0.10.0" -source = "git+https://github.com/n0-computer/noq?branch=flub%2Flog-network-paths#0b4c02bc026947c782686c4f6f34540458f8b02c" +source = "git+https://github.com/n0-computer/noq?branch=main#9e1f1ad77911fb0c8795d171c26d326c481dce3d" dependencies = [ "cfg_aliases", "libc", @@ -3259,7 +3259,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4255,7 +4255,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4348,7 +4348,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4369,7 +4369,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4474,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4732,7 +4732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4957,7 +4957,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5857,7 +5857,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 4d20f100098..75cc8ba5cf5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,6 @@ unexpected_cfgs = { level = "warn", check-cfg = ["cfg(iroh_docsrs)", "cfg(iroh_l unused-async = "warn" [patch.crates-io] -noq = { git = "https://github.com/n0-computer/noq", branch = "flub/log-network-paths" } -noq-udp = { git = "https://github.com/n0-computer/noq", branch = "flub/log-network-paths" } -noq-proto = { git = "https://github.com/n0-computer/noq", branch = "flub/log-network-paths" } +noq = { git = "https://github.com/n0-computer/noq", branch = "main" } +noq-udp = { git = "https://github.com/n0-computer/noq", branch = "main" } +noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" }