From 814cc1cb01692aa934a40636c9226ff7bb911266 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 6 Jan 2025 14:28:02 +0100 Subject: new proto --- server/src/main.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'server/src') diff --git a/server/src/main.rs b/server/src/main.rs index cc55488..6b2911f 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -11,7 +11,11 @@ use std::{ }, thread::spawn, }; -use weareshared::{packets::Packet, store::ResourceStore, tree::SceneTree}; +use weareshared::{ + packets::{Packet, ReadWrite}, + store::ResourceStore, + tree::SceneTree, +}; #[derive(Parser, Debug)] struct Args { @@ -59,7 +63,7 @@ fn main() -> Result<()> { fn handle_conn_read(conn: usize, sock: TcpStream, state: Arc>) -> Result<()> { let mut sock = BufReader::new(sock); loop { - let packet = Packet::deserialize(&mut sock)?; + let packet = Packet::read(&mut sock)?; debug!("{conn} <- {packet:?}"); state.lock().unwrap().handle_packet(conn, packet)?; } @@ -68,7 +72,7 @@ fn handle_conn_write(conn: usize, sock: TcpStream, rx: Receiver) -> Resu let mut sock = BufWriter::new(sock); for packet in rx { debug!("{conn} -> {packet:?}"); - packet.serialize(&mut sock)?; + packet.write(&mut sock)?; sock.flush()?; } Ok(()) -- cgit v1.2.3-70-g09d2