aboutsummaryrefslogtreecommitdiff
path: root/karld/src/interface.rs
diff options
context:
space:
mode:
authormetamuffin <yvchraiqi@protonmail.com>2022-08-17 17:49:31 +0200
committermetamuffin <yvchraiqi@protonmail.com>2022-08-17 17:49:31 +0200
commitc0f90386900f0f767c7d0569e0f758d305af3d09 (patch)
treedc576c31200c1059d658915688cca1fd03ef9424 /karld/src/interface.rs
parentc10e88e42b26637e3c48ed781ced1382fb20fa26 (diff)
downloadkarlender-c0f90386900f0f767c7d0569e0f758d305af3d09.tar
karlender-c0f90386900f0f767c7d0569e0f758d305af3d09.tar.bz2
karlender-c0f90386900f0f767c7d0569e0f758d305af3d09.tar.zst
Revert "Revert "modularize interfaces""
This reverts commit c10e88e42b26637e3c48ed781ced1382fb20fa26.
Diffstat (limited to 'karld/src/interface.rs')
-rw-r--r--karld/src/interface.rs79
1 files changed, 0 insertions, 79 deletions
diff --git a/karld/src/interface.rs b/karld/src/interface.rs
deleted file mode 100644
index e8e0b90..0000000
--- a/karld/src/interface.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use crate::handle_packet;
-use karlcommon::{socket_path, version, ClientboundPacket, ProtoError, ServerboundPacket};
-use log::{debug, error, info, warn};
-use std::io;
-use std::io::{BufRead, BufReader, ErrorKind, Write};
-use std::os::unix::net::{UnixListener, UnixStream};
-use std::thread;
-
-pub fn network_loop() {
- if socket_path().exists() {
- info!("remove old socket");
- std::fs::remove_file(socket_path()).unwrap();
- }
- let listener = UnixListener::bind(socket_path()).unwrap();
- info!("listening.");
- let mut id_counter = 0;
-
- loop {
- let (stream, addr) = listener.accept().unwrap();
- let id = id_counter;
- id_counter += 1;
- thread::spawn(move || {
- info!("client connected: {:?}", addr);
- if let Err(err) = handle_connection(id, stream) {
- warn!("client dropped: {:?} ({})", addr, err);
- } else {
- info!("client dropped: {:?}", addr);
- }
- });
- }
-}
-
-fn handle_connection(id: u32, mut stream: UnixStream) -> io::Result<()> {
- let mut reader = BufReader::new(stream.try_clone()?);
- let (responder, responses) = crossbeam_channel::unbounded();
- responder
- .send(ClientboundPacket::Handshake {
- version: version!(),
- })
- .unwrap();
- thread::spawn(move || {
- for m in responses {
- debug!("{id} -> {m:?}");
- match stream
- .write_fmt(format_args!("{}\n", serde_json::to_string(&m).unwrap()))
- .map_err(|e| e.kind())
- {
- Ok(_) => (),
- Err(ErrorKind::BrokenPipe) => break,
- Err(e) => error!("network error: {:?}", e),
- }
- }
- });
- {
- let mut buf = String::new();
- loop {
- if reader.read_line(&mut buf)? == 0 {
- break Ok(());
- };
- match serde_json::from_str::<ServerboundPacket>(buf.as_str()) {
- Ok(packet) => {
- debug!("{id} <- {packet:?}");
- handle_packet(id, packet, responder.clone());
- }
- Err(err) => {
- warn!("client error: {:?}", &err);
- responder
- .send(ClientboundPacket::Error(ProtoError::FormatError(format!(
- "{}",
- &err
- ))))
- .map_err(|_| io::Error::from(ErrorKind::InvalidInput))?
- }
- }
-
- buf.clear();
- }
- }
-}