fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-24 23:31:33 +00:00
Code Issues Projects Releases Wiki Activity

fix(swarm): external address candidate only after address translation

Browse Source 
Pull-Request: #4158.
This commit is contained in:
Benno
2023-07-10 01:03:11 +02:00
committed by GitHub
parent b6b8844123
commit b4c7dfca63
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
swarm/src/lib.rs
View File

@ -1062,14 +1062,8 @@ where
self.pending_event = Some((peer_id, handler, event));
}
ToSwarm::NewExternalAddrCandidate(addr) => {
self.behaviour
.on_swarm_event(FromSwarm::NewExternalAddrCandidate(
NewExternalAddrCandidate { addr: &addr },
));
// Generate more candidates based on address translation.
// Apply address translation to the candidate address.
// For TCP without port-reuse, the observed address contains an ephemeral port which needs to be replaced by the port of a listen address.
let translated_addresses = {
let mut addrs: Vec<_> = self
.listened_addrs
@ -1083,11 +1077,20 @@ where
addrs.dedup();
addrs
};
for addr in translated_addresses {
// If address translation yielded nothing, broacast the original candidate address.
if translated_addresses.is_empty() {
self.behaviour
.on_swarm_event(FromSwarm::NewExternalAddrCandidate(
NewExternalAddrCandidate { addr: &addr },
));
} else {
for addr in translated_addresses {
self.behaviour
.on_swarm_event(FromSwarm::NewExternalAddrCandidate(
NewExternalAddrCandidate { addr: &addr },
));
}
}
}
ToSwarm::ExternalAddrConfirmed(addr) => {