Merge pull request #4388
3dc1464
add missing vhListenSocket.clear(); to CNetCleanup() (Philip Kaufmann)2831a03
remove unused CNode::Cleanup() (Philip Kaufmann)
This commit is contained in:
commit
52d4abfdef
|
@ -528,10 +528,6 @@ void CNode::CloseSocketDisconnect()
|
||||||
pnodeSync = NULL;
|
pnodeSync = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CNode::Cleanup()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CNode::PushVersion()
|
void CNode::PushVersion()
|
||||||
{
|
{
|
||||||
int nBestHeight = g_signals.GetHeight().get_value_or(0);
|
int nBestHeight = g_signals.GetHeight().get_value_or(0);
|
||||||
|
@ -777,7 +773,6 @@ void ThreadSocketHandler()
|
||||||
|
|
||||||
// close socket and cleanup
|
// close socket and cleanup
|
||||||
pnode->CloseSocketDisconnect();
|
pnode->CloseSocketDisconnect();
|
||||||
pnode->Cleanup();
|
|
||||||
|
|
||||||
// hold in disconnected pool until all refs are released
|
// hold in disconnected pool until all refs are released
|
||||||
if (pnode->fNetworkNode || pnode->fInbound)
|
if (pnode->fNetworkNode || pnode->fInbound)
|
||||||
|
@ -1793,6 +1788,7 @@ public:
|
||||||
delete pnode;
|
delete pnode;
|
||||||
vNodes.clear();
|
vNodes.clear();
|
||||||
vNodesDisconnected.clear();
|
vNodesDisconnected.clear();
|
||||||
|
vhListenSocket.clear();
|
||||||
delete semOutbound;
|
delete semOutbound;
|
||||||
semOutbound = NULL;
|
semOutbound = NULL;
|
||||||
delete pnodeLocalHost;
|
delete pnodeLocalHost;
|
||||||
|
|
|
@ -693,8 +693,6 @@ public:
|
||||||
void Subscribe(unsigned int nChannel, unsigned int nHops=0);
|
void Subscribe(unsigned int nChannel, unsigned int nHops=0);
|
||||||
void CancelSubscribe(unsigned int nChannel);
|
void CancelSubscribe(unsigned int nChannel);
|
||||||
void CloseSocketDisconnect();
|
void CloseSocketDisconnect();
|
||||||
void Cleanup();
|
|
||||||
|
|
||||||
|
|
||||||
// Denial-of-service detection/prevention
|
// Denial-of-service detection/prevention
|
||||||
// The idea is to detect peers that are behaving
|
// The idea is to detect peers that are behaving
|
||||||
|
|
Loading…
Reference in New Issue