mirror of
https://github.com/YGGverse/aquatic.git
synced 2026-03-31 17:55:36 +00:00
fe5ccf6646
- split swarm worker into two modules - split socket worker into two modules - keep track of which offers peers have sent and only allow matching answers - always clean up after closing connection - use channel for telling connections to close - move some logic into new ConnectionRunner struct - use slotmap for connection reference storage - fix double counting of error responses - actually close connections that take too long to send responses to - remove announced_info_hashes entry on AnnounceEvent::Stopped
77 lines
2 KiB
Rust
77 lines
2 KiB
Rust
use std::{net::IpAddr, sync::Arc};
|
|
|
|
use aquatic_common::access_list::AccessListArcSwap;
|
|
|
|
pub use aquatic_common::ValidUntil;
|
|
use aquatic_ws_protocol::{InfoHash, PeerId};
|
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
pub enum IpVersion {
|
|
V4,
|
|
V6,
|
|
}
|
|
|
|
impl IpVersion {
|
|
pub fn canonical_from_ip(ip: IpAddr) -> IpVersion {
|
|
match ip {
|
|
IpAddr::V4(_) => Self::V4,
|
|
IpAddr::V6(addr) => match addr.octets() {
|
|
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, _, _, _, _] => Self::V4,
|
|
_ => Self::V6,
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Default, Clone)]
|
|
pub struct State {
|
|
pub access_list: Arc<AccessListArcSwap>,
|
|
}
|
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
pub struct PendingScrapeId(pub u8);
|
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
pub struct ConsumerId(pub u8);
|
|
|
|
slotmap::new_key_type! {
|
|
pub struct ConnectionId;
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub struct InMessageMeta {
|
|
/// Index of socket worker responsible for this connection. Required for
|
|
/// sending back response through correct channel to correct worker.
|
|
pub out_message_consumer_id: ConsumerId,
|
|
pub connection_id: ConnectionId,
|
|
pub ip_version: IpVersion,
|
|
pub pending_scrape_id: Option<PendingScrapeId>,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub struct OutMessageMeta {
|
|
/// Index of socket worker responsible for this connection. Required for
|
|
/// sending back response through correct channel to correct worker.
|
|
pub out_message_consumer_id: ConsumerId,
|
|
pub connection_id: ConnectionId,
|
|
pub pending_scrape_id: Option<PendingScrapeId>,
|
|
}
|
|
|
|
impl Into<OutMessageMeta> for InMessageMeta {
|
|
fn into(self) -> OutMessageMeta {
|
|
OutMessageMeta {
|
|
out_message_consumer_id: self.out_message_consumer_id,
|
|
connection_id: self.connection_id,
|
|
pending_scrape_id: self.pending_scrape_id,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub enum SwarmControlMessage {
|
|
ConnectionClosed {
|
|
info_hash: InfoHash,
|
|
peer_id: PeerId,
|
|
ip_version: IpVersion,
|
|
},
|
|
}
|