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

nit: decrease branch nesting

Browse source
This commit is contained in:
Igor Katson 2024-12-04 10:21:10 +00:00
parent 9d71eb4872
commit ac775affef
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -824,11 +824,7 @@ impl TorrentStateLive {
self.peers self.peers
.states .states
.iter_mut() .iter_mut()
.filter_map(|mut p| { .filter_map(|mut p| p.value_mut().reconnect_not_needed_peer(&self.peers))
let known_addr = *p.key();
p.value_mut()
.reconnect_not_needed_peer(known_addr, &self.peers)
})
.map(|socket_addr| self.peer_queue_tx.send(socket_addr)) .map(|socket_addr| self.peer_queue_tx.send(socket_addr))
.take_while(|r| r.is_ok()) .take_while(|r| r.is_ok())
.last(); .last();

19
crates/librqbit/src/torrent_state/live/peer/mod.rs
View file

@ -56,22 +56,21 @@ impl Peer {
pub(crate) fn reconnect_not_needed_peer( pub(crate) fn reconnect_not_needed_peer(
&mut self, &mut self,
known_address: SocketAddr,
counters: &PeerStates, counters: &PeerStates,
) -> Option<SocketAddr> { ) -> Option<SocketAddr> {
if let PeerState::NotNeeded = self.get_state() { if let PeerState::NotNeeded = self.get_state() {
match self.outgoing_address { match self.outgoing_address {
None => None, None => None,
Some(socket_addr) if self.addr == socket_addr => {
self.set_state(PeerState::Queued, counters);
Some(socket_addr)
}
Some(socket_addr) => { Some(socket_addr) => {
if known_address == socket_addr { debug!(
self.set_state(PeerState::Queued, counters); peer = %self.addr,
} else { outgoing_addr = %socket_addr,
debug!( "peer will by retried on different address",
peer = known_address.to_string(), );
outgoing_addr = socket_addr.to_string(),
"peer will by retried on different address",
);
}
Some(socket_addr) Some(socket_addr)
} }
} }