From aab4f000b5c0940332ad9468765843039efa9c52 Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@googlemail.com>
Date: Sat, 24 Oct 2020 22:59:14 +0200
Subject: [PATCH] Improve logging

---
 src/cloud.rs       | 22 +++++++++++++++-------
 src/crypto/core.rs |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/cloud.rs b/src/cloud.rs
index 35aa29a..053eede 100644
--- a/src/cloud.rs
+++ b/src/cloud.rs
@@ -353,7 +353,7 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
             }
         }
         for addr in del {
-            info!("Forgot peer: {}", addr_nice(addr));
+            info!("Forgot peer {} due to timeout", addr_nice(addr));
             self.peers.remove(&addr);
             self.table.remove_claims(addr);
             self.connect_sock(addr)?; // Try to reconnect
@@ -707,14 +707,20 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
         } else if is_init_message(data.message()) {
             let mut init = self.crypto.peer_instance(self.create_node_info());
             let msg_result = init.handle_message(data);
-            if msg_result.is_ok() {
-                self.pending_inits.insert(src, init);
+            match msg_result {
+                Ok(res) => {
+                    self.pending_inits.insert(src, init);
+                    Ok(res)
+                }
+                Err(err) => {
+                    warn!("Error in init message from peer {}: {}", addr_nice(src), err);
+                    return Ok(())
+                }
             }
-            msg_result
         } else if let Some(peer) = self.peers.get_mut(&src) {
             peer.crypto.handle_message(data)
         } else {
-            error!("Received non-init message from unknown peer {}", addr_nice(src));
+            info!("Ignoring non-init message from unknown peer {}", addr_nice(src));
             return Ok(())
         };
         match msg_result {
@@ -737,10 +743,12 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
         let src = try_fail!(self.socket.receive(buffer), "Failed to read from network socket: {}");
         self.traffic.count_in_traffic(src, buffer.len());
         if let Err(e) = self.handle_net_message(src, buffer) {
-            error!("Error: {}", e);
             if let Error::CryptoInit(_) = e {
-                info!("Closing pending connection to {} due to error", addr_nice(src));
+                debug!("Crypto init error: {}", e);
+                info!("Closing pending connection to {} due to error in crypto init", addr_nice(src));
                 self.pending_inits.remove(&src);
+            } else {
+                error!("Error: {}", e);
             }
         }
     }
diff --git a/src/crypto/core.rs b/src/crypto/core.rs
index afd80c5..c863124 100644
--- a/src/crypto/core.rs
+++ b/src/crypto/core.rs
@@ -174,7 +174,7 @@ impl CryptoCore {
         tag_space.clone_from_slice(tag.as_ref());
     }
 
-    fn decrypt_with_key<'a>(key: &mut CryptoKey, nonce: Nonce, data_and_tag: &'a mut [u8]) -> Result<(), Error> {
+    fn decrypt_with_key(key: &mut CryptoKey, nonce: Nonce, data_and_tag: &mut [u8]) -> Result<(), Error> {
         if nonce < key.min_nonce {
             return Err(Error::Crypto("Old nonce rejected"))
         }