refactor: upgrade to quinn-iroh version with latest qlog & multipath

Cargo.toml

@@ -43,12 +43,11 @@ unused-async = "warn"
 
 
 [patch.crates-io]
-iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
-iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
-iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
+iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
+iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
+iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
 
-netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "quinn-udp-git" }
-portmapper = { git = "https://github.com/n0-computer/net-tools", branch = "quinn-udp-git" }
+netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "main" }
 
 # iroh-quinn = { path = "../quinn/quinn" }
 # iroh-quinn-proto = { path = "../quinn/quinn-proto" }

iroh-relay/Cargo.toml

@@ -42,8 +42,8 @@ postcard = { version = "1", default-features = false, features = [
     "use-std",
     "experimental-derive",
 ] }
-quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "main-iroh", default-features = false, features = ["rustls-ring"] }
-quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
+quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers", default-features = false, features = ["rustls-ring"] }
+quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
 rand = "0.9.2"
 reqwest = { version = "0.12", default-features = false, features = [
     "rustls-tls",

iroh/Cargo.toml

@@ -35,9 +35,9 @@ n0-watcher = "0.6"
 netwatch = { version = "0.12" }
 pin-project = "1"
 pkarr = { version = "5", default-features = false, features = ["relays"] }
-quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "main-iroh", default-features = false, features = ["rustls-ring"] }
-quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
-quinn-udp = { package = "iroh-quinn-udp", git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
+quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers", default-features = false, features = ["rustls-ring"] }
+quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
+quinn-udp = { package = "iroh-quinn-udp", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
 rand = "0.9.2"
 reqwest = { version = "0.12", default-features = false, features = [
     "rustls-tls",
@@ -82,7 +82,7 @@ hickory-resolver = "0.25.1"
 igd-next = { version = "0.16", features = ["aio_tokio"] }
 netdev = { version = "0.39.0" }
 portmapper = { version = "0.12", default-features = false }
-quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "main-iroh", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
+quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
 tokio = { version = "1", features = [
     "io-util",
     "macros",
@@ -146,12 +146,14 @@ wasm-bindgen-test = "0.3"
 cfg_aliases = { version = "0.2.1" }
 
 [features]
-default = ["metrics"]
+default = ["metrics", "fast-apple-datapath"]
 metrics = ["iroh-metrics/metrics", "iroh-relay/metrics", "portmapper/metrics"]
 test-utils = ["iroh-relay/test-utils", "iroh-relay/server", "dep:axum"]
 discovery-local-network = ["dep:swarm-discovery"]
 discovery-pkarr-dht = ["pkarr/dht"]
 qlog = ["quinn/qlog"]
+# Use private Apple APIs to send multiple packets in a single syscall.
+fast-apple-datapath = ["quinn/fast-apple-datapath"]
 
 [package.metadata.docs.rs]
 all-features = true

iroh/bench/Cargo.toml

@@ -12,7 +12,7 @@ iroh = { path = "..", default-features = false }
 iroh-metrics = { version = "0.37", optional = true }
 n0-future = "0.3.0"
 n0-error = "0.1.0"
-quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "main-iroh" }
+quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-timers" }
 rand = "0.9.2"
 rcgen = "0.14"
 rustls = { version = "0.23.33", default-features = false, features = ["ring"] }
@@ -28,6 +28,9 @@ tracing-subscriber = { version = "0.3.0", default-features = false, features = [
 ] }
 
 [features]
-default = ["metrics"]
+default = ["metrics", "fast-apple-datapath"]
 metrics = ["iroh/metrics", "iroh-metrics"]
 local-relay = ["iroh/test-utils"]
+# Use private Apple APIs to send multiple packets in a single syscall.
+fast-apple-datapath = ["iroh/fast-apple-datapath", "quinn/fast-apple-datapath"]
+qlog = ["iroh/qlog", "quinn/qlog"]

iroh/bench/src/iroh.rs

@@ -1,12 +1,16 @@
+#[cfg(feature = "qlog")]
+use std::sync::Arc;
 use std::{
     net::SocketAddr,
     time::{Duration, Instant},
 };
 
 use bytes::Bytes;
+#[cfg(feature = "qlog")]
+use iroh::endpoint::QlogFileFactory;
 use iroh::{
     Endpoint, EndpointAddr, RelayMode, RelayUrl,
-    endpoint::{Connection, ConnectionError, QuinnTransportConfig, RecvStream, SendStream},
+    endpoint::{Connection, ConnectionError, QuicTransportConfig, RecvStream, SendStream},
 };
 use n0_error::{Result, StackResultExt, StdResultExt};
 use tracing::{trace, warn};
@@ -122,17 +126,22 @@ pub async fn connect_client(
     Ok((endpoint, connection))
 }
 
-pub fn transport_config(max_streams: usize, initial_mtu: u16) -> QuinnTransportConfig {
+pub fn transport_config(max_streams: usize, initial_mtu: u16) -> QuicTransportConfig {
     // High stream windows are chosen because the amount of concurrent streams
     // is configurable as a parameter.
-    let mut config = QuinnTransportConfig::default();
+    let mut config = QuicTransportConfig::default();
     config.max_concurrent_uni_streams(max_streams.try_into().unwrap());
     config.initial_mtu(initial_mtu);
 
     let mut acks = quinn::AckFrequencyConfig::default();
     acks.ack_eliciting_threshold(10u32.into());
     config.ack_frequency_config(Some(acks));
 
+    #[cfg(feature = "qlog")]
+    config.qlog_factory(Arc::new(
+        QlogFileFactory::from_env().with_prefix(format!("bench-iroh")),
+    ));
+
     config
 }
 

iroh/bench/src/quinn.rs

@@ -5,6 +5,8 @@ use std::{
 };
 
 use bytes::Bytes;
+#[cfg(feature = "qlog")]
+use iroh::endpoint::QlogFileFactory;
 use n0_error::{Result, StdResultExt};
 use quinn::{
     Connection, Endpoint, RecvStream, SendStream, TransportConfig, crypto::rustls::QuicClientConfig,
@@ -116,6 +118,11 @@ pub fn transport_config(max_streams: usize, initial_mtu: u16) -> TransportConfig
     acks.ack_eliciting_threshold(10u32.into());
     config.ack_frequency_config(Some(acks));
 
+    #[cfg(feature = "qlog")]
+    config.qlog_factory(Arc::new(
+        QlogFileFactory::from_env().with_prefix(format!("bench-quinn")),
+    ));
+
     config
 }
 

iroh/src/discovery.rs

@@ -502,13 +502,15 @@ mod tests {
     use iroh_base::{EndpointAddr, SecretKey, TransportAddr};
     use n0_error::{AnyError as Error, Result, StackResultExt};
     use n0_future::{StreamExt, time};
-    use quinn::{IdleTimeout, TransportConfig};
     use rand::{CryptoRng, Rng, SeedableRng};
     use tokio_util::task::AbortOnDropHandle;
     use tracing_test::traced_test;
 
     use super::*;
-    use crate::{Endpoint, RelayMode, endpoint::ConnectOptions};
+    use crate::{
+        Endpoint, RelayMode,
+        endpoint::{ConnectOptions, IdleTimeout, QuicTransportConfig},
+    };
 
     type InfoStore = HashMap<EndpointId, (EndpointData, u64)>;
 
@@ -725,10 +727,10 @@ mod tests {
         .await;
 
         // 10x faster test via a 3s idle timeout instead of the 30s default
-        let mut config = TransportConfig::default();
-        config.keep_alive_interval(Some(Duration::from_secs(1)));
+        let mut config = QuicTransportConfig::default();
+        config.keep_alive_interval(Duration::from_secs(1));
         config.max_idle_timeout(Some(IdleTimeout::try_from(Duration::from_secs(3)).unwrap()));
-        let opts = ConnectOptions::new().with_transport_config(Arc::new(config));
+        let opts = ConnectOptions::new().with_transport_config(config);
 
         let res = ep2
             .connect_with_opts(ep1.id(), TEST_ALPN, opts)