diff --git a/src/net_processing.h b/src/net_processing.h --- a/src/net_processing.h +++ b/src/net_processing.h @@ -127,5 +127,11 @@ bool GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats); /** Increase a node's misbehavior score. */ void Misbehaving(NodeId nodeid, int howmuch, const std::string &message = ""); +/** overloaded variant of above to operate on CNode*s */ +static inline void Misbehaving(CNode *node, int howmuch, + const std::string &message = "") + EXCLUSIVE_LOCKS_REQUIRED(cs_main) { + Misbehaving(node->GetId(), howmuch, message); +} #endif // BITCOIN_NET_PROCESSING_H diff --git a/src/net_processing.cpp b/src/net_processing.cpp --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -963,12 +963,6 @@ } } -// overloaded variant of above to operate on CNode*s -static void Misbehaving(CNode *node, int howmuch, const std::string &message) - EXCLUSIVE_LOCKS_REQUIRED(cs_main) { - Misbehaving(node->GetId(), howmuch, message); -} - ////////////////////////////////////////////////////////////////////////////// // // blockchain -> download logic notification diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp --- a/src/test/denialofservice_tests.cpp +++ b/src/test/denialofservice_tests.cpp @@ -248,7 +248,7 @@ { LOCK(cs_main); // Should get banned. - Misbehaving(dummyNode1.GetId(), 100, ""); + Misbehaving(&dummyNode1, 100); } { LOCK2(cs_main, dummyNode1.cs_sendProcessing); @@ -267,7 +267,7 @@ dummyNode2.fSuccessfullyConnected = true; { LOCK(cs_main); - Misbehaving(dummyNode2.GetId(), 50, ""); + Misbehaving(&dummyNode2, 50); } { LOCK2(cs_main, dummyNode2.cs_sendProcessing); @@ -279,7 +279,7 @@ BOOST_CHECK(banman->IsBanned(addr1)); { LOCK(cs_main); - Misbehaving(dummyNode2.GetId(), 50, ""); + Misbehaving(&dummyNode2, 50); } { LOCK2(cs_main, dummyNode2.cs_sendProcessing); @@ -315,7 +315,7 @@ dummyNode1.fSuccessfullyConnected = true; { LOCK(cs_main); - Misbehaving(dummyNode1.GetId(), 100, ""); + Misbehaving(&dummyNode1, 100); } { LOCK2(cs_main, dummyNode1.cs_sendProcessing); @@ -324,7 +324,7 @@ BOOST_CHECK(!banman->IsBanned(addr1)); { LOCK(cs_main); - Misbehaving(dummyNode1.GetId(), 10, ""); + Misbehaving(&dummyNode1, 10); } { LOCK2(cs_main, dummyNode1.cs_sendProcessing); @@ -333,7 +333,7 @@ BOOST_CHECK(!banman->IsBanned(addr1)); { LOCK(cs_main); - Misbehaving(dummyNode1.GetId(), 1, ""); + Misbehaving(&dummyNode1, 1); } { LOCK2(cs_main, dummyNode1.cs_sendProcessing); @@ -372,7 +372,7 @@ { LOCK(cs_main); - Misbehaving(dummyNode.GetId(), 100, ""); + Misbehaving(&dummyNode, 100); } { LOCK2(cs_main, dummyNode.cs_sendProcessing);