TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-03-23 13:10:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor dns task

Browse Source
This commit is contained in:
Ferdinand Schober
2024-01-19 00:22:00 +01:00
parent 622b04b36c
commit 2803db7073
3 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/frontend_task.rs
View File

@@ -17,14 +17,16 @@ use crate::{
frontend::{self, FrontendEvent, FrontendListener, FrontendNotify},
};
use super::{consumer_task::ConsumerEvent, producer_task::ProducerEvent, Server};
use super::{
consumer_task::ConsumerEvent, producer_task::ProducerEvent, resolver_task::DnsRequest, Server,
};
pub(crate) fn new(
mut frontend: FrontendListener,
server: Server,
producer_notify: Sender<ProducerEvent>,
consumer_notify: Sender<ConsumerEvent>,
resolve_ch: Sender<(String, u32)>,
resolve_ch: Sender<DnsRequest>,
port_tx: Sender<u16>,
) -> (
JoinHandle<Result<()>>,
@@ -98,7 +100,7 @@ async fn handle_frontend_event(
server: &Server,
producer_tx: &Sender<ProducerEvent>,
consumer_tx: &Sender<ConsumerEvent>,
resolve_tx: &Sender<(String, ClientHandle)>,
resolve_tx: &Sender<DnsRequest>,
frontend: &mut FrontendListener,
port_tx: &Sender<u16>,
event: FrontendEvent,
@@ -173,7 +175,7 @@ async fn handle_frontend_event(
pub async fn add_client(
server: &Server,
resolver_tx: &Sender<(String, ClientHandle)>,
resolver_tx: &Sender<DnsRequest>,
hostname: Option<String>,
addr: HashSet<IpAddr>,
port: u16,
@@ -194,7 +196,7 @@ pub async fn add_client(
log::debug!("add_client {handle}");
if let Some(hostname) = hostname {
let _ = resolver_tx.send((hostname, handle)).await;
let _ = resolver_tx.send(DnsRequest { hostname, handle }).await;
}
handle
@@ -266,7 +268,7 @@ async fn update_client(
server: &Server,
producer_notify_tx: &Sender<ProducerEvent>,
consumer_notify_tx: &Sender<ConsumerEvent>,
resolve_tx: &Sender<(String, ClientHandle)>,
resolve_tx: &Sender<DnsRequest>,
client_update: (ClientHandle, Option<String>, u16, Position),
) {
let (handle, hostname, port, pos) = client_update;
@@ -303,7 +305,7 @@ async fn update_client(
// resolve dns
if let Some(hostname) = hostname {
let _ = resolve_tx.send((hostname, handle)).await;
let _ = resolve_tx.send(DnsRequest { hostname, handle }).await;
}
// update state in event consumer & producer