Remove redundant message network magic check

jonasschnelli · jonasschnelli · commit c749b1347ed1 · 2019-01-17T21:33:18.000-10:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -3015,12 +3015,6 @@ bool PeerLogicValidation::ProcessMessages(CNode* pfrom, std::atomic<bool>& inter
     CNetMessage& msg(msgs.front());
 
     msg.SetVersion(pfrom->GetRecvVersion());
-    // Scan for message start
-    if (memcmp(msg.hdr.pchMessageStart, chainparams.MessageStart(), CMessageHeader::MESSAGE_START_SIZE) != 0) {
-        LogPrint(BCLog::NET, "PROCESSMESSAGE: INVALID MESSAGESTART %s peer=%d\n", SanitizeString(msg.hdr.GetCommand()), pfrom->GetId());
-        pfrom->fDisconnect = true;
-        return false;
-    }
 
     // Read header
     CMessageHeader& hdr = msg.hdr;
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -101,8 +101,10 @@ std::string CMessageHeader::GetCommand() const
 bool CMessageHeader::IsValid(const MessageStartChars& pchMessageStartIn) const
 {
     // Check start string
-    if (memcmp(pchMessageStart, pchMessageStartIn, MESSAGE_START_SIZE) != 0)
+    if (memcmp(pchMessageStart, pchMessageStartIn, MESSAGE_START_SIZE) != 0) {
+        LogPrint(BCLog::NET, "INVALID MESSAGESTART %s\n", SanitizeString(GetCommand()));
         return false;
+    }
 
     // Check the command string for errors
     for (const char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)
