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

refactor: use byteorder crate to enhance portability (to BE systems), and enhance code readability, avoiding manual byte manipulations

Browse source
This commit is contained in:
pasta 2024-10-02 19:09:32 -05:00
parent 60728f1699
commit eaba7955d7
No known key found for this signature in database
GPG key ID: E2F3D7916E722D38
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2596,6 +2596,7 @@ version = "5.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backoff", "backoff",
"byteorder",
"bytes", "bytes",
"chrono", "chrono",
"dashmap 6.1.0", "dashmap 6.1.0",

1
crates/dht/Cargo.toml
View file

@ -36,6 +36,7 @@ librqbit-core = { path = "../librqbit_core", default-features = false, version =
chrono = { version = "0.4.31", features = ["serde"] } chrono = { version = "0.4.31", features = ["serde"] }
tokio-util = "0.7.10" tokio-util = "0.7.10"
bytes = "1.7.1" bytes = "1.7.1"
byteorder = "1.5.0"
[dev-dependencies] [dev-dependencies]
tracing-subscriber = "0.3" tracing-subscriber = "0.3"

24
crates/dht/src/bprotocol.rs
View file

@ -5,6 +5,7 @@ use std::{
}; };
use bencode::{ByteBuf, ByteBufOwned}; use bencode::{ByteBuf, ByteBufOwned};
use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
use bytes::Bytes; use bytes::Bytes;
use clone_to_owned::CloneToOwned; use clone_to_owned::CloneToOwned;
use librqbit_core::hash_id::Id20; use librqbit_core::hash_id::Id20;
@ -196,9 +197,7 @@ impl Serialize for CompactNodeInfo {
let ip_octets = node.addr.ip().octets(); let ip_octets = node.addr.ip().octets();
let port = node.addr.port(); let port = node.addr.port();
buf.extend_from_slice(&ip_octets); buf.extend_from_slice(&ip_octets);
// BE encoding for port. buf.write_u16::<BigEndian>(port).unwrap();
buf.push((port >> 8) as u8);
buf.push((port & 0xff) as u8);
} }
serializer.serialize_bytes(&buf) serializer.serialize_bytes(&buf)
} }
@ -228,7 +227,7 @@ impl<'de> Deserialize<'de> for CompactNodeInfo {
let mut node_id = [0u8; 20]; let mut node_id = [0u8; 20];
node_id.copy_from_slice(&chunk[..20]); node_id.copy_from_slice(&chunk[..20]);
let ip = Ipv4Addr::new(chunk[20], chunk[21], chunk[22], chunk[23]); let ip = Ipv4Addr::new(chunk[20], chunk[21], chunk[22], chunk[23]);
let port = ((chunk[24] as u16) << 8) + chunk[25] as u16; let port = BigEndian::read_u16(&chunk[24..26]);
buf.push(Node { buf.push(Node {
id: Id20::new(node_id), id: Id20::new(node_id),
addr: SocketAddrV4::new(ip, port), addr: SocketAddrV4::new(ip, port),
@ -258,14 +257,10 @@ impl Serialize for CompactPeerInfo {
{ {
let octets = self.addr.ip().octets(); let octets = self.addr.ip().octets();
let port = self.addr.port(); let port = self.addr.port();
let buf = [ let mut buf = [0u8; 6];
octets[0], buf[..4].copy_from_slice(&octets);
octets[1], BigEndian::write_u16(&mut buf[4..], port);
octets[2],
octets[3],
(port >> 8) as u8,
(port & 0xff) as u8,
];
serializer.serialize_bytes(&buf) serializer.serialize_bytes(&buf)
} }
} }
@ -287,10 +282,11 @@ impl<'de> Deserialize<'de> for CompactPeerInfo {
E: serde::de::Error, E: serde::de::Error,
{ {
if v.len() != 6 { if v.len() != 6 {
return Err(E::invalid_length(6, &self)); return Err(E::invalid_length(v.len(), &self));
} }
let ip = Ipv4Addr::new(v[0], v[1], v[2], v[3]); let ip = Ipv4Addr::new(v[0], v[1], v[2], v[3]);
let port = ((v[4] as u16) << 8) + v[5] as u16; let port = BigEndian::read_u16(&v[4..6]); // Read the port number as big-endian from the last 2 bytes
Ok(CompactPeerInfo { Ok(CompactPeerInfo {
addr: SocketAddrV4::new(ip, port), addr: SocketAddrV4::new(ip, port),
}) })