From fda0eeb863afc545b595de4c1185edfac8944b60 Mon Sep 17 00:00:00 2001 From: techmetx11 Date: Thu, 2 May 2024 14:00:56 +0100 Subject: [PATCH] Fixed the code, apparently there's nothing actually wrong with it --- src/main.rs | 8 +++----- src/opcode.rs | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 5017405..9bf0fc2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -62,7 +62,7 @@ async fn main() { Ok(x) => x, Err(x) => { if x.kind() == std::io::ErrorKind::AddrInUse { - remove_file(socket_url); + remove_file(socket_url).await; UnixListener::bind(socket_url).unwrap() } else { println!("Error occurred while trying to bind: {}", x); @@ -89,12 +89,10 @@ async fn main() { } async fn process_socket(state: Arc, socket: UnixStream) { - let (rd, wr) = socket.into_split(); - let decoder = OpcodeDecoder {}; + let str = Framed::new(socket, decoder); - let sink = FramedWrite::new(wr, decoder); - let mut stream = FramedRead::new(rd, decoder); + let (sink, mut stream) = str.split(); let arc_sink = Arc::new(Mutex::new(sink)); while let Some(opcode_res) = stream.next().await { diff --git a/src/opcode.rs b/src/opcode.rs index 69833c6..82fa1ab 100644 --- a/src/opcode.rs +++ b/src/opcode.rs @@ -34,6 +34,7 @@ impl Decoder for OpcodeDecoder { &mut self, src: &mut tokio_util::bytes::BytesMut, ) -> Result, Self::Error> { + println!("Decoder length: {}", src.len()); if 5 > src.len() { return Ok(None); }