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

Sending your ip as part of peer_connection.rs

Browse source
This commit is contained in:
Igor Katson 2024-08-31 11:35:26 +01:00
parent e9acbaa9dc
commit 3f014ee80a
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/librqbit/src/read_buf.rs
View file

@ -56,14 +56,18 @@ impl ReadBuf {
if self.filled == 0 {
anyhow::bail!("peer disconnected while reading handshake");
}
let (h, size) = Handshake::deserialize(&self.buf[..self.filled])
.map_err(|e| anyhow::anyhow!("error deserializing handshake: {:?} hadshake data {:?}", e, &self.buf[..self.filled.min(19)]))?;
let (h, size) = Handshake::deserialize(&self.buf[..self.filled]).map_err(|e| {
anyhow::anyhow!(
"error deserializing handshake: {:?} hadshake data {:?}",
e,
&self.buf[..self.filled.min(19)]
)
})?;
self.processed = size;
Ok(h)
}
// Read a message into the buffer, try to deserialize it and call the callback on it.
// We can't return the message because of a borrow checker issue.
pub async fn read_message(
&mut self,
mut conn: impl AsyncReadExt + Unpin,
@ -77,13 +81,15 @@ impl ReadBuf {
self.processed += size;
// Rust's borrow checker can't do this early return so resort to unsafe.
#[allow(clippy::missing_transmute_annotations)]
let msg = unsafe { std::mem::transmute(msg) };
// This erases the lifetime so that it's happy.
let msg: MessageBorrowed<'_> =
unsafe { std::mem::transmute(msg as MessageBorrowed<'_>) };
return Ok(msg);
}
Err(e) => return Err(e.into()),
};
self.prepare_for_read(need_additional_bytes);
debug_assert!(!self.buf[self.filled..].is_empty());
let size = with_timeout(timeout, conn.read(&mut self.buf[self.filled..]))
.await
.context("error reading from peer")?;