highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 22:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4388

Browse Source 
3dc1464 add missing vhListenSocket.clear(); to CNetCleanup() (Philip Kaufmann)
2831a03 remove unused CNode::Cleanup() (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan
2014-06-23 10:21:32 +02:00
parent bfb55dd586 3dc1464f0a
commit 52d4abfdef
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net.cpp
View File

@@ -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;

2
src/net.h
View File

@@ -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