Track the supresssion.

This commit is contained in:
JoelKatz
2012-11-04 22:49:41 -08:00
parent 66825d0e9d
commit 88c88148fb
2 changed files with 5 additions and 4 deletions

View File

@@ -10,8 +10,9 @@
DECLARE_INSTANCE(LedgerProposal);
LedgerProposal::LedgerProposal(const uint256& pLgr, uint32 seq, const uint256& tx, uint32 closeTime,
const RippleAddress& naPeerPublic) :
mPreviousLedger(pLgr), mCurrentHash(tx), mCloseTime(closeTime), mProposeSeq(seq), mPublicKey(naPeerPublic)
const RippleAddress& naPeerPublic, const uint256& suppression) :
mPreviousLedger(pLgr), mCurrentHash(tx), mSuppression(suppression), mCloseTime(closeTime),
mProposeSeq(seq), mPublicKey(naPeerPublic)
{
// XXX Validate key.
// if (!mKey->SetPubKey(pubKey))

View File

@@ -718,7 +718,7 @@ uint256 NetworkOPs::getConsensusLCL()
return mConsensus->getLCL();
}
void NetworkOPs::processTrustedProposal(uint256 suppression, LedgerProposal::pointer proposal,
void NetworkOPs::processTrustedProposal(LedgerProposal::pointer proposal,
boost::shared_ptr<ripple::TMProposeSet> set, RippleAddress nodePublic, uint256 checkLedger, bool sigGood)
{
bool relay = true;
@@ -754,7 +754,7 @@ void NetworkOPs::processTrustedProposal(uint256 suppression, LedgerProposal::poi
if (relay)
{
std::set<uint64> peers;
theApp->getSuppression().swapSet(suppression, peers, SF_RELAYED);
theApp->getSuppression().swapSet(proposal->getSuppression(), peers, SF_RELAYED);
PackedMessage::pointer message = boost::make_shared<PackedMessage>(*set, ripple::mtPROPOSE_LEDGER);
theApp->getConnectionPool().relayMessageBut(peers, message);
}