Document 'DisconnectOldProtocol' call rationale in block processing.

furszy · furszy · commit 38d49eadf336 · 2021-07-21T17:28:25.000-03:00
Plus minor cleanup, removing unused parameter.
diff --git a/src/net.cpp b/src/net.cpp
@@ -417,14 +417,13 @@ void CNode::CloseSocketDisconnect()
     }
 }
 
-bool CNode::DisconnectOldProtocol(int nVersionIn, int nVersionRequired, std::string strLastCommand)
+bool CNode::DisconnectOldProtocol(int nVersionIn, int nVersionRequired)
 {
     fDisconnect = false;
     if (nVersionIn < nVersionRequired) {
         LogPrintf("%s : peer=%d using obsolete version %i; disconnecting\n", __func__, id, nVersionIn);
         fDisconnect = true;
     }
-
     return fDisconnect;
 }
 
diff --git a/src/net.h b/src/net.h
@@ -777,7 +777,7 @@ class CNode
     }
 
     void CloseSocketDisconnect();
-    bool DisconnectOldProtocol(int nVersionIn, int nVersionRequired, std::string strLastCommand = "");
+    bool DisconnectOldProtocol(int nVersionIn, int nVersionRequired);
 
     void copyStats(CNodeStats& stats);
 
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1112,8 +1112,9 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
             return false;
         }
 
-        if (pfrom->DisconnectOldProtocol(nVersion, ActiveProtocol(), strCommand))
+        if (pfrom->DisconnectOldProtocol(nVersion, ActiveProtocol())) {
             return false;
+        }
 
         if (nVersion == 10300)
             nVersion = 300;
@@ -1700,8 +1701,10 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
                     mapBlockSource.emplace(hashBlock, pfrom->GetId());
                 }
                 ProcessNewBlock(pblock, nullptr);
-                //disconnect this node if its old protocol version
-                pfrom->DisconnectOldProtocol(pfrom->nVersion, ActiveProtocol(), strCommand);
+
+                // Disconnect node if its running an old protocol version,
+                // used during upgrades, when the node is already connected.
+                pfrom->DisconnectOldProtocol(pfrom->nVersion, ActiveProtocol());
             } else {
                 LogPrint(BCLog::NET, "%s : Already processed block %s, skipping ProcessNewBlock()\n", __func__, pblock->GetHash().GetHex());
             }

Original file line number	Diff line number	Diff line change
`@@ -417,14 +417,13 @@ void CNode::CloseSocketDisconnect()`
`417`	`417`	`}`
`418`	`418`	`}`
`419`	`419`
`420`		`-bool CNode::DisconnectOldProtocol(int nVersionIn, int nVersionRequired, std::string strLastCommand)`
	`420`	`+bool CNode::DisconnectOldProtocol(int nVersionIn, int nVersionRequired)`
`421`	`421`	`{`
`422`	`422`	`fDisconnect = false;`
`423`	`423`	`if (nVersionIn < nVersionRequired) {`
`424`	`424`	`LogPrintf("%s : peer=%d using obsolete version %i; disconnecting\n", __func__, id, nVersionIn);`
`425`	`425`	`fDisconnect = true;`
`426`	`426`	`}`
`427`		`-`
`428`	`427`	`return fDisconnect;`
`429`	`428`	`}`
`430`	`429`
Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,7 @@ class CNode`
`777`	`777`	`}`
`778`	`778`
`779`	`779`	`void CloseSocketDisconnect();`
`780`		`- bool DisconnectOldProtocol(int nVersionIn, int nVersionRequired, std::string strLastCommand = "");`
	`780`	`+ bool DisconnectOldProtocol(int nVersionIn, int nVersionRequired);`
`781`	`781`
`782`	`782`	`void copyStats(CNodeStats& stats);`
`783`	`783`