net_processing, fix circ dependency: evo/mnauth -> llmq/quorums_utils -> spork -> net_processing -> evo/mnauth

furszy · furszy · commit 1836bc7b5f88 · 2021-12-14T11:27:22.000-03:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -1923,14 +1923,18 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         if (std::find(allMessages.begin(), allMessages.end(), strCommand) != allMessages.end()) {
             // Check if the dispatcher can process this message first. If not, try going with the old flow.
             if (!masternodeSync.MessageDispatcher(pfrom, strCommand, vRecv)) {
-                // Probably one the extensions
+                // Probably one the extensions, future: encapsulate all of this inside tiertwo_networksync.
                 int dosScore{0};
                 if (!mnodeman.ProcessMessage(pfrom, strCommand, vRecv, dosScore)) {
                     WITH_LOCK(cs_main, Misbehaving(pfrom->GetId(), dosScore));
+                    return false;
                 }
                 g_budgetman.ProcessMessage(pfrom, strCommand, vRecv);
                 masternodePayments.ProcessMessageMasternodePayments(pfrom, strCommand, vRecv);
-                sporkManager.ProcessSpork(pfrom, strCommand, vRecv);
+                if (!sporkManager.ProcessSpork(pfrom, strCommand, vRecv, dosScore)) {
+                    WITH_LOCK(cs_main, Misbehaving(pfrom->GetId(), dosScore));
+                    return false;
+                }
             }
         } else {
             // Ignore unknown commands for extensibility
diff --git a/src/spork.cpp b/src/spork.cpp
@@ -6,7 +6,6 @@
 #include "spork.h"
 
 #include "netmessagemaker.h"
-#include "net_processing.h"
 #include "sporkdb.h"
 #include "validation.h"
 
@@ -85,20 +84,18 @@ void CSporkManager::LoadSporksFromDB()
     }
 }
 
-void CSporkManager::ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv)
+bool CSporkManager::ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv, int& dosScore)
 {
-    if (fLiteMode) return; // disable all masternode related functionality
+    if (fLiteMode) return true; // disable all masternode related functionality
 
     if (strCommand == NetMsgType::SPORK) {
-        int banScore = ProcessSporkMsg(vRecv);
-        if (banScore > 0) {
-            LOCK(cs_main);
-            Misbehaving(pfrom->GetId(), banScore);
-        }
+        dosScore = ProcessSporkMsg(vRecv);
+        return dosScore == 0;
     }
     if (strCommand == NetMsgType::GETSPORKS) {
         ProcessGetSporks(pfrom, strCommand, vRecv);
     }
+    return true;
 }
 
 int CSporkManager::ProcessSporkMsg(CDataStream& vRecv)
diff --git a/src/spork.h b/src/spork.h
@@ -84,7 +84,7 @@ class CSporkManager
     void Clear();
     void LoadSporksFromDB();
 
-    void ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv);
+    bool ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv, int& dosScore);
     int64_t GetSporkValue(SporkId nSporkID);
     // Create/Sign/Relay the spork message, and update the maps
     bool UpdateSpork(SporkId nSporkID, int64_t nValue);

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`#include "spork.h"`
`7`	`7`
`8`	`8`	`#include "netmessagemaker.h"`
`9`		`-#include "net_processing.h"`
`10`	`9`	`#include "sporkdb.h"`
`11`	`10`	`#include "validation.h"`
`12`	`11`
`@@ -85,20 +84,18 @@ void CSporkManager::LoadSporksFromDB()`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`
`88`		`-void CSporkManager::ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv)`
	`87`	`+bool CSporkManager::ProcessSpork(CNode* pfrom, std::string& strCommand, CDataStream& vRecv, int& dosScore)`
`89`	`88`	`{`
`90`		`- if (fLiteMode) return; // disable all masternode related functionality`
	`89`	`+ if (fLiteMode) return true; // disable all masternode related functionality`
`91`	`90`
`92`	`91`	`if (strCommand == NetMsgType::SPORK) {`
`93`		`- int banScore = ProcessSporkMsg(vRecv);`
`94`		`- if (banScore > 0) {`
`95`		`- LOCK(cs_main);`
`96`		`- Misbehaving(pfrom->GetId(), banScore);`
`97`		`- }`
	`92`	`+ dosScore = ProcessSporkMsg(vRecv);`
	`93`	`+ return dosScore == 0;`
`98`	`94`	`}`
`99`	`95`	`if (strCommand == NetMsgType::GETSPORKS) {`
`100`	`96`	`ProcessGetSporks(pfrom, strCommand, vRecv);`
`101`	`97`	`}`
	`98`	`+ return true;`
`102`	`99`	`}`
`103`	`100`
`104`	`101`	`int CSporkManager::ProcessSporkMsg(CDataStream& vRecv)`