YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 18:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

benchmark byte conversion as well; bittorrent_udp: use buffers

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-07 19:49:29 +02:00
parent 51590a3d6c
commit a99688a5a2
11 changed files with 231 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bittorrent_udp/src/converters/requests.rs
View file

@ -1,7 +1,7 @@
use byteorder::{ReadBytesExt, WriteBytesExt, NetworkEndian};
use std::io;
use std::io::Read;
use std::io::{Read, Write};
use std::net::Ipv4Addr;
use crate::types;
@ -12,9 +12,10 @@ use super::common::*;
const MAGIC_NUMBER: i64 = 4_497_486_125_440;
pub fn request_to_bytes(request: &types::Request) -> Vec<u8> {
let mut bytes = Vec::new();
pub fn request_to_bytes(
bytes: &mut impl Write,
request: types::Request
){
match request {
types::Request::Connect(r) => {
bytes.write_i64::<NetworkEndian>(MAGIC_NUMBER).unwrap();
@ -27,8 +28,8 @@ pub fn request_to_bytes(request: &types::Request) -> Vec<u8> {
bytes.write_i32::<NetworkEndian>(1).unwrap();
bytes.write_i32::<NetworkEndian>(r.transaction_id.0).unwrap();
bytes.extend(r.info_hash.0.iter());
bytes.extend(r.peer_id.0.iter());
bytes.write_all(&r.info_hash.0).unwrap();
bytes.write_all(&r.peer_id.0).unwrap();
bytes.write_i64::<NetworkEndian>(r.bytes_downloaded.0).unwrap();
bytes.write_i64::<NetworkEndian>(r.bytes_left.0).unwrap();
@ -36,7 +37,7 @@ pub fn request_to_bytes(request: &types::Request) -> Vec<u8> {
bytes.write_i32::<NetworkEndian>(event_to_i32(r.event)).unwrap();
bytes.extend(&r.ip_address.map_or([0; 4], |ip| ip.octets()));
bytes.write_all(&r.ip_address.map_or([0; 4], |ip| ip.octets())).unwrap();
bytes.write_u32::<NetworkEndian>(0).unwrap(); // IP
bytes.write_u32::<NetworkEndian>(r.key.0).unwrap();
@ -50,14 +51,12 @@ pub fn request_to_bytes(request: &types::Request) -> Vec<u8> {
bytes.write_i32::<NetworkEndian>(r.transaction_id.0).unwrap();
for info_hash in &r.info_hashes {
bytes.extend(info_hash.0.iter());
bytes.write_all(&info_hash.0).unwrap();
}
}
_ => () // Invalid requests should never happen
}
bytes
}
@ -65,7 +64,6 @@ pub fn request_from_bytes(
bytes: &[u8],
max_scrape_torrents: u8,
) -> Result<types::Request,io::Error> {
let mut bytes = io::Cursor::new(bytes);
let connection_id = bytes.read_i64::<NetworkEndian>()?;

23
bittorrent_udp/src/converters/responses.rs
View file

@ -1,18 +1,17 @@
use byteorder::{ReadBytesExt, WriteBytesExt, NetworkEndian};
use std::io;
use std::io::Read;
use std::io::{Read, Write};
use std::net::{IpAddr, Ipv6Addr, Ipv4Addr};
use crate::types;
pub fn response_to_bytes(
response: &types::Response,
bytes: &mut impl Write,
response: types::Response,
ip_version: types::IpVersion
) -> Vec<u8> {
let mut bytes = Vec::new();
){
match response {
types::Response::Connect(r) => {
bytes.write_i32::<NetworkEndian>(0).unwrap();
@ -29,19 +28,21 @@ pub fn response_to_bytes(
// Write peer IPs and ports. Silently ignore peers with wrong
// IP version
for peer in r.peers.iter(){
for peer in r.peers {
let mut correct = false;
match peer.ip_address {
IpAddr::V4(ip) => {
if let types::IpVersion::IPv4 = ip_version {
bytes.extend(&ip.octets());
bytes.write_all(&ip.octets()).unwrap();
correct = true;
}
},
IpAddr::V6(ip) => {
if let types::IpVersion::IPv6 = ip_version {
bytes.extend(&ip.octets());
bytes.write_all(&ip.octets()).unwrap();
correct = true;
}
}
@ -57,7 +58,7 @@ pub fn response_to_bytes(
bytes.write_i32::<NetworkEndian>(2).unwrap();
bytes.write_i32::<NetworkEndian>(r.transaction_id.0).unwrap();
for torrent_stat in r.torrent_stats.iter(){
for torrent_stat in r.torrent_stats {
bytes.write_i32::<NetworkEndian>(torrent_stat.seeders.0)
.unwrap();
bytes.write_i32::<NetworkEndian>(torrent_stat.completed.0)
@ -71,11 +72,9 @@ pub fn response_to_bytes(
bytes.write_i32::<NetworkEndian>(3).unwrap();
bytes.write_i32::<NetworkEndian>(r.transaction_id.0).unwrap();
bytes.extend(r.message.as_bytes().iter());
bytes.write_all(r.message.as_bytes()).unwrap();
},
}
bytes
}