Sweetbread/Alfis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some warnings.

Browse Source
This commit is contained in:
Revertron
2021-03-21 00:32:32 +01:00
parent dcf5bb72b0
commit d23990c3e7
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p2p/network.rs
+6 -11
View File
@@ -86,7 +86,7 @@ impl Network {
let local_ip = stream.local_addr().unwrap_or("0.0.0.0:0".parse().unwrap()); let local_ip = stream.local_addr().unwrap_or("0.0.0.0:0".parse().unwrap());
if !local_ip.ip().is_loopback() && local_ip.ip() == address.ip() { if !local_ip.ip().is_loopback() && local_ip.ip() == address.ip() {
peers.ignore_ip(&address.ip()); peers.ignore_ip(&address.ip());
stream.shutdown(Shutdown::Both); stream.shutdown(Shutdown::Both).unwrap_or_else(|e|{ warn!("Error in shutdown, {}", e); });
warn!("Detected connection loop, ignoring IP: {}", &address.ip()); warn!("Detected connection loop, ignoring IP: {}", &address.ip());
} else { } else {
info!("Accepted connection from: {} to local IP: {}", address, local_ip); info!("Accepted connection from: {} to local IP: {}", address, local_ip);
@@ -153,13 +153,8 @@ fn handle_connection_event(context: Arc<Mutex<Context>>, peers: &mut Peers, regi
let stream = peer.get_stream(); let stream = peer.get_stream();
match new_state { match new_state {
State::Message { data } => { State::Message { data } => {
if event.is_writable() { registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap();
// TODO handle all errors and buffer data to send peer.set_state(State::Message { data });
send_message(stream, &data);
} else {
registry.reregister(stream, event.token(), Interest::WRITABLE).unwrap();
peer.set_state(State::Message { data });
}
} }
State::Connecting => {} State::Connecting => {}
State::Connected => {} State::Connected => {}
@@ -195,12 +190,12 @@ fn handle_connection_event(context: Arc<Mutex<Context>>, peers: &mut Peers, regi
let message = Message::hand(&c.settings.origin, CHAIN_VERSION, c.settings.public, peer.get_rand()); let message = Message::hand(&c.settings.origin, CHAIN_VERSION, c.settings.public, peer.get_rand());
serde_json::to_string(&message).unwrap() serde_json::to_string(&message).unwrap()
}; };
send_message(peer.get_stream(), &data.into_bytes()); send_message(peer.get_stream(), &data.into_bytes()).unwrap_or_else(|e| warn!("Error sending hello {}", e));
//debug!("Sent hello to {}", &peer.get_addr()); //debug!("Sent hello to {}", &peer.get_addr());
} }
State::Message { data } => { State::Message { data } => {
debug!("Sending data to {}: {}", &peer.get_addr(), &String::from_utf8(data.clone()).unwrap()); debug!("Sending data to {}: {}", &peer.get_addr(), &String::from_utf8(data.clone()).unwrap());
send_message(peer.get_stream(), &data); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending message {}", e));
} }
State::Connected => {} State::Connected => {}
State::Idle { from } => { State::Idle { from } => {
@@ -211,7 +206,7 @@ fn handle_connection_event(context: Arc<Mutex<Context>>, peers: &mut Peers, regi
let message = Message::ping(c.chain.height(), c.chain.last_hash()); let message = Message::ping(c.chain.height(), c.chain.last_hash());
serde_json::to_string(&message).unwrap() serde_json::to_string(&message).unwrap()
}; };
send_message(peer.get_stream(), &data.into_bytes()); send_message(peer.get_stream(), &data.into_bytes()).unwrap_or_else(|e| warn!("Error sending ping {}", e));
} }
} }
State::Error => {} State::Error => {}