Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ikatson merged 1 commit into from
Oct 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/dht/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ librqbit-core = { path = "../librqbit_core", default-features = false, version =
chrono = { version = "0.4.31", features = ["serde"] }
tokio-util = "0.7.10"
bytes = "1.7.1"
byteorder = "1.5.0"

[dev-dependencies]
tracing-subscriber = "0.3"
24 changes: 10 additions & 14 deletions crates/dht/src/bprotocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::{
};

use bencode::{ByteBuf, ByteBufOwned};
use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
use bytes::Bytes;
use clone_to_owned::CloneToOwned;
use librqbit_core::hash_id::Id20;
Expand Down Expand Up @@ -196,9 +197,7 @@ impl Serialize for CompactNodeInfo {
let ip_octets = node.addr.ip().octets();
let port = node.addr.port();
buf.extend_from_slice(&ip_octets);
// BE encoding for port.
buf.push((port >> 8) as u8);
buf.push((port & 0xff) as u8);
buf.write_u16::<BigEndian>(port).unwrap();
}
serializer.serialize_bytes(&buf)
}
Expand Down Expand Up @@ -228,7 +227,7 @@ impl<'de> Deserialize<'de> for CompactNodeInfo {
let mut node_id = [0u8; 20];
node_id.copy_from_slice(&chunk[..20]);
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 {
id: Id20::new(node_id),
addr: SocketAddrV4::new(ip, port),
Expand Down Expand Up @@ -258,14 +257,10 @@ impl Serialize for CompactPeerInfo {
{
let octets = self.addr.ip().octets();
let port = self.addr.port();
let buf = [
octets[0],
octets[1],
octets[2],
octets[3],
(port >> 8) as u8,
(port & 0xff) as u8,
];
let mut buf = [0u8; 6];
buf[..4].copy_from_slice(&octets);
BigEndian::write_u16(&mut buf[4..], port);

serializer.serialize_bytes(&buf)
}
}
Expand All @@ -287,10 +282,11 @@ impl<'de> Deserialize<'de> for CompactPeerInfo {
E: serde::de::Error,
{
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 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 {
addr: SocketAddrV4::new(ip, port),
})
Expand Down