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

Some cleanups for utpex

Browse source
This commit is contained in:
Igor Katson 2024-08-25 12:53:28 +01:00
parent 5e09525dd5
commit 90bfb85bcc
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
5 changed files with 56 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/librqbit/src/peer_connection.rs
View file

@ -251,7 +251,7 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
let my_extended = Message::Extended(ExtendedMessage::Handshake(my_extended));
trace!("sending extended handshake: {:?}", &my_extended);
my_extended
.serialize(&mut write_buf, &|| Default::default())
.serialize(&mut write_buf, &Default::default)
.unwrap();
with_timeout(rwtimeout, conn.write_all(&write_buf))
.await

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

@ -896,7 +896,7 @@ impl<'a> PeerConnectionHandler for &'a PeerHandler {
fn serialize_bitfield_message_to_buf(&self, buf: &mut Vec<u8>) -> anyhow::Result<usize> {
let g = self.state.lock_read("serialize_bitfield_message_to_buf");
let msg = Message::Bitfield(ByteBuf(g.get_chunks()?.get_have_pieces().as_bytes()));
let len = msg.serialize(buf, &|| Default::default())?;
let len = msg.serialize(buf, &Default::default)?;
trace!("sending: {:?}, length={}", &msg, len);
Ok(len)
}
@ -1679,15 +1679,11 @@ impl PeerHandler {
B: AsRef<[u8]> + std::fmt::Debug,
{
// TODO: this is just first attempt at pex - will need more sophistication on adding peers - BEP 40, check number of live, seen peers ...
if let Ok(peers) = msg.added_peers() {
peers.for_each(|peer| {
self.state
.add_peer_if_not_seen(peer.addr)
.inspect_err(|e| warn!("failed to add peer: {peer:?} due to: {e}"))
.ok();
});
} else {
warn!("received invalid pex message: {:?}", msg);
}
msg.added_peers().for_each(|peer| {
self.state
.add_peer_if_not_seen(peer.addr)
.inspect_err(|error| warn!(?peer, ?error, "failed to add peer"))
.ok();
});
}
}