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

WIP: aquatic_udp: glommio: work on handling scrape requests

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-23 14:05:54 +02:00
parent d0be89388c
commit 08920fce5f
11 changed files with 183 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

19
aquatic_udp/src/lib/mio/common.rs
View file

@ -4,25 +4,6 @@ use std::sync::{atomic::AtomicUsize, Arc};
use crate::common::*;
pub enum ConnectedRequest {
Announce(AnnounceRequest),
Scrape(ScrapeRequest),
}
pub enum ConnectedResponse {
Announce(AnnounceResponse),
Scrape(ScrapeResponse),
}
impl Into<Response> for ConnectedResponse {
fn into(self) -> Response {
match self {
Self::Announce(response) => Response::Announce(response),
Self::Scrape(response) => Response::Scrape(response),
}
}
}
#[derive(Default)]
pub struct Statistics {
pub requests_received: AtomicUsize,

4
aquatic_udp/src/lib/mio/handlers/announce.rs
View file

@ -7,10 +7,10 @@ use rand::rngs::SmallRng;
use aquatic_common::convert_ipv4_mapped_ipv6;
use aquatic_udp_protocol::*;
use crate::common::announce::handle_announce_request;
use crate::common::handlers::handle_announce_request;
use crate::common::*;
use crate::config::Config;
use crate::mio::common::*;
use crate::common::handlers::*;
#[inline]
pub fn handle_announce_requests(

8
aquatic_udp/src/lib/mio/handlers/mod.rs
View file

@ -7,13 +7,11 @@ use rand::{rngs::SmallRng, SeedableRng};
use aquatic_udp_protocol::*;
use crate::config::Config;
use crate::common::handlers::*;
use crate::mio::common::*;
mod announce;
mod scrape;
use announce::handle_announce_requests;
use scrape::handle_scrape_requests;
pub fn run_request_worker(
state: State,
@ -76,7 +74,9 @@ pub fn run_request_worker(
&mut responses,
);
handle_scrape_requests(&mut torrents, scrape_requests.drain(..), &mut responses);
responses.extend(scrape_requests.drain(..).map(|(request, src)| {
(ConnectedResponse::Scrape(handle_scrape_request(&mut torrents, src, request)), src)
}));
}
for r in responses.drain(..) {

66
aquatic_udp/src/lib/mio/handlers/scrape.rs
View file

@ -1,66 +0,0 @@
use std::net::SocketAddr;
use std::vec::Drain;
use parking_lot::MutexGuard;
use aquatic_common::convert_ipv4_mapped_ipv6;
use aquatic_udp_protocol::*;
use crate::mio::common::*;
use crate::common::*;
#[inline]
pub fn handle_scrape_requests(
torrents: &mut MutexGuard<TorrentMaps>,
requests: Drain<(ScrapeRequest, SocketAddr)>,
responses: &mut Vec<(ConnectedResponse, SocketAddr)>,
) {
let empty_stats = create_torrent_scrape_statistics(0, 0);
responses.extend(requests.map(|(request, src)| {
let mut stats: Vec<TorrentScrapeStatistics> = Vec::with_capacity(request.info_hashes.len());
let peer_ip = convert_ipv4_mapped_ipv6(src.ip());
if peer_ip.is_ipv4() {
for info_hash in request.info_hashes.iter() {
if let Some(torrent_data) = torrents.ipv4.get(info_hash) {
stats.push(create_torrent_scrape_statistics(
torrent_data.num_seeders as i32,
torrent_data.num_leechers as i32,
));
} else {
stats.push(empty_stats);
}
}
} else {
for info_hash in request.info_hashes.iter() {
if let Some(torrent_data) = torrents.ipv6.get(info_hash) {
stats.push(create_torrent_scrape_statistics(
torrent_data.num_seeders as i32,
torrent_data.num_leechers as i32,
));
} else {
stats.push(empty_stats);
}
}
}
let response = ConnectedResponse::Scrape(ScrapeResponse {
transaction_id: request.transaction_id,
torrent_stats: stats,
});
(response, src)
}));
}
#[inline(always)]
fn create_torrent_scrape_statistics(seeders: i32, leechers: i32) -> TorrentScrapeStatistics {
TorrentScrapeStatistics {
seeders: NumberOfPeers(seeders),
completed: NumberOfDownloads(0), // No implementation planned
leechers: NumberOfPeers(leechers),
}
}

1
aquatic_udp/src/lib/mio/network.rs
View file

@ -18,6 +18,7 @@ use aquatic_udp_protocol::{IpVersion, Request, Response};
use crate::common::network::ConnectionMap;
use crate::common::*;
use crate::common::handlers::*;
use crate::config::Config;
use super::common::*;