Merge pull request #1537 from jamescowens/new_banning_system_time_decay

New banning misbehavior handling and Peers Tab on Debug Console

Author: jamescowens

src/Makefile.qt.include

@@ -91,6 +91,7 @@ QT_MOC_CPP = \
   qt/moc_addressbookpage.cpp \
   qt/moc_addresstablemodel.cpp \
   qt/moc_askpassphrasedialog.cpp \
+  qt/moc_bantablemodel.cpp \
   qt/moc_bitcoinaddressvalidator.cpp \
   qt/moc_bitcoinamountfield.cpp \
   qt/moc_bitcoingui.cpp \
@@ -109,6 +110,7 @@ QT_MOC_CPP = \
   qt/moc_optionsdialog.cpp \
   qt/moc_optionsmodel.cpp \
   qt/moc_overviewpage.cpp \
+  qt/moc_peertablemodel.cpp \
   qt/moc_qvalidatedlineedit.cpp \
   qt/moc_qvaluecombobox.cpp \
   qt/moc_rpcconsole.cpp \
@@ -142,6 +144,7 @@ GRIDCOINRESEARCH_QT_H = \
   qt/addressbookpage.h \
   qt/addresstablemodel.h \
   qt/askpassphrasedialog.h \
+  qt/bantablemodel.h \
   qt/bitcoinaddressvalidator.h \
   qt/bitcoinamountfield.h \
   qt/bitcoingui.h \
@@ -162,6 +165,7 @@ GRIDCOINRESEARCH_QT_H = \
   qt/optionsdialog.h \
   qt/optionsmodel.h \
   qt/overviewpage.h \
+  qt/peertablemodel.h \
   qt/qtipcserver.h \
   qt/qvalidatedlineedit.h \
   qt/qvaluecombobox.h \
@@ -185,6 +189,7 @@ GRIDCOINRESEARCH_QT_CPP = \
   qt/addressbookpage.cpp \
   qt/addresstablemodel.cpp \
   qt/askpassphrasedialog.cpp \
+  qt/bantablemodel.cpp \
   qt/bitcoinaddressvalidator.cpp \
   qt/bitcoinamountfield.cpp \
   qt/bitcoingui.cpp \
@@ -202,6 +207,7 @@ GRIDCOINRESEARCH_QT_CPP = \
   qt/optionsdialog.cpp \
   qt/optionsmodel.cpp \
   qt/overviewpage.cpp \
+  qt/peertablemodel.cpp \
   qt/qtipcserver.cpp \
   qt/qvalidatedlineedit.cpp \
   qt/qvaluecombobox.cpp \

src/banman.cpp

@@ -6,10 +6,10 @@
 #include "banman.h"
 
 #include "netbase.h"
+#include "net.h"
 #include "ui_interface.h"
 #include "util.h"
 
-
 BanMan::BanMan(fs::path ban_file, CClientUIInterface* client_interface, int64_t default_ban_time)
     : m_client_interface(client_interface), m_ban_db(std::move(ban_file)), m_default_ban_time(default_ban_time)
 {
@@ -59,6 +59,14 @@ void BanMan::ClearBanned()
 {
     {
         LOCK(m_cs_banned);
+
+        for (const auto& banentry : m_banned)
+        {
+            CSubNet sub_net = banentry.first;
+
+            ZeroMisbehavior(sub_net);
+        }
+
         m_banned.clear();
         m_is_dirty = true;
     }
@@ -160,6 +168,8 @@ bool BanMan::Unban(const CSubNet& sub_net)
         LOCK(m_cs_banned);
         if (m_banned.erase(sub_net) == 0) return false;
         m_is_dirty = true;
+
+        ZeroMisbehavior(sub_net);
     }
     if (m_client_interface) m_client_interface->BannedListChanged();
     DumpBanlist(); //store banlist to disk immediately
@@ -193,6 +203,9 @@ void BanMan::SweepBanned()
             CBanEntry ban_entry = (*it).second;
             if (now > ban_entry.nBanUntil) {
                 m_banned.erase(it++);
+
+                ZeroMisbehavior(sub_net);
+
                 m_is_dirty = true;
                 notify_ui = true;
                 LogPrint("network", "%s: Removed banned node ip/subnet from banlist.dat: %s\n", __func__, sub_net.ToString());
@@ -217,3 +230,35 @@ void BanMan::SetBannedSetDirty(bool dirty)
     LOCK(m_cs_banned); //reuse m_banned lock for the m_is_dirty flag
     m_is_dirty = dirty;
 }
+
+unsigned int BanMan::ZeroMisbehavior(CNetAddr net_addr)
+{
+    CSubNet sub_net(net_addr);
+    return ZeroMisbehavior(sub_net);
+}
+
+unsigned int BanMan::ZeroMisbehavior(CSubNet sub_net)
+{
+    unsigned int nZeroed = 0;
+
+    LOCK(CNode::cs_mapMisbehavior);
+
+    std::map<CAddress, std::pair<int, int64_t>>::iterator iMisbehavior;
+    for (iMisbehavior = CNode::mapMisbehavior.begin(); iMisbehavior != CNode::mapMisbehavior.end();)
+    {
+        CAddress addr = iMisbehavior->first;
+
+        if (sub_net.Match(addr))
+        {
+            iMisbehavior = CNode::mapMisbehavior.erase(iMisbehavior);
+
+            ++nZeroed;
+        }
+        else
+        {
+            ++iMisbehavior;
+        }
+    }
+
+    return nZeroed;
+}

src/banman.h

@@ -57,6 +57,8 @@ class BanMan
     void SetBannedSetDirty(bool dirty = true);
     //!clean unused entries (if bantime has expired)
     void SweepBanned();
+    unsigned int ZeroMisbehavior(CNetAddr net_addr);
+    unsigned int ZeroMisbehavior(CSubNet sub_net);
 
     CCriticalSection m_cs_banned;
     banmap_t m_banned GUARDED_BY(m_cs_banned);

src/init.cpp

@@ -207,6 +207,7 @@ std::string HelpMessage()
         "  -dbcache=<n>           " + _("Set database cache size in megabytes (default: 25)") + "\n" +
         "  -dblogsize=<n>         " + _("Set database disk log size in megabytes (default: 100)") + "\n" +
         "  -timeout=<n>           " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" +
+        "  -peertimeout=<n>       " + _("Specify p2p connection timeout in seconds. This option determines the amount of time a peer may be inactive before the connection to it is dropped. (minimum: 1, default: 45)") + "\n"
         "  -proxy=<ip:port>       " + _("Connect through socks proxy") + "\n" +
         "  -socks=<n>             " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" +
         "  -tor=<ip:port>         " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n"
@@ -511,11 +512,21 @@ bool AppInit2(ThreadHandlerPtr threads)
 
     if (mapArgs.count("-timeout"))
     {
-        int nNewTimeout = GetArg("-timeout", 4000);
+        int nNewTimeout = GetArg("-timeout", 5000);
         if (nNewTimeout > 0 && nNewTimeout < 600000)
             nConnectTimeout = nNewTimeout;
     }
 
+    if (mapArgs.count("-peertimeout"))
+    {
+        int nNewPeerTimeout = GetArg("-timeout", 45);
+
+        if (nNewPeerTimeout <= 0)
+            InitError(strprintf(_("Invalid amount for -peertimeout=<amount>: '%s'"), mapArgs["-peertimeout"]));
+
+        PEER_TIMEOUT = nNewPeerTimeout;
+    }
+
     if (mapArgs.count("-paytxfee"))
     {
         if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))

src/main.cpp

@@ -5655,6 +5655,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 
         // Moved the below from AddTimeData to here to follow bitcoin's approach.
         int64_t nOffsetSample = nTime - GetTime();
+        pfrom->nTimeOffset = nOffsetSample;
         if (GetBoolArg("-synctime", true))
             AddTimeData(pfrom->addr, nOffsetSample);
 
@@ -6272,6 +6273,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
                     if (pingUsecTime > 0) {
                         // Successful ping time measurement, replace previous
                         pfrom->nPingUsecTime = pingUsecTime;
+                        pfrom->nMinPingUsecTime = std::min(pfrom->nMinPingUsecTime.load(), pingUsecTime);
                     } else {
                         // This should never happen
                         sProblem = "Timing mishap";