diff -r e0bf51609062 -r f3121d7dedec gameServer2/src/server/client.rs --- a/gameServer2/src/server/client.rs Sun Jan 15 00:34:36 2017 +0300 +++ b/gameServer2/src/server/client.rs Wed Jan 18 22:15:55 2017 +0300 @@ -36,6 +36,10 @@ self.send_msg(Connected(utils::PROTOCOL_VERSION)); } + pub fn deregister(&mut self, poll: &Poll) { + poll.deregister(&self.sock); + } + pub fn send_raw_msg(&mut self, msg: &[u8]) { self.buf_out.write(msg).unwrap(); self.flush(); @@ -63,6 +67,8 @@ for msg in msgs { match msg { Ping => response.push(SendMe(Pong.to_raw_protocol())), + Quit(Some(msg)) => response.push(ByeClient("User quit: ".to_string() + msg)), + Quit(None) => response.push(ByeClient("User quit".to_string())), Malformed => warn!("Malformed/unknown message"), Empty => warn!("Empty message"), _ => unimplemented!(), @@ -75,11 +81,11 @@ pub fn writable(&mut self, poll: &Poll) -> io::Result<()> { self.buf_out.write_to(&mut self.sock)?; + Ok(()) } - pub fn error(&mut self, poll: &Poll) -> io::Result<()> { - debug!("Client error"); - Ok(()) + pub fn error(&mut self, poll: &Poll) -> Vec { + return vec![ByeClient("Connection reset".to_string())] } }