leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set outgoing IP address for incomming peers after Ext. handshake

Browse source
This commit is contained in:
Ivan 2024-09-26 18:11:05 +02:00
parent a483bc6586
commit 4bd757173d
2 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/librqbit/src/torrent_state/live/mod.rs
View file

@ -784,10 +784,11 @@ impl TorrentStateLive {
pub(crate) fn reconnect_all_not_needed_peers(&self) {
for mut pe in self.peers.states.iter_mut() {
if pe.state.not_needed_to_queued(&self.peer_stats())
&& self.peer_queue_tx.send(*pe.key()).is_err()
{
return;
if pe.state.not_needed_to_queued(&self.peer_stats()) {
let retry_addr = pe.value().outgoing_address.unwrap_or_else(|| *pe.key());
if self.peer_queue_tx.send(retry_addr).is_err() {
return;
}
}
}
}
@ -922,12 +923,15 @@ impl<'a> PeerConnectionHandler for &'a PeerHandler {
if let Some(port) = hs.p {
// Lets update outgoing Socket address for incoming connection
if self.incoming {
if let Ok(port) = <u32 as TryInto<u16>>::try_into(port) {
let outgoing_addr = SocketAddr::new(self.addr.ip(), port);
self.state.peers.with_peer_mut(self.addr, "update outgoing addr",
|peer| peer.outgoing_address=Some(outgoing_addr));
if let Ok(port) = hs.port() {
let peer_ip = hs.ip_addr().unwrap_or(self.addr.ip());
let outgoing_addr = SocketAddr::new(peer_ip, port);
self.state
.peers
.with_peer_mut(self.addr, "update outgoing addr", |peer| {
peer.outgoing_address = Some(outgoing_addr)
});
}
}
}
Ok(())

22
crates/peer_binary_protocol/src/extended/handshake.rs
View file

@ -69,6 +69,28 @@ where
ut_pex: self.ut_pex(),
}
}
pub fn ip_addr(&self) -> Option<IpAddr> {
if let Some(b) = self.ipv4 {
let b = b.as_slice();
if b.len() == 4 {
let ip_bytes: &[u8; 4] = b[0..4].try_into().unwrap(); // Safe to unwrap as we check slice length
return Some(IpAddr::from(*ip_bytes));
}
}
if let Some(b) = self.ipv6 {
let b = b.as_slice();
if b.len() == 16 {
let ip_bytes: &[u8; 16] = b[0..16].try_into().unwrap(); // Safe to unwrap as we check slice length
return Some(IpAddr::from(*ip_bytes));
}
}
None
}
pub fn port(&self) -> Option<u16> {
self.p.and_then(|p| u16::try_from(p).ok())
}
}
impl<ByteBuf> CloneToOwned for ExtendedHandshake<ByteBuf>