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

aquatic_udp: use access list cache when cleaning torrents

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-02 22:31:36 +01:00
parent fdaafae4b7
commit dce256a987
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aquatic_udp/src/lib/common/mod.rs
View file

@ -110,9 +110,9 @@ impl TorrentMaps {
/// Remove disallowed and inactive torrents
pub fn clean(&mut self, config: &Config, access_list: &Arc<AccessListArcSwap>) {
let now = Instant::now();
let access_list_mode = config.access_list.mode;
let mut access_list_cache = create_access_list_cache(access_list);
let access_list_mode = config.access_list.mode;
self.ipv4.retain(|info_hash, torrent| {
access_list_cache

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

@ -7,7 +7,7 @@ use std::sync::{
use std::time::{Duration, Instant};
use std::vec::Drain;
use aquatic_common::access_list::AccessListQuery;
use aquatic_common::access_list::create_access_list_cache;
use crossbeam_channel::{Receiver, Sender};
use mio::net::UdpSocket;
use mio::{Events, Interest, Poll, Token};
@ -149,6 +149,8 @@ fn read_requests(
let valid_until = ValidUntil::new(config.cleaning.max_connection_age);
let access_list_mode = config.access_list.mode;
let mut access_list_cache = create_access_list_cache(&state.access_list);
loop {
match socket.recv_from(&mut buffer[..]) {
Ok((amt, src)) => {
@ -176,8 +178,8 @@ fn read_requests(
}
Ok(Request::Announce(request)) => {
if connections.contains(request.connection_id, src) {
if state
.access_list
if access_list_cache
.load()
.allows(access_list_mode, &request.info_hash.0)
{
if let Err(err) = request_sender