Skip to content

fix(webrtc): Don't append /p2p to listen addresses #3154

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
Nov 23, 2022
Merged

fix(webrtc): Don't append /p2p to listen addresses #3154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
050c416
[transports/webrtc] remove local peer ID from reported addr
melekes Nov 22, 2022
9311511
Merge branch 'master' into anton/remove-p2p-prefix-from-webrtc-report…
thomaseizinger Nov 23, 2022
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
9 changes: 3 additions & 6 deletions transports/webrtc/src/tokio/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ impl ListenStream {
{
return Poll::Ready(TransportEvent::NewAddress {
listener_id: self.listener_id,
listen_addr: self
.listen_multiaddress(ip, self.config.id_keys.public().to_peer_id()),
listen_addr: self.listen_multiaddress(ip),
});
}
}
Expand All @@ -272,8 +271,7 @@ impl ListenStream {
{
return Poll::Ready(TransportEvent::AddressExpired {
listener_id: self.listener_id,
listen_addr: self
.listen_multiaddress(ip, self.config.id_keys.public().to_peer_id()),
listen_addr: self.listen_multiaddress(ip),
});
}
}
Expand All @@ -290,11 +288,10 @@ impl ListenStream {
}

/// Constructs a [`Multiaddr`] for the given IP address that represents our listen address.
fn listen_multiaddress(&self, ip: IpAddr, local_peer_id: PeerId) -> Multiaddr {
fn listen_multiaddress(&self, ip: IpAddr) -> Multiaddr {
let socket_addr = SocketAddr::new(ip, self.listen_addr.port());

socketaddr_to_multiaddr(&socket_addr, Some(self.config.fingerprint))
.with(Protocol::P2p(*local_peer_id.as_ref()))
}
}

Expand Down