From 8e709bfa88f8b1b2b798b5c3d53e72b9d81919d9 Mon Sep 17 00:00:00 2001
From: Henry de Valence <hdevalence@hdevalence.ca>
Date: Tue, 22 Sep 2020 11:28:32 -0700
Subject: [PATCH] network: don't fail on unsolicited messages

These messages might be unsolicited, or they might be a response to a
request we already canceled.  So don't fail the whole connection, just
drop the message and move on.
---
 zebra-network/src/peer/connection.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/zebra-network/src/peer/connection.rs b/zebra-network/src/peer/connection.rs
index a97579a2..48932489 100644
--- a/zebra-network/src/peer/connection.rs
+++ b/zebra-network/src/peer/connection.rs
@@ -582,25 +582,26 @@ where
             }
             // These messages should already be handled as a response if they
             // could be a response, so if we see them here, they were either
-            // sent unsolicited, or we've failed to handle messages correctly.
+            // sent unsolicited, or they were sent in response to a canceled request
+            // that we've already forgotten about.
             Message::Reject { .. } => {
-                self.fail_with(PeerError::WrongMessage("unsolicited reject message"));
+                tracing::debug!("got reject message unsolicited or from canceled request");
                 return;
             }
             Message::NotFound { .. } => {
-                self.fail_with(PeerError::WrongMessage("unsolicited notfound message"));
+                tracing::debug!("got notfound message unsolicited or from canceled request");
                 return;
             }
             Message::Pong(_) => {
-                self.fail_with(PeerError::WrongMessage("unsolicited pong message"));
+                tracing::debug!("got pong message unsolicited or from canceled request");
                 return;
             }
             Message::Block(_) => {
-                self.fail_with(PeerError::WrongMessage("unsolicited block message"));
+                tracing::debug!("got block message unsolicited or from canceled request");
                 return;
             }
             Message::Headers(_) => {
-                self.fail_with(PeerError::WrongMessage("unsolicited headers message"));
+                tracing::debug!("got headers message unsolicited or from canceled request");
                 return;
             }
             // These messages should never be sent by peers.