refactor: update quinn and add QlogFileFactory

Author: Frando

Cargo.lock

@@ -43,9 +43,9 @@ unused-async = "warn"
 
 
 [patch.crates-io]
-iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
-iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
-iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
+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 = "main" }
 

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 = "Frando/qlog-latest-multipath", default-features = false, features = ["rustls-ring"] }
-quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
+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-relay/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 = "Frando/qlog-latest-multipath", default-features = false, features = ["rustls-ring"] }
-quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
-quinn-udp = { package = "iroh-quinn-udp", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-latest-multipath" }
+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 = "Frando/qlog-latest-multipath", 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",

iroh/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 = "Frando/qlog-latest-multipath" }
+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"] }
@@ -33,3 +33,4 @@ 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/Cargo.toml

@@ -1,9 +1,13 @@
+#[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},
@@ -133,6 +137,11 @@ pub fn transport_config(max_streams: usize, initial_mtu: u16) -> QuinnTransportC
     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/iroh.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/bench/src/quinn.rs

@@ -48,6 +48,8 @@ use crate::{
 mod connection;
 pub(crate) mod hooks;
 pub mod presets;
+#[cfg(feature = "qlog")]
+mod qlog;
 
 pub use hooks::{AfterHandshakeOutcome, BeforeConnectOutcome, EndpointHooks};
 // Missing still: SendDatagram and ConnectionClose::frame_type's Type.
@@ -58,6 +60,8 @@ pub use quinn::{
     RetryError, SendDatagramError, SendStream, ServerConfig, StoppedError, StreamId,
     TransportConfig as QuinnTransportConfig, VarInt, WeakConnectionHandle, WriteError,
 };
+#[cfg(feature = "qlog")]
+pub use quinn::{QlogConfig, QlogFactory};
 pub use quinn_proto::{
     FrameStats, TransportError, TransportErrorCode, UdpStats, Written,
     congestion::{Controller, ControllerFactory},
@@ -73,6 +77,8 @@ pub use self::connection::{
     IncomingZeroRttConnection, OutgoingZeroRtt, OutgoingZeroRttConnection, RemoteEndpointIdError,
     ZeroRttStatus,
 };
+#[cfg(feature = "qlog")]
+pub use self::qlog::QlogFileFactory;
 pub use crate::magicsock::transports::TransportConfig;
 
 /// Builder for [`Endpoint`].
@@ -1371,7 +1377,7 @@ mod tests {
         // Wait for the endpoint to be started to make sure it's up before clients try to connect
         let ep = Endpoint::empty_builder(RelayMode::Custom(relay_map.clone()))
             .secret_key(server_secret_key)
-            .transport_config(qlog.server("server")?)
+            .transport_config(qlog.create("server")?)
             .alpns(vec![TEST_ALPN.to_vec()])
             .insecure_skip_relay_cert_verify(true)
             .bind()
@@ -1412,7 +1418,7 @@ mod tests {
                 let ep = Endpoint::empty_builder(RelayMode::Custom(relay_map))
                     .alpns(vec![TEST_ALPN.to_vec()])
                     .insecure_skip_relay_cert_verify(true)
-                    .transport_config(qlog.client("client")?)
+                    .transport_config(qlog.create("client")?)
                     .bind()
                     .await?;
                 info!("client connecting");
@@ -1695,7 +1701,7 @@ mod tests {
                 .alpns(vec![TEST_ALPN.to_vec()])
                 .insecure_skip_relay_cert_verify(true)
                 .relay_mode(RelayMode::Custom(relay_map))
-                .transport_config(qlog.client("client")?)
+                .transport_config(qlog.create("client")?)
                 .bind()
                 .await?;
             info!(me = %ep.id().fmt_short(), "client starting");
@@ -1731,7 +1737,7 @@ mod tests {
                 .secret_key(secret)
                 .alpns(vec![TEST_ALPN.to_vec()])
                 .insecure_skip_relay_cert_verify(true)
-                .transport_config(qlog.server("server")?)
+                .transport_config(qlog.create("server")?)
                 .relay_mode(RelayMode::Custom(relay_map))
                 .bind()
                 .await?;