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

PEX: Announce support and message definition

Browse source
This commit is contained in:
Ivan 2024-08-24 18:18:07 +02:00 • committed by Igor Katson
parent c758d0022d
commit bbc951733f
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
7 changed files with 213 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,10 +14,7 @@ use librqbit_core::{
};
use parking_lot::RwLock;
use peer_binary_protocol::{
extended::{
handshake::{ExtendedHandshake, YourIP},
ExtendedMessage,
},
extended::{handshake::ExtendedHandshake, ExtendedMessage},
serialize_piece_preamble, Handshake, Message, MessageOwned, PIECE_MESSAGE_DEFAULT_LEN,
};
use serde::{Deserialize, Serialize};
@ -248,14 +245,14 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
let supports_extended = handshake_supports_extended;
if supports_extended {
let your_ip = self.addr.ip();
let mut my_extended = ExtendedHandshake::new();
my_extended.yourip = Some(YourIP(your_ip));
self.handler
.update_my_extended_handshake(&mut my_extended)?;
let my_extended = Message::Extended(ExtendedMessage::Handshake(my_extended));
trace!("sending extended handshake: {:?}", &my_extended);
my_extended.serialize(&mut write_buf, &|| None).unwrap();
my_extended
.serialize(&mut write_buf, &|| Default::default())
.unwrap();
with_timeout(rwtimeout, conn.write_all(&write_buf))
.await
.context("error writing extended handshake")?;
@ -318,7 +315,8 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
extended_handshake_ref
.read()
.as_ref()
.and_then(|e| e.ut_metadata())
.map(|e| e.peer_extended_messages())
.unwrap_or_default()
})?,
WriterRequest::ReadChunkRequest(chunk) => {
#[allow(unused_mut)]
@ -397,7 +395,6 @@ impl<H: PeerConnectionHandler> PeerConnection<H> {
if let Message::Extended(ExtendedMessage::Handshake(h)) = &message {
*extended_handshake_ref.write() = Some(h.clone_to_owned(None));
self.handler.on_extended_handshake(h)?;
trace!("remembered extended handshake for future serializing");
} else {
self.handler
.on_received_message(message)