YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bittorrent_udp: request_from_bytes: improve scrape code

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-10 01:04:12 +02:00
parent acfd2a75d8
commit c5d746a42e
1 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,11 @@
use byteorder::{ReadBytesExt, WriteBytesExt, NetworkEndian}; use byteorder::{ReadBytesExt, WriteBytesExt, NetworkEndian};
use std::convert::TryInto;
use std::io; use std::io;
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use crate::types; use crate::types::{self, *};
use super::common::*; use super::common::*;
@ -134,34 +135,17 @@ pub fn request_from_bytes(
// Scrape // Scrape
2 => { 2 => {
let mut info_hashes = Vec::new(); let position = bytes.position() as usize;
let mut info_hash = [0; 20]; let inner = bytes.into_inner();
let mut i = 0; let info_hashes = (&inner[position..]).chunks_exact(20)
.take(max_scrape_torrents as usize)
.map(|chunk| InfoHash(chunk.try_into().unwrap()))
.collect();
loop { Ok(Request::Scrape(ScrapeRequest {
if i > max_scrape_torrents { connection_id: ConnectionId(connection_id),
return Ok(types::Request::Invalid(types::InvalidRequest { transaction_id: TransactionId(transaction_id),
transaction_id: types::TransactionId(transaction_id),
message: format!(
"Too many torrents. Maximum is {}",
max_scrape_torrents
)
}));
}
if bytes.read_exact(&mut info_hash).is_err(){
break
}
info_hashes.push(types::InfoHash(info_hash));
i += 1;
}
Ok(types::Request::Scrape(types::ScrapeRequest {
connection_id: types::ConnectionId(connection_id),
transaction_id: types::TransactionId(transaction_id),
info_hashes info_hashes
})) }))
} }