gui: fix ban from qt console
Rather than doing a circle and re-resolving the node's IP, just use the one from nodestats directly. This requires syncing the addr field from CNode.
This commit is contained in:
parent
d7615af34e
commit
cb78c60534
3 changed files with 16 additions and 13 deletions
|
@ -629,6 +629,7 @@ void CNode::copyStats(CNodeStats &stats)
|
|||
{
|
||||
stats.nodeid = this->GetId();
|
||||
X(nServices);
|
||||
X(addr);
|
||||
X(fRelayTxes);
|
||||
X(nLastSend);
|
||||
X(nLastRecv);
|
||||
|
|
|
@ -505,6 +505,7 @@ public:
|
|||
double dPingWait;
|
||||
double dPingMin;
|
||||
std::string addrLocal;
|
||||
CAddress addr;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -981,20 +981,21 @@ void RPCConsole::banSelectedNode(int bantime)
|
|||
if (!clientModel || !g_connman)
|
||||
return;
|
||||
|
||||
// Get currently selected peer address
|
||||
QString strNode = GUIUtil::getEntryData(ui->peerWidget, 0, PeerTableModel::Address).toString();
|
||||
// Find possible nodes, ban it and clear the selected node
|
||||
std::string nStr = strNode.toStdString();
|
||||
std::string addr;
|
||||
int port = 0;
|
||||
SplitHostPort(nStr, port, addr);
|
||||
|
||||
CNetAddr resolved;
|
||||
if(!LookupHost(addr.c_str(), resolved, false))
|
||||
if(cachedNodeid == -1)
|
||||
return;
|
||||
g_connman->Ban(resolved, BanReasonManuallyAdded, bantime);
|
||||
clearSelectedNode();
|
||||
clientModel->getBanTableModel()->refresh();
|
||||
|
||||
// Get currently selected peer address
|
||||
int detailNodeRow = clientModel->getPeerTableModel()->getRowByNodeId(cachedNodeid);
|
||||
if(detailNodeRow < 0)
|
||||
return;
|
||||
|
||||
// Find possible nodes, ban it and clear the selected node
|
||||
const CNodeCombinedStats *stats = clientModel->getPeerTableModel()->getNodeStats(detailNodeRow);
|
||||
if(stats) {
|
||||
g_connman->Ban(stats->nodeStats.addr, BanReasonManuallyAdded, bantime);
|
||||
clearSelectedNode();
|
||||
clientModel->getBanTableModel()->refresh();
|
||||
}
|
||||
}
|
||||
|
||||
void RPCConsole::unbanSelectedNode()
|
||||
|
|
Loading…
Reference in a new issue