Skip to content

Commit 229ac18

Browse files
committed
net: Combine two loops into one, and update comments
1 parent a3d090d commit 229ac18

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/net.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2635,20 +2635,20 @@ void CConnman::StopNodes()
26352635
}
26362636
}
26372637

2638-
// Close sockets
2638+
// Delete peer connections.
26392639
std::vector<CNode*> nodes;
26402640
WITH_LOCK(cs_vNodes, nodes.swap(vNodes));
2641-
for (CNode* pnode : nodes)
2641+
for (CNode* pnode : nodes) {
26422642
pnode->CloseSocketDisconnect();
2643+
DeleteNode(pnode);
2644+
}
2645+
2646+
// Close listening sockets.
26432647
for (ListenSocket& hListenSocket : vhListenSocket)
26442648
if (hListenSocket.socket != INVALID_SOCKET)
26452649
if (!CloseSocket(hListenSocket.socket))
26462650
LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError()));
26472651

2648-
// clean up some globals (to help leak detection)
2649-
for (CNode* pnode : nodes) {
2650-
DeleteNode(pnode);
2651-
}
26522652
for (CNode* pnode : vNodesDisconnected) {
26532653
DeleteNode(pnode);
26542654
}

0 commit comments

Comments
 (0)