Merge remote-tracking branch 'origin/main' into feat-multipath

Author: Frando

CHANGELOG.md

@@ -2,7 +2,13 @@
 
 All notable changes to iroh will be documented in this file.
 
-## [0.95.0](https://github.com/n0-computer/iroh/compare/v0.94.1..0.95.0) - 2025-11-04
+## [0.95.1](https://github.com/n0-computer/iroh/compare/v0.95.0..0.95.1) - 2025-11-05
+
+### 🚜 Refactor
+
+- [**breaking**] Make `OutgoingZeroRttConnection` implement `Clone` ([#3607](https://github.com/n0-computer/iroh/issues/3607)) - ([721bd2d](https://github.com/n0-computer/iroh/commit/721bd2d9cf386807a750a7d5abe42d8aed5aacc6))
+
+## [0.95.0](https://github.com/n0-computer/iroh/compare/v0.94.1..v0.95.0) - 2025-11-04
 
 ### ⛰️  Features
 
@@ -28,6 +34,7 @@ All notable changes to iroh will be documented in this file.
 
 - *(iroh)* Update wasm-bindgen version to fix CI ([#3589](https://github.com/n0-computer/iroh/issues/3589)) - ([0f4c15c](https://github.com/n0-computer/iroh/commit/0f4c15cbcad1fac13b3b60aba825d975a8843e46))
 - [**breaking**] Update redb to version 3 ([#3562](https://github.com/n0-computer/iroh/issues/3562)) - ([b057b91](https://github.com/n0-computer/iroh/commit/b057b91b26162b6e6aadac48eb82e6567acf7ef3))
+- Release - ([238925a](https://github.com/n0-computer/iroh/commit/238925a339b3747dd4e4cb207d6dd3e82aae4b5c))
 
 ## [0.94.1](https://github.com/n0-computer/iroh/compare/v0.94.0..v0.94.1) - 2025-10-22
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-base"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2024"
 readme = "README.md"
 description = "base type and utilities for Iroh"

iroh-base/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-dns-server"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2024"
 description = "A pkarr relay and DNS server"
 license = "MIT OR Apache-2.0"

iroh-dns-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-relay"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2024"
 readme = "README.md"
 description = "Iroh's relay server and client"
@@ -31,7 +31,7 @@ http = "1"
 http-body-util = "0.1.0"
 hyper = { version = "1", features = ["server", "client", "http1"] }
 hyper-util = "0.1.1"
-iroh-base = { version = "0.95.0", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
+iroh-base = { version = "0.95.1", path = "../iroh-base", default-features = false, features = ["key", "relay"] }
 iroh-metrics = { version = "0.37", default-features = false }
 n0-future = "0.3.0"
 num_enum = "0.7"

iroh-relay/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2024"
 readme = "README.md"
 description = "p2p quic connections dialed by public key"
@@ -36,7 +36,7 @@ derive_more = { version = "2.0.1", features = [
 ] }
 ed25519-dalek = { version = "3.0.0-pre.1", features = ["serde", "rand_core", "zeroize", "pkcs8", "pem"] }
 http = "1"
-iroh-base = { version = "0.95.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
+iroh-base = { version = "0.95.1", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
 iroh-relay = { version = "0.95", path = "../iroh-relay", default-features = false }
 n0-future = "0.3.0"
 n0-error = "0.1.0"
@@ -142,7 +142,7 @@ tracing-subscriber = { version = "0.3", features = [
 ] }
 indicatif = { version = "0.18", features = ["tokio"] }
 parse-size = { version = "1.1.0", features = ['std'] }
-iroh-base = { version = "0.95.0", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
+iroh-base = { version = "0.95.1", default-features = false, features = ["key", "relay"], path = "../iroh-base" }
 
 # wasm-in-browser test/dev dependencies
 [target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dev-dependencies]

iroh/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-bench"
-version = "0.95.0"
+version = "0.95.1"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 publish = false

iroh/bench/Cargo.toml

@@ -27,6 +27,7 @@ use std::{
 };
 
 use ed25519_dalek::{VerifyingKey, pkcs8::DecodePublicKey};
+use futures_util::{FutureExt, future::Shared};
 use iroh_base::EndpointId;
 use n0_error::{e, stack_error};
 use n0_future::time::Duration;
@@ -431,7 +432,8 @@ impl Connecting {
                     accepted: ZeroRttAccepted {
                         inner: zrtt_accepted,
                         _discovery_drop_guard: self._discovery_drop_guard,
-                    },
+                    }
+                    .shared(),
                 })
             }
             Err(inner) => Err(Self {
@@ -558,6 +560,7 @@ impl Future for Accepting {
         }
     }
 }
+
 /// Future that completes when a connection is fully established.
 ///
 /// For clients, the resulting value indicates if 0-RTT was accepted. For servers, the resulting
@@ -594,14 +597,14 @@ impl Future for ZeroRttAccepted {
 ///
 /// Look at the [`OutgoingZeroRttConnection::handshake_completed`] method for
 /// more details.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct OutgoingZeroRttConnection {
     inner: quinn::Connection,
-    accepted: ZeroRttAccepted,
+    accepted: Shared<ZeroRttAccepted>,
     ep: Endpoint,
 }
 
-/// Returned from a `OutgoingZeroRttConnection::handshake_complete` method.
+/// Returned from [`OutgoingZeroRttConnection::handshake_completed`].
 #[derive(Debug)]
 pub enum ZeroRttStatus {
     /// If the 0-RTT data was accepted, you can continue to use any streams
@@ -634,8 +637,8 @@ impl OutgoingZeroRttConnection {
     /// Thus, those errors should only occur if someone connects to you with a
     /// modified iroh endpoint or with a plain QUIC client.
     pub async fn handshake_completed(self) -> Result<ZeroRttStatus, AuthenticationError> {
-        let accepted = self.accepted.await;
-        let conn = conn_from_quinn_conn(self.inner, &self.ep)?;
+        let accepted = self.accepted.clone().await;
+        let conn = conn_from_quinn_conn(self.inner.clone(), &self.ep)?;
 
         Ok(match accepted {
             true => ZeroRttStatus::Accepted(conn),

iroh/src/endpoint/connection.rs

@@ -159,7 +159,21 @@ pub trait ProtocolHandler: Send + Sync + std::fmt::Debug + 'static {
     ///
     /// Can be implemented as `async fn on_accepting(&self, accepting: Accepting) -> Result<Connection>`.
     ///
-    /// This enables accepting 0-RTT data from clients, among other things.
+    /// Typically, this method is used as an early interception point to accept
+    /// or reject a connection.
+    ///
+    /// However, this method can also be used to implement the accept side of a
+    /// 0-RTT connection.
+    ///
+    /// ## 0-RTT
+    ///
+    /// `ProtocolHandler::on_accepting` allows you to take over the connection
+    /// state machine early in the handshake processes, by calling [`Accepting::into_0rtt`].
+    ///
+    /// When working with 0-RTT, you may want to implement all of your protocol
+    /// logic in `on_accepting`. This is fine because `on_accepting` can handle
+    /// long-running processes. In this case, the [`ProtocolHandler::accept`] method
+    /// can simply return `Ok(())`.
     fn on_accepting(
         &self,
         accepting: Accepting,