Archives
/
Alfis
mirror of https://github.com/Revertron/Alfis
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed excess logging.

Browse Source
pull/127/head
Revertron 3 years ago
parent 24975e3875
commit dbd14e1599
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
Cargo.lock generated
Unescape Escape View File

@ -65,7 +65,7 @@ dependencies = [
[[package]] [[package]]
name = "alfis" name = "alfis"
version = "0.6.0" version = "0.6.1"
dependencies = [ dependencies = [
"base64", "base64",
"bincode", "bincode",

2
Cargo.toml
Unescape Escape View File

@ -1,6 +1,6 @@
[package] [package]
name = "alfis" name = "alfis"
version = "0.6.0" version = "0.6.1"
authors = ["Revertron <alfis@revertron.com>"] authors = ["Revertron <alfis@revertron.com>"]
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"

16
src/p2p/network.rs
Unescape Escape View File

@ -225,11 +225,11 @@ impl Network {
std::mem::drop(stream); std::mem::drop(stream);
peer.set_cipher(chacha); peer.set_cipher(chacha);
peer.set_state(State::ServerHandshake); peer.set_state(State::ServerHandshake);
info!("Client hello read successfully"); trace!("Client hello read successfully");
true true
} }
Err(e) => { Err(e) => {
warn!("Error reading client handshake. {}", e); info!("Error reading client handshake. {}", e);
false false
} }
} }
@ -253,7 +253,7 @@ impl Network {
std::mem::drop(stream); std::mem::drop(stream);
peer.set_cipher(chacha); peer.set_cipher(chacha);
peer.set_state(State::HandshakeFinished); peer.set_state(State::HandshakeFinished);
info!("Server hello read successfully"); trace!("Server hello read successfully");
true true
} }
Err(e) => { Err(e) => {
@ -293,10 +293,10 @@ impl Network {
}; };
match Message::from_bytes(data) { match Message::from_bytes(data) {
Ok(message) => { Ok(message) => {
let m = format!("{:?}", &message); //let m = format!("{:?}", &message);
let new_state = self.handle_message(message, &event.token()); let new_state = self.handle_message(message, &event.token());
let peer = self.peers.get_mut_peer(&event.token()).unwrap(); let peer = self.peers.get_mut_peer(&event.token()).unwrap();
debug!("Got message from {}: {:?}", &peer.get_addr(), &m); //debug!("Got message from {}: {:?}", &peer.get_addr(), &m);
let stream = peer.get_stream(); let stream = peer.get_stream();
match new_state { match new_state {
State::Message { data } => { State::Message { data } => {
@ -360,14 +360,14 @@ impl Network {
return false; return false;
} }
peer.set_state(State::HandshakeFinished); peer.set_state(State::HandshakeFinished);
info!("Server handshake sent"); trace!("Server handshake sent");
} }
State::HandshakeFinished => { State::HandshakeFinished => {
//debug!("Connected to peer {}, sending hello...", &peer.get_addr()); //debug!("Connected to peer {}, sending hello...", &peer.get_addr());
let data: Vec<u8> = { let data: Vec<u8> = {
let c = self.context.lock().unwrap(); let c = self.context.lock().unwrap();
let message = Message::hand(&c.app_version, &c.settings.origin, CHAIN_VERSION, c.settings.net.public, &my_id); let message = Message::hand(&c.app_version, &c.settings.origin, CHAIN_VERSION, c.settings.net.public, &my_id);
info!("Sending: {:?}", &message); //info!("Sending: {:?}", &message);
encode_message(&message, peer.get_cipher()).unwrap() encode_message(&message, peer.get_cipher()).unwrap()
}; };
send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending hello {}", e)); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending hello {}", e));
@ -684,7 +684,7 @@ fn read_message(stream: &mut TcpStream) -> Result<Vec<u8>, ()> {
0 0
} }
}; };
trace!("Payload size is {}", data_size); //trace!("Payload size is {}", data_size);
if data_size > MAX_PACKET_SIZE || data_size == 0 { if data_size > MAX_PACKET_SIZE || data_size == 0 {
return Err(()); return Err(());
} }

Write Preview
Loading…
Cancel
Save