phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-28 03:57:31 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gui: use the stored CSubNet entry when unbanning

Browse source 
The previous code visualized the `CSubNet` object as string, then
parsed that string back to `CSubNet`. This is sub-optimal given that
the original `CSubNet` object can be used directly instead.

This avoids calling `LookupSubNet()` from the GUI.

Co-authored-by: furszy <matiasfurszyfer@protonmail.com>
This commit is contained in:
Vasil Dimov 2023-03-06 12:49:39 +01:00
parent 40c6c85c05
commit a981af4e6f
No known key found for this signature in database
GPG key ID: 54DF06F64B55CBBF
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/qt/bantablemodel.cpp
View file

@ -178,3 +178,9 @@ bool BanTableModel::shouldShow()
{ {
return priv->size() > 0; return priv->size() > 0;
} }
bool BanTableModel::unban(const QModelIndex& index)
{
CCombinedBan* ban{static_cast<CCombinedBan*>(index.internalPointer())};
return ban != nullptr && m_node.unban(ban->subnet);
}

2
src/qt/bantablemodel.h
View file

@ -68,6 +68,8 @@ public:
bool shouldShow(); bool shouldShow();
bool unban(const QModelIndex& index);
public Q_SLOTS: public Q_SLOTS:
void refresh(); void refresh();

17
src/qt/rpcconsole.cpp
View file

@ -11,7 +11,6 @@
#include <chainparams.h> #include <chainparams.h>
#include <interfaces/node.h> #include <interfaces/node.h>
#include <netbase.h>
#include <qt/bantablemodel.h> #include <qt/bantablemodel.h>
#include <qt/clientmodel.h> #include <qt/clientmodel.h>
#include <qt/guiutil.h> #include <qt/guiutil.h>
@ -1308,17 +1307,13 @@ void RPCConsole::unbanSelectedNode()
// Get selected ban addresses // Get selected ban addresses
QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->banlistWidget, BanTableModel::Address); QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->banlistWidget, BanTableModel::Address);
for(int i = 0; i < nodes.count(); i++) BanTableModel* ban_table_model{clientModel->getBanTableModel()};
{ bool unbanned{false};
// Get currently selected ban address for (const auto& node_index : nodes) {
QString strNode = nodes.at(i).data().toString(); unbanned |= ban_table_model->unban(node_index);
CSubNet possibleSubnet;
LookupSubNet(strNode.toStdString(), possibleSubnet);
if (possibleSubnet.IsValid() && m_node.unban(possibleSubnet))
{
clientModel->getBanTableModel()->refresh();
} }
if (unbanned) {
ban_table_model->refresh();
} }
} }