Some network refactoring, updated dependencies.

Cargo.lock

@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "aead"
 version = "0.3.2"
@@ -323,6 +329,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
+[[package]]
+name = "crc32fast"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.1"
@@ -447,6 +462,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
+dependencies = [
+ "cfg-if",
+ "crc32fast",
+ "libc",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "form_urlencoded"
 version = "1.0.1"
@@ -720,6 +747,16 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
+dependencies = [
+ "adler",
+ "autocfg",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.0"
@@ -783,9 +820,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -996,9 +1033,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b5ac6078ca424dc1d3ae2328526a76787fecc7f8011f520e3276730e711fc95"
+checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84"
 dependencies = [
  "log",
  "ring",
@@ -1374,12 +1411,13 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5c448dcb78ec38c7d59ec61f87f70a98ea19171e06c139357e012ee226fec90"
+checksum = "9399fa2f927a3d327187cbd201480cee55bee6ac5d3c77dd27f0c6814cff16d5"
 dependencies = [
  "base64",
  "chunked_transfer",
+ "flate2",
  "log",
  "once_cell",
  "rustls",

Cargo.toml

@@ -23,7 +23,7 @@ ecies-ed25519 = "0.5"
 chacha20poly1305 = "0.9"
 signature = "1.3.1"
 blakeout = "0.3.0"
-num_cpus = "1.13.0"
+num_cpus = "1.13.1"
 byteorder = "1.4.3"
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
@@ -38,7 +38,7 @@ rand-old = { package = "rand", version = "0.7.0" } # For ed25519-dalek
 sqlite = "0.26.0"
 uuid = { version = "0.8.2", features = ["serde", "v4"] }
 mio = { version = "0.8.0", features = ["os-poll", "net"] }
-ureq = { version = "2.3.1", optional = true }
+ureq = { version = "2.4", optional = true }
 lru = "0.7.1"
 derive_more = "0.99.17"
 lazy_static = "1.4.0"

src/p2p/network.rs

@@ -101,8 +101,7 @@ impl Network {
                     SERVER => {
                         //debug!("Event for server socket {} is {:?}", event.token().0, &event);
                         // If this is an event for the server, it means a connection is ready to be accepted.
-                        let connection = server.accept();
+                        while let Ok((mut stream, mut address)) = server.accept() {
-                        if let Ok((mut stream, mut address)) = connection {
                             // Checking if it is an ipv4-mapped ipv6 if yes convert to ipv4
                             if address.is_ipv6() {
                                 if let IpAddr::V6(ipv6) = address.ip() {
@@ -210,6 +209,17 @@ impl Network {
         }
 
         if event.is_readable() {
+            return self.process_readable(registry, event);
+        }
+
+        if event.is_writable() {
+            return self.process_writable(registry, event);
+        }
+
+        true
+    }
+
+    fn process_readable(&mut self, registry: &Registry, event: &Event) -> bool {
         let data = {
             let token = event.token();
             match self.peers.get_mut_peer(&token) {
@@ -355,13 +365,12 @@ impl Network {
             debug!("Error reading message from {}, error = {}", addr, error);
             return false;
         }
+        true
     }
 
-        if event.is_writable() {
+    fn process_writable(&mut self, registry: &Registry, event: &Event) -> bool {
         let my_id = self.peers.get_my_id().to_owned();
-            match self.peers.get_mut_peer(&event.token()) {
+        if let Some(peer) = self.peers.get_mut_peer(&event.token()) {
-                None => {}
-                Some(peer) => {
             match peer.get_state().clone() {
                 State::Connecting => {
                     if send_client_handshake(peer.get_stream(), self.public_key.as_bytes()).is_err() {
@@ -420,9 +429,6 @@ impl Network {
             }
             registry.reregister(peer.get_stream(), event.token(), Interest::READABLE).unwrap();
         }
-            }
-        }
-
         true
     }
 

src/p2p/peers.rs

@@ -52,49 +52,48 @@ impl Peers {
     }
 
     pub fn close_peer(&mut self, registry: &Registry, token: &Token) {
-        let peer = self.peers.get_mut(token);
+        let peer = self.peers.remove(token);
-        if let Some(peer) = peer {
+        if let Some(mut peer) = peer {
             let stream = peer.get_stream();
             let _ = stream.shutdown(Shutdown::Both);
             let _ = registry.deregister(stream);
+            let addr = peer.get_addr();
             match peer.get_state() {
                 State::Connecting => {
-                    debug!("Peer connection {} to {:?} has timed out", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} has timed out", &token.0, &addr);
                 }
                 State::Connected => {
-                    debug!("Peer connection {} to {:?} disconnected", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} disconnected", &token.0, &addr);
                 }
                 State::Idle { .. } | State::Message { .. } => {
-                    debug!("Peer connection {} to {:?} disconnected", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} disconnected", &token.0, &addr);
                 }
                 State::Error => {
-                    debug!("Peer connection {} to {:?} has shut down on error", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} has shut down on error", &token.0, &addr);
                 }
                 State::Banned => {
-                    debug!("Peer connection {} to {:?} has shut down, banned", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} has shut down, banned", &token.0, &addr);
-                    self.ignored.insert(peer.get_addr().ip());
+                    self.ignored.insert(addr.ip());
                 }
                 State::Offline { .. } => {
-                    debug!("Peer connection {} to {:?} is offline", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} is offline", &token.0, &addr);
                 }
                 State::SendLoop => {
-                    debug!("Peer connection {} from {:?} is a loop", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} from {:?} is a loop", &token.0, &addr);
                 }
                 State::Loop => {
-                    debug!("Peer connection {} to {:?} is a loop", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} is a loop", &token.0, &addr);
                 }
                 State::Twin => {
-                    debug!("Peer connection {} to {:?} is a twin", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} to {:?} is a twin", &token.0, &addr);
                 }
                 State::ServerHandshake => {
-                    debug!("Peer connection {} from {:?} didn't shake hands", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} from {:?} didn't shake hands", &token.0, &addr);
                 }
                 State::HandshakeFinished => {
-                    debug!("Peer connection {} from {:?} shook hands, but then failed", &token.0, &peer.get_addr());
+                    debug!("Peer connection {} from {:?} shook hands, but then failed", &token.0, &addr);
                 }
             }
-
-            self.peers.remove(token);
         }
     }