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

Network optimizations, part 2.

Browse Source
This commit is contained in:
Revertron
2022-09-06 20:31:01 +02:00
parent 74b84f0e65
commit 9bf98214d4
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+1 -1
View File
@@ -84,7 +84,7 @@ dependencies = [
[[package]] [[package]]
name = "alfis" name = "alfis"
version = "0.8.0" version = "0.8.2"
dependencies = [ dependencies = [
"base64", "base64",
"bincode", "bincode",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "alfis" name = "alfis"
version = "0.8.1" version = "0.8.2"
authors = ["Revertron <alfis@revertron.com>"] authors = ["Revertron <alfis@revertron.com>"]
edition = "2021" edition = "2021"
build = "build.rs" build = "build.rs"
src/p2p/network.rs
+4
View File
@@ -417,6 +417,7 @@ impl Network {
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));
peer.set_state(State::idle());
//debug!("Sent hello to {}", &peer.get_addr()); //debug!("Sent hello to {}", &peer.get_addr());
} }
State::Connected => {} State::Connected => {}
@@ -425,6 +426,7 @@ impl Network {
if let Ok(data) = encode_bytes(&data, peer.get_cipher()) { if let Ok(data) = encode_bytes(&data, peer.get_cipher()) {
send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending message {}", e)); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending message {}", e));
} }
peer.set_state(State::idle());
} }
State::Idle { from } => { State::Idle { from } => {
debug!("Odd version of pings :)"); debug!("Odd version of pings :)");
@@ -444,10 +446,12 @@ impl Network {
State::SendLoop => { State::SendLoop => {
let data = encode_message(&Message::Loop, peer.get_cipher()).unwrap(); let data = encode_message(&Message::Loop, peer.get_cipher()).unwrap();
send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending loop {}", e)); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending loop {}", e));
peer.set_state(State::idle());
} }
State::Twin => { State::Twin => {
let data = encode_message(&Message::Twin, peer.get_cipher()).unwrap(); let data = encode_message(&Message::Twin, peer.get_cipher()).unwrap();
send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending loop {}", e)); send_message(peer.get_stream(), &data).unwrap_or_else(|e| warn!("Error sending loop {}", e));
peer.set_state(State::idle());
} }
} }
registry.reregister(peer.get_stream(), event.token(), Interest::READABLE).unwrap(); registry.reregister(peer.get_stream(), event.token(), Interest::READABLE).unwrap();
src/p2p/peers.rs
+1 -1
View File
@@ -308,7 +308,7 @@ impl Peers {
None => {} None => {}
Some((token, peer)) => { Some((token, peer)) => {
debug!("Peer {} is behind ({}), sending ping", &peer.get_addr().ip(), peer.get_height()); debug!("Peer {} is behind ({}), sending ping", &peer.get_addr().ip(), peer.get_height());
registry.reregister(peer.get_stream(), *token, Interest::WRITABLE | Interest::READABLE).unwrap(); registry.reregister(peer.get_stream(), *token, Interest::WRITABLE).unwrap();
peer.set_state(State::message(Message::Ping { height, hash })); peer.set_state(State::message(Message::Ping { height, hash }));
peer.set_sent_height(height); peer.set_sent_height(height);
self.update_behind_ping_time(); self.update_behind_ping_time();