Fix two small bugs.

This commit is contained in:
JoelKatz
2013-04-25 13:49:41 -07:00
parent c785bb3673
commit 380ab0d3fd
2 changed files with 5 additions and 3 deletions

View File

@@ -456,7 +456,8 @@ void LedgerAcquire::trigger(Peer::ref peer)
std::vector<uint256> 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<uint256> 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())

View File

@@ -2094,7 +2094,7 @@ bool NetworkOPs::getFetchPack(const uint256& hash, std::vector<unsigned char>& d
bool NetworkOPs::shouldFetchPack()
{
uint32 now = getNetworkTimeNC();
if (mLastFetchPack == now)
if ((mLastFetchPack == now) || ((mLastFetchPack + 1) == now))
return false;
mFetchPack.sweep();
if (mFetchPack.getCacheSize() > 384)