github
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
1
Fork 0
Code Releases Activity

refactor: Rename Node::disconnect methods 

Avoid overloading method name to work more easily with IPC framework
This commit is contained in:
Russell Yanofsky 2017-12-05 15:57:12 -05:00
parent 77e4b06572
commit 1c2ab1a6d2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/node.cpp
View File

@ -152,14 +152,14 @@ public:
}
return false;
}
bool disconnect(const CNetAddr& net_addr) override
bool disconnectByAddress(const CNetAddr& net_addr) override
{
if (m_context.connman) {
return m_context.connman->DisconnectNode(net_addr);
}
return false;
}
bool disconnect(NodeId id) override
bool disconnectById(NodeId id) override
{
if (m_context.connman) {
return m_context.connman->DisconnectNode(id);

4
src/interfaces/node.h
View File

@ -124,10 +124,10 @@ public:
virtual bool unban(const CSubNet& ip) = 0;
//! Disconnect node by address.
virtual bool disconnect(const CNetAddr& net_addr) = 0;
virtual bool disconnectByAddress(const CNetAddr& net_addr) = 0;
//! Disconnect node by id.
virtual bool disconnect(NodeId id) = 0;
virtual bool disconnectById(NodeId id) = 0;
//! Get total bytes recv.
virtual int64_t getTotalBytesRecv() = 0;

4
src/qt/rpcconsole.cpp
View File

@ -1191,7 +1191,7 @@ void RPCConsole::disconnectSelectedNode()
// Get currently selected peer address
NodeId id = nodes.at(i).data().toLongLong();
// Find the node, disconnect it and clear the selected node
if(m_node.disconnect(id))
if(m_node.disconnectById(id))
clearSelectedNode();
}
}
@ -1216,7 +1216,7 @@ void RPCConsole::banSelectedNode(int bantime)
const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);
if (stats) {
m_node.ban(stats->nodeStats.addr, BanReasonManuallyAdded, bantime);
m_node.disconnect(stats->nodeStats.addr);
m_node.disconnectByAddress(stats->nodeStats.addr);
}
}
clearSelectedNode();