Skip to content

Commit 80e2e9d

Browse files
theunitheuni
committed
net: drop unused connman param
The copy in PeerLogicValidation can be used instead.
1 parent 8ad663c commit 80e2e9d

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

‎src/net.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11101110
CNode* pnode = new CNode(id, nLocalServices, GetBestHeight(), hSocket, addr, CalculateKeyedNetGroup(addr), nonce, addr_bind, "", true);
11111111
pnode->AddRef();
11121112
pnode->fWhitelisted = whitelisted;
1113-
m_msgproc->InitializeNode(pnode, this);
1113+
m_msgproc->InitializeNode(pnode);
11141114

11151115
LogPrint(BCLog::NET, "connection from %s accepted\n", addr.ToString());
11161116

@@ -1962,7 +1962,7 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
19621962
if (fAddnode)
19631963
pnode->fAddnode = true;
19641964

1965-
m_msgproc->InitializeNode(pnode, this);
1965+
m_msgproc->InitializeNode(pnode);
19661966
{
19671967
LOCK(cs_vNodes);
19681968
vNodes.push_back(pnode);
@@ -1992,14 +1992,14 @@ void CConnman::ThreadMessageHandler()
19921992
continue;
19931993

19941994
// Receive messages
1995-
bool fMoreNodeWork = m_msgproc->ProcessMessages(pnode, this, flagInterruptMsgProc);
1995+
bool fMoreNodeWork = m_msgproc->ProcessMessages(pnode, flagInterruptMsgProc);
19961996
fMoreWork |= (fMoreNodeWork && !pnode->fPauseSend);
19971997
if (flagInterruptMsgProc)
19981998
return;
19991999
// Send messages
20002000
{
20012001
LOCK(pnode->cs_sendProcessing);
2002-
m_msgproc->SendMessages(pnode, this, flagInterruptMsgProc);
2002+
m_msgproc->SendMessages(pnode, flagInterruptMsgProc);
20032003
}
20042004

20052005
if (flagInterruptMsgProc)

‎src/net.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,9 @@ struct CombinerAll
446446
class NetEventsInterface
447447
{
448448
public:
449-
virtual bool ProcessMessages(CNode* pnode, CConnman* connman, std::atomic<bool>& interrupt) = 0;
450-
virtual bool SendMessages(CNode* pnode, CConnman* connman, std::atomic<bool>& interrupt) = 0;
451-
virtual void InitializeNode(CNode* pnode, CConnman* connman) = 0;
449+
virtual bool ProcessMessages(CNode* pnode, std::atomic<bool>& interrupt) = 0;
450+
virtual bool SendMessages(CNode* pnode, std::atomic<bool>& interrupt) = 0;
451+
virtual void InitializeNode(CNode* pnode) = 0;
452452
virtual void FinalizeNode(NodeId id, bool& update_connection_time) = 0;
453453
};
454454

‎src/net_processing.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<con
496496

497497
} // namespace
498498

499-
void PeerLogicValidation::InitializeNode(CNode *pnode, CConnman* connman) {
499+
void PeerLogicValidation::InitializeNode(CNode *pnode) {
500500
CAddress addr = pnode->addr;
501501
std::string addrName = pnode->GetAddrName();
502502
NodeId nodeid = pnode->GetId();
@@ -2640,7 +2640,7 @@ static bool SendRejectsAndCheckIfBanned(CNode* pnode, CConnman* connman)
26402640
return false;
26412641
}
26422642

2643-
bool PeerLogicValidation::ProcessMessages(CNode* pfrom, CConnman* connman, std::atomic<bool>& interruptMsgProc)
2643+
bool PeerLogicValidation::ProcessMessages(CNode* pfrom, std::atomic<bool>& interruptMsgProc)
26442644
{
26452645
const CChainParams& chainparams = Params();
26462646
//
@@ -2777,7 +2777,7 @@ class CompareInvMempoolOrder
27772777
}
27782778
};
27792779

2780-
bool PeerLogicValidation::SendMessages(CNode* pto, CConnman* connman, std::atomic<bool>& interruptMsgProc)
2780+
bool PeerLogicValidation::SendMessages(CNode* pto, std::atomic<bool>& interruptMsgProc)
27812781
{
27822782
const Consensus::Params& consensusParams = Params().GetConsensus();
27832783
{

‎src/net_processing.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,18 @@ class PeerLogicValidation : public CValidationInterface, public NetEventsInterfa
3535
void NewPoWValidBlock(const CBlockIndex *pindex, const std::shared_ptr<const CBlock>& pblock) override;
3636

3737

38-
void InitializeNode(CNode* pnode, CConnman* connman) override;
38+
void InitializeNode(CNode* pnode) override;
3939
void FinalizeNode(NodeId nodeid, bool& fUpdateConnectionTime) override;
4040
/** Process protocol messages received from a given node */
41-
bool ProcessMessages(CNode* pfrom, CConnman* connman, std::atomic<bool>& interrupt) override;
41+
bool ProcessMessages(CNode* pfrom, std::atomic<bool>& interrupt) override;
4242
/**
4343
* Send queued protocol messages to be sent to a give node.
4444
*
4545
* @param[in] pto The node which we are sending messages to.
46-
* @param[in] connman The connection manager for that node.
4746
* @param[in] interrupt Interrupt condition for processing threads
4847
* @return True if there is more work to be done
4948
*/
50-
bool SendMessages(CNode* pto, CConnman* connman, std::atomic<bool>& interrupt) override;
49+
bool SendMessages(CNode* pto, std::atomic<bool>& interrupt) override;
5150
};
5251

5352
struct CNodeStateStats {

‎src/test/DoS_tests.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,26 @@ BOOST_AUTO_TEST_CASE(DoS_banning)
5050
CAddress addr1(ip(0xa0b0c001), NODE_NONE);
5151
CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 0, 0, CAddress(), "", true);
5252
dummyNode1.SetSendVersion(PROTOCOL_VERSION);
53-
peerLogic->InitializeNode(&dummyNode1, connman);
53+
peerLogic->InitializeNode(&dummyNode1);
5454
dummyNode1.nVersion = 1;
5555
dummyNode1.fSuccessfullyConnected = true;
5656
Misbehaving(dummyNode1.GetId(), 100); // Should get banned
57-
peerLogic->SendMessages(&dummyNode1, connman, interruptDummy);
57+
peerLogic->SendMessages(&dummyNode1, interruptDummy);
5858
BOOST_CHECK(connman->IsBanned(addr1));
5959
BOOST_CHECK(!connman->IsBanned(ip(0xa0b0c001|0x0000ff00))); // Different IP, not banned
6060

6161
CAddress addr2(ip(0xa0b0c002), NODE_NONE);
6262
CNode dummyNode2(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr2, 1, 1, CAddress(), "", true);
6363
dummyNode2.SetSendVersion(PROTOCOL_VERSION);
64-
peerLogic->InitializeNode(&dummyNode2, connman);
64+
peerLogic->InitializeNode(&dummyNode2);
6565
dummyNode2.nVersion = 1;
6666
dummyNode2.fSuccessfullyConnected = true;
6767
Misbehaving(dummyNode2.GetId(), 50);
68-
peerLogic->SendMessages(&dummyNode2, connman, interruptDummy);
68+
peerLogic->SendMessages(&dummyNode2, interruptDummy);
6969
BOOST_CHECK(!connman->IsBanned(addr2)); // 2 not banned yet...
7070
BOOST_CHECK(connman->IsBanned(addr1)); // ... but 1 still should be
7171
Misbehaving(dummyNode2.GetId(), 50);
72-
peerLogic->SendMessages(&dummyNode2, connman, interruptDummy);
72+
peerLogic->SendMessages(&dummyNode2, interruptDummy);
7373
BOOST_CHECK(connman->IsBanned(addr2));
7474
}
7575

@@ -82,17 +82,17 @@ BOOST_AUTO_TEST_CASE(DoS_banscore)
8282
CAddress addr1(ip(0xa0b0c001), NODE_NONE);
8383
CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, 1, CAddress(), "", true);
8484
dummyNode1.SetSendVersion(PROTOCOL_VERSION);
85-
peerLogic->InitializeNode(&dummyNode1, connman);
85+
peerLogic->InitializeNode(&dummyNode1);
8686
dummyNode1.nVersion = 1;
8787
dummyNode1.fSuccessfullyConnected = true;
8888
Misbehaving(dummyNode1.GetId(), 100);
89-
peerLogic->SendMessages(&dummyNode1, connman, interruptDummy);
89+
peerLogic->SendMessages(&dummyNode1, interruptDummy);
9090
BOOST_CHECK(!connman->IsBanned(addr1));
9191
Misbehaving(dummyNode1.GetId(), 10);
92-
peerLogic->SendMessages(&dummyNode1, connman, interruptDummy);
92+
peerLogic->SendMessages(&dummyNode1, interruptDummy);
9393
BOOST_CHECK(!connman->IsBanned(addr1));
9494
Misbehaving(dummyNode1.GetId(), 1);
95-
peerLogic->SendMessages(&dummyNode1, connman, interruptDummy);
95+
peerLogic->SendMessages(&dummyNode1, interruptDummy);
9696
BOOST_CHECK(connman->IsBanned(addr1));
9797
gArgs.ForceSetArg("-banscore", std::to_string(DEFAULT_BANSCORE_THRESHOLD));
9898
}
@@ -108,12 +108,12 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
108108
CAddress addr(ip(0xa0b0c001), NODE_NONE);
109109
CNode dummyNode(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr, 4, 4, CAddress(), "", true);
110110
dummyNode.SetSendVersion(PROTOCOL_VERSION);
111-
peerLogic->InitializeNode(&dummyNode, connman);
111+
peerLogic->InitializeNode(&dummyNode);
112112
dummyNode.nVersion = 1;
113113
dummyNode.fSuccessfullyConnected = true;
114114

115115
Misbehaving(dummyNode.GetId(), 100);
116-
peerLogic->SendMessages(&dummyNode, connman, interruptDummy);
116+
peerLogic->SendMessages(&dummyNode, interruptDummy);
117117
BOOST_CHECK(connman->IsBanned(addr));
118118

119119
SetMockTime(nStartTime+60*60);

0 commit comments

Comments
 (0)