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

aquatic_udp: start work on announce handler in glommio version

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-18 23:17:42 +02:00
parent f2b157a149
commit 80754ab4ad
7 changed files with 244 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

49
aquatic_udp/src/lib/glommio/handlers.rs Normal file
View file

@ -0,0 +1,49 @@
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use glommio::prelude::*;
use glommio::channels::shared_channel::{SharedReceiver, SharedSender};
use rand::SeedableRng;
use rand::prelude::SmallRng;
use crate::config::Config;
use crate::common::*;
use crate::common::announce::handle_announce_request;
pub fn run_request_worker(
config: Config,
request_receiver: SharedReceiver<(AnnounceRequest, SocketAddr)>,
response_sender: SharedSender<(AnnounceResponse, SocketAddr)>,
) {
LocalExecutorBuilder::default()
.spawn(|| async move {
let request_receiver = request_receiver.connect().await;
let response_sender = response_sender.connect().await;
let mut rng = SmallRng::from_entropy();
let mut torrents_ipv4 = TorrentMap::<Ipv4Addr>::default();
let mut torrents_ipv6 = TorrentMap::<Ipv6Addr>::default();
// Needs to be updated periodically
let peer_valid_until = ValidUntil::new(config.cleaning.max_peer_age);
while let Some((request, addr)) = request_receiver.recv().await {
let response = match addr.ip() {
IpAddr::V4(ip) => {
handle_announce_request(&config, &mut rng, &mut torrents_ipv4, request, ip, peer_valid_until)
},
IpAddr::V6(ip) => {
handle_announce_request(&config, &mut rng, &mut torrents_ipv6, request, ip, peer_valid_until)
},
};
if let Err(err) = response_sender.try_send((response, addr)) {
::log::warn!("response_sender.try_send: {:?}", err);
}
}
})
.expect("failed to spawn local executor")
.join()
.unwrap();
}

1
aquatic_udp/src/lib/glommio/mod.rs
View file

@ -1 +1,2 @@
pub mod handlers;
pub mod network;

21
aquatic_udp/src/lib/glommio/network.rs
View file

@ -27,8 +27,8 @@ use crate::config::Config;
pub fn run_socket_worker(
state: State,
config: Config,
request_sender: SharedSender<(ConnectedRequest, SocketAddr)>,
response_receiver: SharedReceiver<(ConnectedResponse, SocketAddr)>,
request_sender: SharedSender<(AnnounceRequest, SocketAddr)>,
response_receiver: SharedReceiver<(AnnounceResponse, SocketAddr)>,
num_bound_sockets: Arc<AtomicUsize>,
) {
LocalExecutorBuilder::default()
@ -65,7 +65,7 @@ pub fn run_socket_worker(
async fn read_requests(
config: Config,
access_list: Arc<AccessList>,
request_sender: SharedSender<(ConnectedRequest, SocketAddr)>,
request_sender: SharedSender<(AnnounceRequest, SocketAddr)>,
local_sender: LocalSender<(Response, SocketAddr)>,
socket: Rc<UdpSocket>,
) {
@ -102,7 +102,7 @@ async fn read_requests(
if connections.contains(request.connection_id, src) {
if access_list.allows(access_list_mode, &request.info_hash.0) {
if let Err(err) = request_sender
.try_send((ConnectedRequest::Announce(request), src))
.try_send((request, src))
{
::log::warn!("request_sender.try_send failed: {:?}", err)
}
@ -118,11 +118,12 @@ async fn read_requests(
}
Ok(Request::Scrape(request)) => {
if connections.contains(request.connection_id, src) {
if let Err(err) =
request_sender.try_send((ConnectedRequest::Scrape(request), src))
{
::log::warn!("request_sender.try_send failed: {:?}", err)
}
let response = Response::Error(ErrorResponse {
transaction_id: request.transaction_id,
message: "Scrape requests not supported".into(),
});
local_sender.try_send((response, src));
}
}
Err(err) => {
@ -156,7 +157,7 @@ async fn read_requests(
}
async fn send_responses(
response_receiver: SharedReceiver<(ConnectedResponse, SocketAddr)>,
response_receiver: SharedReceiver<(AnnounceResponse, SocketAddr)>,
local_receiver: LocalReceiver<(Response, SocketAddr)>,
socket: Rc<UdpSocket>,
) {