Skip to content

feat: qlog support in iroh #3698

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

Open
wants to merge 9 commits into
base: feat-multipath
Choose a base branch
from
Open

feat: qlog support in iroh #3698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9981e2e
wip: initial qlog support in iroh
Frando Nov 23, 2025
21ff4a9
fixup feature flags
Frando Nov 23, 2025
83297ca
fixup
Frando Nov 23, 2025
10d494e
tests: add qlog util
Frando Nov 23, 2025
c0cda96
tests: improve qlog test util
Frando Nov 23, 2025
a348ec7
fix feature flags
Frando Nov 23, 2025
78a9b94
rename env var
Frando Nov 25, 2025
9961943
fixup feature flags
Frando Nov 25, 2025
ae0b82c
chore: fmt
Frando Nov 25, 2025
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
112 changes: 96 additions & 16 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ unused-async = "warn"


[patch.crates-io]
iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "protocol-simplification" }
iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "protocol-simplification" }
iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "protocol-simplification" }
iroh-quinn = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }
iroh-quinn-proto = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }
iroh-quinn-udp = { git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }

netwatch = { git = "https://github.com/n0-computer/net-tools", branch = "main" }

Expand Down
4 changes: 2 additions & 2 deletions iroh-relay/Cargo.toml
View file
Open in desktop
Copy link
Contributor

@flub flub Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes here should be removed by the time things are ready to be merged.

Original file line number Diff line number Diff line change
Expand Up @@ -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 = "protocol-simplification", default-features = false, features = ["rustls-ring"] }
quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "protocol-simplification" }
quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt", default-features = false, features = ["rustls-ring"] }
quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }
rand = "0.9.2"
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls",
Expand Down
9 changes: 5 additions & 4 deletions iroh/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "protocol-simplification", default-features = false, features = ["rustls-ring"] }
quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "protocol-simplification" }
quinn-udp = { package = "iroh-quinn-udp", git = "https://github.com/n0-computer/quinn", branch = "protocol-simplification" }
quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt", default-features = false, features = ["rustls-ring"] }
quinn-proto = { package = "iroh-quinn-proto", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }
quinn-udp = { package = "iroh-quinn-udp", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }
rand = "0.9.2"
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls",
Expand Down Expand Up @@ -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 = "protocol-simplification", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt", default-features = false, features = ["runtime-tokio", "rustls-ring"] }
tokio = { version = "1", features = [
"io-util",
"macros",
Expand Down Expand Up @@ -151,6 +151,7 @@ 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"]

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion iroh/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "protocol-simplification" }
quinn = { package = "iroh-quinn", git = "https://github.com/n0-computer/quinn", branch = "Frando/qlog-qnt" }
rand = "0.9.2"
rcgen = "0.14"
rustls = { version = "0.23.33", default-features = false, features = ["ring"] }
Expand Down
6 changes: 5 additions & 1 deletion iroh/src/endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ mod tests {
discovery::static_provider::StaticProvider,
endpoint::{ConnectOptions, Connection},
protocol::{AcceptError, ProtocolHandler, Router},
test_utils::{run_relay_server, run_relay_server_with},
test_utils::{QlogFileGroup, run_relay_server, run_relay_server_with},
};

const TEST_ALPN: &[u8] = b"n0/iroh/test";
Expand Down Expand Up @@ -1341,9 +1341,12 @@ mod tests {
let server_secret_key = SecretKey::generate(&mut rng);
let server_peer_id = server_secret_key.public();

let qlog = QlogFileGroup::from_env("endpoint_connect_close");

// 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")?)
.alpns(vec![TEST_ALPN.to_vec()])
.insecure_skip_relay_cert_verify(true)
.bind()
Expand Down Expand Up @@ -1384,6 +1387,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")?)
.bind()
.await?;
info!("client connecting");
Expand Down
5 changes: 4 additions & 1 deletion iroh/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Internal utilities to support testing.
use std::net::Ipv4Addr;

pub use dns_and_pkarr_servers::DnsPkarrServer;
use iroh_base::RelayUrl;
use iroh_relay::{
RelayConfig, RelayMap, RelayQuicConfig,
Expand All @@ -12,6 +11,10 @@ use iroh_relay::{
};
use tokio::sync::oneshot;

pub use self::{dns_and_pkarr_servers::DnsPkarrServer, qlog::QlogFileGroup};

mod qlog;

/// A drop guard to clean up test infrastructure.
///
/// After dropping the test infrastructure will asynchronously shutdown and release its
Expand Down
Loading
Loading