ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-25 13:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't service stale/superceded fetch pack requests.

Browse Source
This commit is contained in:
JoelKatz
2013-05-17 01:05:29 -07:00
parent 5e1dddd1c7
commit a71225f9a3
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cpp/ripple/NetworkOPs.cpp
View File

@@ -2006,8 +2006,13 @@ void NetworkOPs::getBookPage(Ledger::pointer lpLedger, const uint160& uTakerPays
void NetworkOPs::makeFetchPack(Job&, boost::weak_ptr<Peer> wPeer, void NetworkOPs::makeFetchPack(Job&, boost::weak_ptr<Peer> wPeer,
boost::shared_ptr<ripple::TMGetObjectByHash> request, boost::shared_ptr<ripple::TMGetObjectByHash> request,
Ledger::pointer wantLedger, Ledger::pointer haveLedger) Ledger::pointer wantLedger, Ledger::pointer haveLedger, uint32 uUptime)
{ {
if (upTime() > (uUptime + 1))
{
cLog(lsINFO) << "Fetch pack request got stale";
return;
}
if (theApp->getFeeTrack().isLoaded()) if (theApp->getFeeTrack().isLoaded())
{ {
cLog(lsINFO) << "Too busy to make fetch pack"; cLog(lsINFO) << "Too busy to make fetch pack";

2
src/cpp/ripple/NetworkOPs.h
View File

@@ -282,7 +282,7 @@ public:
void mapComplete(const uint256& hash, SHAMap::ref map); void mapComplete(const uint256& hash, SHAMap::ref map);
bool stillNeedTXSet(const uint256& hash); bool stillNeedTXSet(const uint256& hash);
void makeFetchPack(Job&, boost::weak_ptr<Peer> peer, boost::shared_ptr<ripple::TMGetObjectByHash> request, void makeFetchPack(Job&, boost::weak_ptr<Peer> peer, boost::shared_ptr<ripple::TMGetObjectByHash> request,
Ledger::pointer wantLedger, Ledger::pointer haveLedger); Ledger::pointer wantLedger, Ledger::pointer haveLedger, uint32 uUptime);
bool shouldFetchPack(uint32 seq); bool shouldFetchPack(uint32 seq);
void gotFetchPack(bool progress, uint32 seq); void gotFetchPack(bool progress, uint32 seq);
void addFetchPack(const uint256& hash, boost::shared_ptr< std::vector<unsigned char> >& data); void addFetchPack(const uint256& hash, boost::shared_ptr< std::vector<unsigned char> >& data);

2
src/cpp/ripple/Peer.cpp
View File

@@ -1911,7 +1911,7 @@ void Peer::doFetchPack(const boost::shared_ptr<ripple::TMGetObjectByHash>& packe
} }
theApp->getJobQueue().addJob(jtPACK, "MakeFetchPack", theApp->getJobQueue().addJob(jtPACK, "MakeFetchPack",
BIND_TYPE(&NetworkOPs::makeFetchPack, &theApp->getOPs(), P_1, BIND_TYPE(&NetworkOPs::makeFetchPack, &theApp->getOPs(), P_1,
boost::weak_ptr<Peer>(shared_from_this()), packet, wantLedger, haveLedger)); boost::weak_ptr<Peer>(shared_from_this()), packet, wantLedger, haveLedger, upTime()));
} }
bool Peer::hasProto(int version) bool Peer::hasProto(int version)