diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-10-04 15:39:22 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-10-04 15:39:26 +0200 |
| commit | cce151317909ab8eb56d3e5da522f43c7d7db077 (patch) | |
| tree | 36310bead26c3992f4375a38a4f434af0cce6721 | |
| parent | f0fd132226211465d41ce4a29681d75438c045a8 (diff) | |
| parent | 675e55e01392971aa56bda56cb09498b466d0902 (diff) | |
Merge #19723: Ignore unknown messages before VERACK
675e55e01392971aa56bda56cb09498b466d0902 Ignore unknown messages before VERACK (Suhas Daftuar)
Pull request description:
This allows for feature negotiation to take place with messages between VERSION and VERACK in the future, without requiring additional software changes to specifically ignore messages for features that are unimplemented by our software.
ACKs for top commit:
sipa:
utACK 675e55e01392971aa56bda56cb09498b466d0902
practicalswift:
ACK 675e55e01392971aa56bda56cb09498b466d0902: patch looks correct
MarcoFalke:
ACK 675e55e01392971aa56bda56cb09498b466d0902
hebasto:
ACK 675e55e01392971aa56bda56cb09498b466d0902, the offender peer will be eventually disconnected due to the timeout.
Tree-SHA512: 8d2b1d8b9843f2ee26b2c30f7c5ff0bfcfbe3f46b32cd0369c48ece26624151091237e83ce3f18c6da004099026602cfab1642ac916db777f047d170b365c007
| -rw-r--r-- | src/net_processing.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 9603d098a4..2634dccd45 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2604,8 +2604,7 @@ void PeerManager::ProcessMessage(CNode& pfrom, const std::string& msg_type, CDat } if (!pfrom.fSuccessfullyConnected) { - // Must have a verack message before anything else - Misbehaving(pfrom.GetId(), 1, "non-verack message before version handshake"); + LogPrint(BCLog::NET, "Unsupported message \"%s\" prior to verack from peer=%d\n", SanitizeString(msg_type), pfrom.GetId()); return; } |