ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-22 03:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle sequence numbers better in peer messages.

Browse Source
This commit is contained in:
JoelKatz
2013-08-14 12:57:55 -07:00
parent 832b2f6b4f
commit be1ca396c5
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ripple_app/consensus/ripple_LedgerConsensus.cpp
View File

@@ -413,7 +413,11 @@ void LedgerConsensus::statusChange (protocol::NodeEvent event, Ledger& ledger)
s.set_ledgerhash (hash.begin (), hash.size ()); s.set_ledgerhash (hash.begin (), hash.size ());
uint32 uMin, uMax; uint32 uMin, uMax;
getApp().getOPs ().getFullValidatedRange (uMin, uMax); if (!getApp().getOPs ().getFullValidatedRange (uMin, uMax))
{
uMin = 0;
uMax = 0;
}
s.set_firstseq (uMin); s.set_firstseq (uMin);
s.set_lastseq (uMax); s.set_lastseq (uMax);

4
modules/ripple_app/ledger/LedgerMaster.cpp
View File

@@ -250,7 +250,7 @@ bool LedgerMaster::getFullValidatedRange (uint32& minVal, uint32& maxVal)
minVal = mCompleteLedgers.prevMissing (maxVal); minVal = mCompleteLedgers.prevMissing (maxVal);
if (minVal == RangeSet::absent) if (minVal == RangeSet::absent)
minVal = 0; minVal = maxVal;
else else
++minVal; ++minVal;
@@ -272,7 +272,7 @@ bool LedgerMaster::getValidatedRange (uint32& minVal, uint32& maxVal)
minVal = mCompleteLedgers.prevMissing (maxVal); minVal = mCompleteLedgers.prevMissing (maxVal);
if (minVal == RangeSet::absent) if (minVal == RangeSet::absent)
minVal = 0; minVal = maxVal;
else else
++minVal; ++minVal;

12
modules/ripple_app/peers/ripple_Peer.cpp
View File

@@ -1798,11 +1798,17 @@ void PeerImp::recvStatus (protocol::TMStatusChange& packet)
} }
else mPreviousLedgerHash.zero (); else mPreviousLedgerHash.zero ();
if (packet.has_firstseq ()) if (packet.has_firstseq () && packet.has_lastseq())
{
mMinLedger = packet.firstseq (); mMinLedger = packet.firstseq ();
if (packet.has_lastseq ())
mMaxLedger = packet.lastseq (); mMaxLedger = packet.lastseq ();
// Work around some servers that report sequences incorrectly
if (mMinLedger == 0)
mMaxLedger = 0;
if (mMaxLedger == 0)
mMinLedger = 0;
}
} }
void PeerImp::recvGetLedger (protocol::TMGetLedger& packet, Application::ScopedLockType& masterLockHolder) void PeerImp::recvGetLedger (protocol::TMGetLedger& packet, Application::ScopedLockType& masterLockHolder)