aquatic_udp: move code only use in mio impl out of crate::common

aquatic_udp/src/lib/mio/common.rs

@@ -0,0 +1,49 @@
+use aquatic_common::access_list::AccessListArcSwap;
+use parking_lot::Mutex;
+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,
+    pub responses_sent: AtomicUsize,
+    pub bytes_received: AtomicUsize,
+    pub bytes_sent: AtomicUsize,
+}
+
+#[derive(Clone)]
+pub struct State {
+    pub access_list: Arc<AccessListArcSwap>,
+    pub torrents: Arc<Mutex<TorrentMaps>>,
+    pub statistics: Arc<Statistics>,
+}
+
+impl Default for State {
+    fn default() -> Self {
+        Self {
+            access_list: Arc::new(AccessListArcSwap::default()),
+            torrents: Arc::new(Mutex::new(TorrentMaps::default())),
+            statistics: Arc::new(Statistics::default()),
+        }
+    }
+}

aquatic_udp/src/lib/mio/handlers/announce.rs

@@ -10,6 +10,7 @@ use aquatic_udp_protocol::*;
 use crate::common::announce::handle_announce_request;
 use crate::common::*;
 use crate::config::Config;
+use crate::mio::common::*;
 
 #[inline]
 pub fn handle_announce_requests(

aquatic_udp/src/lib/mio/handlers/mod.rs

@@ -6,8 +6,8 @@ use rand::{rngs::SmallRng, SeedableRng};
 
 use aquatic_udp_protocol::*;
 
-use crate::common::*;
 use crate::config::Config;
+use crate::mio::common::*;
 
 mod announce;
 mod scrape;

aquatic_udp/src/lib/mio/handlers/scrape.rs

@@ -6,6 +6,8 @@ use parking_lot::MutexGuard;
 use aquatic_common::convert_ipv4_mapped_ipv6;
 use aquatic_udp_protocol::*;
 
+use crate::mio::common::*;
+
 use crate::common::*;
 
 #[inline]

aquatic_udp/src/lib/mio/mod.rs

@@ -12,13 +12,16 @@ use anyhow::Context;
 use crossbeam_channel::unbounded;
 use privdrop::PrivDrop;
 
+pub mod common;
 pub mod handlers;
 pub mod network;
 pub mod tasks;
 
-use crate::common::State;
+use aquatic_common::access_list::{AccessListArcSwap, AccessListMode, AccessListQuery};
+
 use crate::config::Config;
-use crate::update_access_list;
+
+use common::State;
 
 pub fn run(config: Config) -> ::anyhow::Result<()> {
     let state = State::default();
@@ -126,3 +129,14 @@ pub fn start_workers(
 
     Ok(())
 }
+
+pub fn update_access_list(config: &Config, access_list: &Arc<AccessListArcSwap>) {
+    match config.access_list.mode {
+        AccessListMode::White | AccessListMode::Black => {
+            if let Err(err) = access_list.update_from_path(&config.access_list.path) {
+                ::log::error!("Update access list from path: {:?}", err);
+            }
+        }
+        AccessListMode::Off => {}
+    }
+}

aquatic_udp/src/lib/mio/network.rs

@@ -20,6 +20,8 @@ use crate::common::network::ConnectionMap;
 use crate::common::*;
 use crate::config::Config;
 
+use super::common::*;
+
 pub fn run_socket_worker(
     state: State,
     config: Config,

aquatic_udp/src/lib/mio/tasks.rs

@@ -2,7 +2,7 @@ use std::sync::atomic::Ordering;
 
 use histogram::Histogram;
 
-use crate::common::*;
+use super::common::*;
 use crate::config::Config;
 
 pub fn gather_and_print_statistics(state: &State, config: &Config) {