From 229ac1892d807a1eea5a7c24ae0fe27dc913b1bd Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Mon, 12 Apr 2021 14:54:58 +0300 Subject: net: Combine two loops into one, and update comments --- src/net.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 65f8b8baec..2cb95516a4 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2635,20 +2635,20 @@ void CConnman::StopNodes() } } - // Close sockets + // Delete peer connections. std::vector nodes; WITH_LOCK(cs_vNodes, nodes.swap(vNodes)); - for (CNode* pnode : nodes) + for (CNode* pnode : nodes) { pnode->CloseSocketDisconnect(); + DeleteNode(pnode); + } + + // Close listening sockets. for (ListenSocket& hListenSocket : vhListenSocket) if (hListenSocket.socket != INVALID_SOCKET) if (!CloseSocket(hListenSocket.socket)) LogPrintf("CloseSocket(hListenSocket) failed with error %s\n", NetworkErrorString(WSAGetLastError())); - // clean up some globals (to help leak detection) - for (CNode* pnode : nodes) { - DeleteNode(pnode); - } for (CNode* pnode : vNodesDisconnected) { DeleteNode(pnode); } -- cgit v1.2.3