Skip to content

Commit edb5350

Browse files
committed
Move NotifyNumConnectionsChanged logic to private method.
1 parent 2f7ae35 commit edb5350

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

src/net.cpp

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,9 +1153,22 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
11531153
}
11541154
}
11551155

1156+
void CConnman::NotifyNumConnectionsChanged()
1157+
{
1158+
size_t vNodesSize;
1159+
{
1160+
LOCK(cs_vNodes);
1161+
vNodesSize = vNodes.size();
1162+
}
1163+
if(vNodesSize != nPrevNodeCount) {
1164+
nPrevNodeCount = vNodesSize;
1165+
if(clientInterface)
1166+
clientInterface->NotifyNumConnectionsChanged(vNodesSize);
1167+
}
1168+
}
1169+
11561170
void CConnman::ThreadSocketHandler()
11571171
{
1158-
unsigned int nPrevNodeCount = 0;
11591172
while (!interruptNet)
11601173
{
11611174
//
@@ -1219,16 +1232,7 @@ void CConnman::ThreadSocketHandler()
12191232
}
12201233
}
12211234
}
1222-
size_t vNodesSize;
1223-
{
1224-
LOCK(cs_vNodes);
1225-
vNodesSize = vNodes.size();
1226-
}
1227-
if(vNodesSize != nPrevNodeCount) {
1228-
nPrevNodeCount = vNodesSize;
1229-
if(clientInterface)
1230-
clientInterface->NotifyNumConnectionsChanged(vNodesSize);
1231-
}
1235+
NotifyNumConnectionsChanged();
12321236

12331237
//
12341238
// Find which sockets have data to receive
@@ -2217,6 +2221,7 @@ CConnman::CConnman(uint64_t nSeed0In, uint64_t nSeed1In) : nSeed0(nSeed0In), nSe
22172221
setBannedIsDirty = false;
22182222
fAddressesInitialized = false;
22192223
nLastNodeId = 0;
2224+
nPrevNodeCount = 0;
22202225
nSendBufferMaxSize = 0;
22212226
nReceiveFloodSize = 0;
22222227
flagInterruptMsgProc = false;

src/net.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ class CConnman
336336
void ThreadOpenConnections(std::vector<std::string> connect);
337337
void ThreadMessageHandler();
338338
void AcceptConnection(const ListenSocket& hListenSocket);
339+
void NotifyNumConnectionsChanged();
339340
void ThreadSocketHandler();
340341
void ThreadDNSAddressSeed();
341342

@@ -406,6 +407,7 @@ class CConnman
406407
std::list<CNode*> vNodesDisconnected;
407408
mutable CCriticalSection cs_vNodes;
408409
std::atomic<NodeId> nLastNodeId;
410+
unsigned int nPrevNodeCount;
409411

410412
/** Services this instance offers */
411413
ServiceFlags nLocalServices;

0 commit comments

Comments
 (0)