refactor networking

1 files changed, 4 insertions, 11 deletions

diff --git a/karld/src/interface/unix.rs b/karld/src/interface/unix.rs
index 620ff64..9989b0f 100644
--- a/karld/src/interface/unix.rs
+++ b/karld/src/interface/unix.rs
@@ -1,7 +1,6 @@
-use crate::interface::generic::generic_handle_connection;
-use crate::CLIENT_ID_COUNTER;
+use crate::interface::generic;
 use karlcommon::interfaces::unix_path;
-use log::{info, warn};
+use log::info;
 use std::os::unix::net::UnixListener;
 use std::thread;
 
@@ -15,15 +14,9 @@ pub fn run() {
     info!("listening.");
 
     loop {
-        let (stream, addr) = listener.accept().unwrap();
-        let id = CLIENT_ID_COUNTER.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+        let (stream, _addr) = listener.accept().unwrap();
         thread::spawn(move || {
-            info!("client connected: {:?}", addr);
-            if let Err(err) = generic_handle_connection(id, stream.try_clone().unwrap(), stream) {
-                warn!("client dropped: {:?} ({})", addr, err);
-            } else {
-                info!("client dropped: {:?}", addr);
-            }
+            generic::handle_connection(generic::stream, (stream.try_clone().unwrap(), stream))
         });
     }
 }