From 0c50bf983fefb79242b6a422cb1b5a24905a5d16 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sat, 6 Aug 2022 00:38:34 +0800 Subject: [PATCH] more error handling on server --- services/shellchat/src/cmds/net_cmd.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/services/shellchat/src/cmds/net_cmd.rs b/services/shellchat/src/cmds/net_cmd.rs index 5b433ab54..2089f2f05 100644 --- a/services/shellchat/src/cmds/net_cmd.rs +++ b/services/shellchat/src/cmds/net_cmd.rs @@ -192,7 +192,7 @@ impl<'a> ShellCmdApi<'a> for NetCmd { } count += 1; if count == 10 && short_test { - stream.flush().unwrap(); + stream.flush().ok(); break; } } @@ -203,7 +203,7 @@ impl<'a> ShellCmdApi<'a> for NetCmd { } } }); - write!(ret, "Fountain started on port 3333").unwrap(); + write!(ret, "Fountain started on port 3333").ok(); } // Testing of udp is done with netcat: // to send packets run `netcat -u 6502` on a remote host, and then type some data @@ -614,7 +614,13 @@ fn handle_connection(mut stream: TcpStream, boot_instant: Instant) { ); let mut buffer = [0; 1024]; - stream.read(&mut buffer).unwrap(); + match stream.read(&mut buffer) { + Ok(_) => {}, + Err(e) => { + log::warn!("Server connection error; closing connection {:?}", e); + return; + } + } let get = b"GET / HTTP/1.1\r\n"; let sleep = b"GET /sleep HTTP/1.1\r\n";