jake/elseware
1
0
Fork 0
Code Issues 63 Pull Requests 1 Projects Releases Wiki Activity

remove some debug statements

Browse Source
This commit is contained in:
jake 2019-11-04 20:22:23 -08:00
parent 6d74958de9
commit 7664771cf5
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/client.rs
View File

@ -95,7 +95,7 @@ impl<S, R> Client<S, R> where
let pkt_data = self.incoming_data.drain(..pkt_len).collect::<Vec<_>>(); let pkt_data = self.incoming_data.drain(..pkt_len).collect::<Vec<_>>();
println!("[recv: buf] {:?}", pkt_data); //println!("[recv: buf] {:?}", pkt_data);
let pkt = R::from_bytes(&pkt_data[..pkt_size]) let pkt = R::from_bytes(&pkt_data[..pkt_size])
.map_err(|err| -> PacketNetworkError { err.into() })?; .map_err(|err| -> PacketNetworkError { err.into() })?;
@ -108,12 +108,12 @@ impl<S, R> Client<S, R> where
pub fn send_pkt(&mut self, pkt: S) { pub fn send_pkt(&mut self, pkt: S) {
println!("[send] {:?}", pkt); println!("[send] {:?}", pkt);
let buf = pkt.as_bytes(); let buf = pkt.as_bytes();
if buf.len() < 1024*2 { /*if buf.len() < 1024*2 {
println!("[send: buf] {:?}", buf); println!("[send: buf] {:?}", buf);
} }
else { else {
println!("[send: buf] [...large buffer...]"); println!("[send: buf] [...large buffer...]");
} }*/
let mut cbuf = self.cipher_out.encrypt(&buf).unwrap(); let mut cbuf = self.cipher_out.encrypt(&buf).unwrap();
self.send_buffer.append(&mut cbuf); self.send_buffer.append(&mut cbuf);
self.send_data(); self.send_data();

1
src/common/clientpool.rs
View File

@ -103,7 +103,6 @@ impl<S, R> ClientPool<S, R> where
Ok(action) => { Ok(action) => {
match action { match action {
ClientAction::EncryptionKeys(client_id, cipher_in, cipher_out) => { ClientAction::EncryptionKeys(client_id, cipher_in, cipher_out) => {
println!("enc {:?}", client_id);
self.clients.get_mut(&client_id) self.clients.get_mut(&client_id)
.map(|client| { .map(|client| {
client.set_cipher(cipher_in, cipher_out); client.set_cipher(cipher_in, cipher_out);

4
src/common/mainloop.rs
View File

@ -5,10 +5,6 @@ use mio_extras::channel::{channel, Sender, Receiver};
use crate::common::clientpool::{ClientPool, ClientAction, ClientPoolAction}; use crate::common::clientpool::{ClientPool, ClientAction, ClientPoolAction};
use crate::common::serverstate::{RecvServerPacket, SendServerPacket, ServerState, OnConnect}; use crate::common::serverstate::{RecvServerPacket, SendServerPacket, ServerState, OnConnect};
fn recv_from_clientpool<STATE, S, R, E>(state: &mut STATE, fn recv_from_clientpool<STATE, S, R, E>(state: &mut STATE,
pool_recv: &Receiver<ClientPoolAction<R>>, pool_recv: &Receiver<ClientPoolAction<R>>,
pool_send: &Sender<ClientAction<S>>) where pool_send: &Sender<ClientAction<S>>) where