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

bittorrent_udp: response_from_bytes: more improvements

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-09 21:15:25 +02:00
parent 928a82e4dc
commit f203250155
1 changed files with 44 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ use std::io;
use std::io::{Cursor, Write}; use std::io::{Cursor, Write};
use std::net::{IpAddr, Ipv6Addr, Ipv4Addr}; use std::net::{IpAddr, Ipv6Addr, Ipv4Addr};
use crate::types; use crate::types::{self, *};
#[inline] #[inline]
@ -82,36 +82,33 @@ pub fn response_to_bytes(
#[inline] #[inline]
pub fn response_from_bytes( pub fn response_from_bytes(
bytes: &[u8], bytes: &[u8],
ip_version: types::IpVersion, ip_version: IpVersion,
) -> Result<types::Response, io::Error> { ) -> Result<Response, io::Error> {
let mut cursor = Cursor::new(bytes);
let mut bytes = io::Cursor::new(bytes); let action = cursor.read_i32::<NetworkEndian>()?;
let transaction_id = cursor.read_i32::<NetworkEndian>()?;
let action = bytes.read_i32::<NetworkEndian>()?;
let transaction_id = bytes.read_i32::<NetworkEndian>()?;
match action { match action {
// Connect // Connect
0 => { 0 => {
let connection_id = bytes.read_i64::<NetworkEndian>()?; let connection_id = cursor.read_i64::<NetworkEndian>()?;
Ok(types::Response::Connect(types::ConnectResponse { Ok(Response::Connect(ConnectResponse {
connection_id: types::ConnectionId(connection_id), connection_id: ConnectionId(connection_id),
transaction_id: types::TransactionId(transaction_id) transaction_id: TransactionId(transaction_id)
})) }))
}, },
// Announce // Announce
1 => { 1 => {
let announce_interval = bytes.read_i32::<NetworkEndian>()?; let announce_interval = cursor.read_i32::<NetworkEndian>()?;
let leechers = bytes.read_i32::<NetworkEndian>()?; let leechers = cursor.read_i32::<NetworkEndian>()?;
let seeders = bytes.read_i32::<NetworkEndian>()?; let seeders = cursor.read_i32::<NetworkEndian>()?;
let position = bytes.position() as usize; let position = cursor.position() as usize;
let inner = bytes.into_inner(); let inner = cursor.into_inner();
let peers = if ip_version == types::IpVersion::IPv4 { let peers = if ip_version == IpVersion::IPv4 {
inner[position..].chunks_exact(6).map(|chunk| { inner[position..].chunks_exact(6).map(|chunk| {
let ip_address = IpAddr::V4( let ip_address = IpAddr::V4(
Ipv4Addr::new(chunk[0], chunk[1], chunk[2], chunk[3]) Ipv4Addr::new(chunk[0], chunk[1], chunk[2], chunk[3])
@ -119,9 +116,9 @@ pub fn response_from_bytes(
let port = (&chunk[4..]).read_u16::<NetworkEndian>().unwrap(); let port = (&chunk[4..]).read_u16::<NetworkEndian>().unwrap();
types::ResponsePeer { ResponsePeer {
ip_address, ip_address,
port: types::Port(port), port: Port(port),
} }
}).collect() }).collect()
} else { } else {
@ -141,60 +138,59 @@ pub fn response_from_bytes(
let port = cursor.read_u16::<NetworkEndian>().unwrap(); let port = cursor.read_u16::<NetworkEndian>().unwrap();
types::ResponsePeer { ResponsePeer {
ip_address, ip_address,
port: types::Port(port), port: Port(port),
} }
}).collect() }).collect()
}; };
Ok(types::Response::Announce(types::AnnounceResponse { Ok(Response::Announce(AnnounceResponse {
transaction_id: types::TransactionId(transaction_id), transaction_id: TransactionId(transaction_id),
announce_interval: types::AnnounceInterval(announce_interval), announce_interval: AnnounceInterval(announce_interval),
leechers: types::NumberOfPeers(leechers), leechers: NumberOfPeers(leechers),
seeders: types::NumberOfPeers(seeders), seeders: NumberOfPeers(seeders),
peers peers
})) }))
}, },
// Scrape // Scrape
2 => { 2 => {
let position = bytes.position() as usize; let position = cursor.position() as usize;
let inner = bytes.into_inner(); let inner = cursor.into_inner();
let stats = inner[position..].chunks_exact(12).map(|chunk| { let stats = inner[position..].chunks_exact(12).map(|chunk| {
let seeders = (&chunk[0..4]).read_i32::<NetworkEndian>().unwrap(); let mut cursor: Cursor<&[u8]> = Cursor::new(&chunk[..]);
let downloads = (&chunk[4..8]).read_i32::<NetworkEndian>().unwrap();
let leechers = (&chunk[8..12]).read_i32::<NetworkEndian>().unwrap();
types::TorrentScrapeStatistics { let seeders = cursor.read_i32::<NetworkEndian>().unwrap();
seeders: types::NumberOfPeers(seeders), let downloads = cursor.read_i32::<NetworkEndian>().unwrap();
completed: types::NumberOfDownloads(downloads), let leechers = cursor.read_i32::<NetworkEndian>().unwrap();
leechers:types::NumberOfPeers(leechers)
TorrentScrapeStatistics {
seeders: NumberOfPeers(seeders),
completed: NumberOfDownloads(downloads),
leechers:NumberOfPeers(leechers)
} }
}).collect(); }).collect();
Ok(types::Response::Scrape(types::ScrapeResponse { Ok(Response::Scrape(ScrapeResponse {
transaction_id: types::TransactionId(transaction_id), transaction_id: TransactionId(transaction_id),
torrent_stats: stats torrent_stats: stats
})) }))
}, },
// Error // Error
3 => { 3 => {
let position = bytes.position() as usize; let position = cursor.position() as usize;
let inner = bytes.into_inner(); let inner = cursor.into_inner();
Ok(types::Response::Error(types::ErrorResponse { Ok(Response::Error(ErrorResponse {
transaction_id: types::TransactionId(transaction_id), transaction_id: TransactionId(transaction_id),
message: String::from_utf8_lossy(&inner[position..]).into() message: String::from_utf8_lossy(&inner[position..]).into()
})) }))
}, },
_ => { _ => {
Ok(types::Response::Error(types::ErrorResponse { Ok(Response::Error(ErrorResponse {
transaction_id: types::TransactionId(transaction_id), transaction_id: TransactionId(transaction_id),
message: "Invalid action".to_string() message: "Invalid action".to_string()
})) }))
} }