Re-introduce alert functionality (#1470)

Re-introduce alert functionality removed from Bitcoin upstream

1 files changed, 18 insertions, 0 deletions

diff --git a/src/net.h b/src/net.h
index dc727152a..868be7fd9 100644
--- a/src/net.h
+++ b/src/net.h
@@ -8,6 +8,7 @@
 
 #include "addrdb.h"
 #include "addrman.h"
+#include "alert.h"
 #include "amount.h"
 #include "bloom.h"
 #include "compat.h"
@@ -680,6 +681,9 @@ public:
     CAmount lastSentFeeFilter;
     int64_t nextSendTimeFeeFilter;
 
+    // Alert relay
+    std::vector<CAlert> vAlertToSend;
+
     CNode(NodeId id, ServiceFlags nLocalServicesIn, int nMyStartingHeightIn, SOCKET hSocketIn, const CAddress &addrIn, uint64_t nKeyedNetGroupIn, uint64_t nLocalHostNonceIn, const std::string &addrNameIn = "", bool fInboundIn = false);
     ~CNode();
 
@@ -769,6 +773,14 @@ public:
         }
     }
 
+    void PushAlert(const CAlert& _alert)
+    {
+        // don't relay to nodes which haven't sent their version message
+        if (_alert.IsInEffect() && nVersion != 0) {
+            vAlertToSend.push_back(_alert);
+        }
+    }
+
 
     void AddInventoryKnown(const CInv& inv)
     {
@@ -790,6 +802,12 @@ public:
         }
     }
 
+    void PushAlertHash(const uint256 &hash)
+    {
+        LOCK(cs_inventory);
+        vBlockHashesToAnnounce.push_back(hash);
+    }
+
     void PushBlockHash(const uint256 &hash)
     {
         LOCK(cs_inventory);