Skip to content

fix(quic): Identify /quic as QUIC address #3288

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
mergify merged 2 commits into from
Jan 6, 2023
Merged

fix(quic): Identify /quic as QUIC address #3288

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f0577e
fix(quic): Identify `/quic` as QUIC address
mxinden Dec 28, 2022
bcc63ab
Merge branch 'master' into quic-draft-29-address-translation
mergify[bot] Jan 6, 2023
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
12 changes: 9 additions & 3 deletions transports/quic/src/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ impl<P: Provider> Transport for GenTransport<P> {
}

fn address_translation(&self, listen: &Multiaddr, observed: &Multiaddr) -> Option<Multiaddr> {
if !is_quic_addr(listen) || !is_quic_addr(observed) {
if !is_quic_addr(listen, self.support_draft_29)
|| !is_quic_addr(observed, self.support_draft_29)
{
return None;
}
Some(observed.clone())
Expand Down Expand Up @@ -597,7 +599,7 @@ fn multiaddr_to_socketaddr(
}

/// Whether an [`Multiaddr`] is a valid for the QUIC transport.
fn is_quic_addr(addr: &Multiaddr) -> bool {
fn is_quic_addr(addr: &Multiaddr, support_draft_29: bool) -> bool {
use Protocol::*;
let mut iter = addr.iter();
let first = match iter.next() {
Expand All @@ -617,7 +619,11 @@ fn is_quic_addr(addr: &Multiaddr) -> bool {

matches!(first, Ip4(_) | Ip6(_) | Dns(_) | Dns4(_) | Dns6(_))
&& matches!(second, Udp(_))
&& matches!(third, QuicV1)
&& if support_draft_29 {
matches!(third, QuicV1 | Quic)
} else {
matches!(third, QuicV1)
}
&& matches!(fourth, Some(P2p(_)) | None)
&& matches!(fifth, None)
}
Expand Down