X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fnet.h;h=8a8916a1d2ff9a5121d53a7b5ca58821c529e6fa;hb=9f3020f117dec258f93def05cbdb27d86917a015;hp=a7d9c62161cc376e8d0675bb51ca01c764cd9036;hpb=11ffe1ccae2e10f753e65da227355615f5f9d6f7;p=novacoin.git diff --git a/src/net.h b/src/net.h index a7d9c62..8a8916a 100644 --- a/src/net.h +++ b/src/net.h @@ -641,15 +641,6 @@ public: void copyStats(CNodeStats &stats); }; - - - - - - - - - inline void RelayInventory(const CInv& inv) { // Put on lists to offer to the other nodes @@ -660,34 +651,9 @@ inline void RelayInventory(const CInv& inv) } } -template -void RelayMessage(const CInv& inv, const T& a) -{ - CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); - ss.reserve(10000); - ss << a; - RelayMessage(inv, ss); -} - -template<> -inline void RelayMessage<>(const CInv& inv, const CDataStream& ss) -{ - { - LOCK(cs_mapRelay); - // Expire old relay messages - while (!vRelayExpiration.empty() && vRelayExpiration.front().first < GetTime()) - { - mapRelay.erase(vRelayExpiration.front().second); - vRelayExpiration.pop_front(); - } - - // Save original serialized message so newer versions are preserved - mapRelay.insert(std::make_pair(inv, ss)); - vRelayExpiration.push_back(std::make_pair(GetTime() + 15 * 60, inv)); - } - - RelayInventory(inv); -} +class CTransaction; +void RelayTransaction(const CTransaction& tx, const uint256& hash); +void RelayTransaction(const CTransaction& tx, const uint256& hash, const CDataStream& ss); #endif