Skip to content

multipath: merge main #3674

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

Merged
merged 4 commits into from
Nov 18, 2025
Merged

multipath: merge main #3674

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25c2d4d
refactor: Prefer EndpointAddr::from_parts over EndpointAddr { ... } (…
rklaehn Nov 17, 2025
5809a56
feat: Instead of duplicating the entire connection API, have a type p…
rklaehn Nov 17, 2025
371d96b
Merge remote-tracking branch 'origin/main' into Frando/mp-merge-main
Frando Nov 18, 2025
b51cf0e
fix docs after merge
Frando Nov 18, 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
Prev Previous commit
fix docs after merge
  • Loading branch information
@Frando
Frando committed Nov 18, 2025
commit b51cf0e28b211506027f40cf48bb310c70dda5c9
8 changes: 4 additions & 4 deletions iroh/src/endpoint/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,11 +997,11 @@ impl Connection<IncomingZeroRtt> {

/// Waits until the full handshake occurs and then returns a [`Connection`].
///
/// This may fail with [`AuthenticationError::ConnectionError`], if there was
/// This may fail with [`ConnectingError::ConnectionError`], if there was
/// some general failure with the connection, such as a network timeout since
/// we accepted the connection.
///
/// This may fail with other [`AuthenticationError`]s, if the other side
/// This may fail with [`ConnectingError::HandshakeFailure`], if the other side
/// doesn't use the right TLS authentication, which usually every iroh endpoint
/// uses and requires.
///
Expand All @@ -1027,11 +1027,11 @@ impl Connection<OutgoingZeroRtt> {
/// the handshake will error and any data sent should be re-sent on a
/// new stream.
///
/// This may fail with [`AuthenticationError::ConnectionError`], if there was
/// This may fail with [`ConnectingError::ConnectionError`], if there was
/// some general failure with the connection, such as a network timeout since
/// we initiated the connection.
///
/// This may fail with other [`AuthenticationError`]s, if the other side
/// This may fail with [`ConnectingError::HandshakeFailure`], if the other side
/// doesn't use the right TLS authentication, which usually every iroh endpoint
/// uses and requires.
///
Expand Down
Loading