From d9fa86ef007045c5e41bf7a9a7c83ff831cf0bca Mon Sep 17 00:00:00 2001 From: Ferdinand Schober Date: Tue, 19 Dec 2023 17:22:39 +0100 Subject: [PATCH] cli: wait for connection (#55) --- src/frontend/cli.rs | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/frontend/cli.rs b/src/frontend/cli.rs index 7a625c8..c71af8e 100644 --- a/src/frontend/cli.rs +++ b/src/frontend/cli.rs @@ -1,32 +1,17 @@ use anyhow::{anyhow, Context, Result}; -#[cfg(windows)] -use std::net::SocketAddrV4; + use std::{ io::{ErrorKind, Read, Write}, str::SplitWhitespace, thread, }; -#[cfg(windows)] -use std::net::TcpStream; -#[cfg(unix)] -use std::os::unix::net::UnixStream; - use crate::{client::Position, config::DEFAULT_PORT}; use super::{FrontendEvent, FrontendNotify}; pub fn run() -> Result<()> { - #[cfg(unix)] - let socket_path = super::FrontendListener::socket_path()?; - - #[cfg(unix)] - let Ok(mut tx) = UnixStream::connect(socket_path) else { - return Err(anyhow!("Could not connect to lan-mouse-socket")); - }; - - #[cfg(windows)] - let Ok(mut tx) = TcpStream::connect("127.0.0.1:5252".parse::().unwrap()) else { + let Ok(mut tx) = super::wait_for_service() else { return Err(anyhow!("Could not connect to lan-mouse-socket")); };