Merge bitcoin-core/gui#717: Use the stored CSubNet entry when unbanning

hebasto · hebasto · commit 9985013350a2 · 2023-03-09T13:49:22.000Z
4be57a5 gui: fix comments for BanTableModel and BanTablePriv::refreshBanlist() (Vasil Dimov) a981af4 gui: use the stored CSubNet entry when unbanning (Vasil Dimov) Pull request description: 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. ACKs for top commit: furszy: utACK 4be57a5 mzumsande: Tested ACK 4be57a5 Tree-SHA512: b783c18c9d676aa9486cff2d27039dd5c5ef3f1cc67e5056a2be68e35930926f368f26dacdf4f3d394a1f73e3e28f42dc8a6936cd1765c6e6e60695c7b4d78af
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
@@ -43,7 +43,7 @@ class BanTablePriv
     /** Order (ascending or descending) to sort nodes by */
     Qt::SortOrder sortOrder;
 
-    /** Pull a full list of banned nodes from CNode into our cache */
+    /** Pull a full list of banned nodes from interfaces::Node into our cache */
     void refreshBanlist(interfaces::Node& node)
     {
         banmap_t banMap;
@@ -178,3 +178,9 @@ bool BanTableModel::shouldShow()
 {
     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);
+}
diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h
@@ -37,7 +37,7 @@ class BannedNodeLessThan
 };
 
 /**
-   Qt model providing information about connected peers, similar to the
+   Qt model providing information about banned peers, similar to the
    "getpeerinfo" RPC call. Used by the rpc console UI.
  */
 class BanTableModel : public QAbstractTableModel
@@ -68,6 +68,8 @@ class BanTableModel : public QAbstractTableModel
 
     bool shouldShow();
 
+    bool unban(const QModelIndex& index);
+
 public Q_SLOTS:
     void refresh();
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -11,7 +11,6 @@
 
 #include <chainparams.h>
 #include <interfaces/node.h>
-#include <netbase.h>
 #include <qt/bantablemodel.h>
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
@@ -1308,17 +1307,13 @@ void RPCConsole::unbanSelectedNode()
 
     // Get selected ban addresses
     QList<QModelIndex> nodes = GUIUtil::getEntryData(ui->banlistWidget, BanTableModel::Address);
-    for(int i = 0; i < nodes.count(); i++)
-    {
-        // Get currently selected ban address
-        QString strNode = nodes.at(i).data().toString();
-        CSubNet possibleSubnet;
-
-        LookupSubNet(strNode.toStdString(), possibleSubnet);
-        if (possibleSubnet.IsValid() && m_node.unban(possibleSubnet))
-        {
-            clientModel->getBanTableModel()->refresh();
-        }
+    BanTableModel* ban_table_model{clientModel->getBanTableModel()};
+    bool unbanned{false};
+    for (const auto& node_index : nodes) {
+        unbanned |= ban_table_model->unban(node_index);
+    }
+    if (unbanned) {
+        ban_table_model->refresh();
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class BanTablePriv`
`43`	`43`	`/** Order (ascending or descending) to sort nodes by */`
`44`	`44`	`Qt::SortOrder sortOrder;`
`45`	`45`
`46`		`- /** Pull a full list of banned nodes from CNode into our cache */`
	`46`	`+ /** Pull a full list of banned nodes from interfaces::Node into our cache */`
`47`	`47`	`void refreshBanlist(interfaces::Node& node)`
`48`	`48`	`{`
`49`	`49`	`banmap_t banMap;`
`@@ -178,3 +178,9 @@ bool BanTableModel::shouldShow()`
`178`	`178`	`{`
`179`	`179`	`return priv->size() > 0;`
`180`	`180`	`}`
	`181`	`+`
	`182`	`+bool BanTableModel::unban(const QModelIndex& index)`
	`183`	`+{`
	`184`	`+ CCombinedBan* ban{static_cast<CCombinedBan*>(index.internalPointer())};`
	`185`	`+ return ban != nullptr && m_node.unban(ban->subnet);`
	`186`	`+}`