diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp index a27573a300..d4ca0027a0 100644 --- a/src/cpp/ripple/LedgerAcquire.cpp +++ b/src/cpp/ripple/LedgerAcquire.cpp @@ -456,7 +456,8 @@ void LedgerAcquire::trigger(Peer::ref peer) std::vector nodeHashes; nodeIDs.reserve(256); nodeHashes.reserve(256); - mLedger->peekTransactionMap()->getMissingNodes(nodeIDs, nodeHashes, 256, NULL); + TransactionStateSF filter(mSeq); + mLedger->peekTransactionMap()->getMissingNodes(nodeIDs, nodeHashes, 256, &filter); if (nodeIDs.empty()) { if (!mLedger->peekTransactionMap()->isValid()) @@ -503,7 +504,8 @@ void LedgerAcquire::trigger(Peer::ref peer) std::vector nodeHashes; nodeIDs.reserve(256); nodeHashes.reserve(256); - mLedger->peekAccountStateMap()->getMissingNodes(nodeIDs, nodeHashes, 256, NULL); + TransactionStateSF filter(mSeq); + mLedger->peekAccountStateMap()->getMissingNodes(nodeIDs, nodeHashes, 256, &filter); if (nodeIDs.empty()) { if (!mLedger->peekAccountStateMap()->isValid()) diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index 4a2fea52e5..4d660cdc48 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -2094,7 +2094,7 @@ bool NetworkOPs::getFetchPack(const uint256& hash, std::vector& d bool NetworkOPs::shouldFetchPack() { uint32 now = getNetworkTimeNC(); - if (mLastFetchPack == now) + if ((mLastFetchPack == now) || ((mLastFetchPack + 1) == now)) return false; mFetchPack.sweep(); if (mFetchPack.getCacheSize() > 384)