Keep addrman's nService bits consistent with outbound observations

sipa · Fuzzbawls · commit 0c23c01a6c8d · 2020-05-10T20:00:19.000-07:00
diff --git a/src/addrman.cpp b/src/addrman.cpp
@@ -503,6 +503,24 @@ void CAddrMan::Connected_(const CService& addr, int64_t nTime)
         info.nTime = nTime;
 }
 
+void CAddrMan::SetServices_(const CService& addr, uint64_t nServices)
+{
+    CAddrInfo* pinfo = Find(addr);
+
+    // if not found, bail out
+    if (!pinfo)
+        return;
+
+    CAddrInfo& info = *pinfo;
+
+    // check whether we are talking about the exact same CService (including same port)
+    if (info != addr)
+        return;
+
+    // update info
+    info.nServices = nServices;
+}
+
 int CAddrMan::RandomInt(int nMax){
     return GetRandInt(nMax);
 }
diff --git a/src/addrman.h b/src/addrman.h
@@ -1,5 +1,5 @@
 // Copyright (c) 2012 Pieter Wuille
-// Copyright (c) 2012-2014 The Bitcoin developers
+// Copyright (c) 2012-2015 The Bitcoin developers
 // Copyright (c) 2017-2020 The PIVX developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -264,6 +264,9 @@ class CAddrMan
     //! Mark an entry as currently-connected-to.
     void Connected_(const CService& addr, int64_t nTime);
 
+    //! Update an entry's service bits.
+    void SetServices_(const CService& addr, uint64_t nServices);
+
 public:
     /**
      * serialized format:
@@ -589,6 +592,14 @@ class CAddrMan
             Check();
         }
     }
+
+    void SetServices(const CService& addr, uint64_t nServices)
+    {
+        LOCK(cs);
+        Check();
+        SetServices_(addr, nServices);
+        Check();
+    }
 };
 
 #endif // BITCOIN_ADDRMAN_H
diff --git a/src/main.cpp b/src/main.cpp
@@ -5234,6 +5234,9 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         CAddress addrFrom;
         uint64_t nNonce = 1;
         vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe;
+        if (!pfrom->fInbound) {
+            addrman.SetServices(pfrom->addr, pfrom->nServices);
+        }
         if (pfrom->DisconnectOldProtocol(ActiveProtocol(), strCommand))
             return false;
 
