reduce visibility of some structs

This commit is contained in:
Ferdinand Schober
2024-07-14 14:32:11 +02:00
parent 8fa4ea530a
commit a7e7941806
6 changed files with 15 additions and 15 deletions

View File

@@ -24,7 +24,7 @@ impl DnsResolver {
)) ))
} }
pub(crate) async fn resolve(&self, host: &str) -> Result<Vec<IpAddr>, Box<dyn Error>> { async fn resolve(&self, host: &str) -> Result<Vec<IpAddr>, Box<dyn Error>> {
let response = self.resolver.lookup_ip(host).await?; let response = self.resolver.lookup_ip(host).await?;
for ip in response.iter() { for ip in response.iter() {
log::info!("{host}: adding ip {ip}"); log::info!("{host}: adding ip {ip}");
@@ -32,7 +32,7 @@ impl DnsResolver {
Ok(response.iter().collect()) Ok(response.iter().collect())
} }
pub async fn run(mut self, server: Server) { pub(crate) async fn run(mut self, server: Server) {
tokio::select! { tokio::select! {
_ = server.cancelled() => {}, _ = server.cancelled() => {},
_ = self.do_dns(&server) => {}, _ = self.do_dns(&server) => {},
@@ -56,7 +56,7 @@ impl DnsResolver {
}; };
/* FIXME race -> need some other event */ /* FIXME race -> need some other event */
server.notify_client_update(handle); server.client_resolved(handle);
log::info!("resolving ({handle}) `{hostname}` ..."); log::info!("resolving ({handle}) `{hostname}` ...");
let ips = match self.resolve(&hostname).await { let ips = match self.resolve(&hostname).await {
@@ -76,7 +76,7 @@ impl DnsResolver {
s.ips = addrs; s.ips = addrs;
s.resolving = false; s.resolving = false;
} }
server.notify_client_update(handle); server.client_resolved(handle);
} }
} }
} }

View File

@@ -287,7 +287,7 @@ impl Server {
self.notify_frontend(FrontendEvent::PortChanged(port, msg)); self.notify_frontend(FrontendEvent::PortChanged(port, msg));
} }
pub(crate) fn notify_client_update(&self, handle: ClientHandle) { pub(crate) fn client_resolved(&self, handle: ClientHandle) {
let state = self.client_manager.borrow().get(handle).cloned(); let state = self.client_manager.borrow().get(handle).cloned();
if let Some((config, state)) = state { if let Some((config, state)) = state {
self.notify_frontend(FrontendEvent::State(handle, config, state)); self.notify_frontend(FrontendEvent::State(handle, config, state));
@@ -373,7 +373,7 @@ impl Server {
handle handle
} }
pub async fn deactivate_client( async fn deactivate_client(
&self, &self,
capture: &Sender<CaptureEvent>, capture: &Sender<CaptureEvent>,
emulate: &Sender<EmulationEvent>, emulate: &Sender<EmulationEvent>,
@@ -390,7 +390,7 @@ impl Server {
log::debug!("deactivating client {handle} done"); log::debug!("deactivating client {handle} done");
} }
pub async fn activate_client( async fn activate_client(
&self, &self,
capture: &Sender<CaptureEvent>, capture: &Sender<CaptureEvent>,
emulate: &Sender<EmulationEvent>, emulate: &Sender<EmulationEvent>,
@@ -423,7 +423,7 @@ impl Server {
log::debug!("activating client {handle} done"); log::debug!("activating client {handle} done");
} }
pub async fn remove_client( async fn remove_client(
&self, &self,
capture: &Sender<CaptureEvent>, capture: &Sender<CaptureEvent>,
emulate: &Sender<EmulationEvent>, emulate: &Sender<EmulationEvent>,

View File

@@ -19,7 +19,7 @@ use crate::{client::ClientHandle, frontend::Status, server::State};
use super::Server; use super::Server;
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum LanMouseCaptureError { pub(crate) enum LanMouseCaptureError {
#[error("error creating input-capture: `{0}`")] #[error("error creating input-capture: `{0}`")]
Create(#[from] CaptureCreationError), Create(#[from] CaptureCreationError),
#[error("error while capturing input: `{0}`")] #[error("error while capturing input: `{0}`")]
@@ -27,7 +27,7 @@ pub enum LanMouseCaptureError {
} }
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
pub enum CaptureEvent { pub(crate) enum CaptureEvent {
/// capture must release the mouse /// capture must release the mouse
Release, Release,
/// add a capture client /// add a capture client
@@ -36,7 +36,7 @@ pub enum CaptureEvent {
Destroy(CaptureHandle), Destroy(CaptureHandle),
} }
pub fn new( pub(crate) fn new(
server: Server, server: Server,
capture_rx: Receiver<CaptureEvent>, capture_rx: Receiver<CaptureEvent>,
udp_send: Sender<(Event, SocketAddr)>, udp_send: Sender<(Event, SocketAddr)>,

View File

@@ -21,7 +21,7 @@ use input_event::{Event, KeyboardEvent};
use super::{network_task::NetworkError, CaptureEvent, Server}; use super::{network_task::NetworkError, CaptureEvent, Server};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum EmulationEvent { pub(crate) enum EmulationEvent {
/// create a new client /// create a new client
Create(EmulationHandle), Create(EmulationHandle),
/// destroy a client /// destroy a client
@@ -30,7 +30,7 @@ pub enum EmulationEvent {
ReleaseKeys(ClientHandle), ReleaseKeys(ClientHandle),
} }
pub fn new( pub(crate) fn new(
server: Server, server: Server,
emulation_rx: Receiver<EmulationEvent>, emulation_rx: Receiver<EmulationEvent>,
udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>, udp_rx: Receiver<Result<(Event, SocketAddr), NetworkError>>,

View File

@@ -11,7 +11,7 @@ use input_event::{Event, ProtocolError};
use super::Server; use super::Server;
pub async fn new( pub(crate) async fn new(
server: Server, server: Server,
udp_recv_tx: Sender<Result<(Event, SocketAddr), NetworkError>>, udp_recv_tx: Sender<Result<(Event, SocketAddr), NetworkError>>,
udp_send_rx: Receiver<(Event, SocketAddr)>, udp_send_rx: Receiver<(Event, SocketAddr)>,

View File

@@ -10,7 +10,7 @@ use super::{capture_task::CaptureEvent, emulation_task::EmulationEvent, Server,
const MAX_RESPONSE_TIME: Duration = Duration::from_millis(500); const MAX_RESPONSE_TIME: Duration = Duration::from_millis(500);
pub fn new( pub(crate) fn new(
server: Server, server: Server,
sender_ch: Sender<(Event, SocketAddr)>, sender_ch: Sender<(Event, SocketAddr)>,
emulate_notify: Sender<EmulationEvent>, emulate_notify: Sender<EmulationEvent>,