ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove TRUST_NETWORK directive (RIPD-331)

Browse Source
This commit is contained in:
Miguel Portilla
2014-07-31 17:54:52 -04:00
committed by Nik Bougalis
parent 7b936de32c
commit dbe49bcd87
4 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ripple/overlay/impl/PeerImp.h
View File

@@ -1078,15 +1078,12 @@ private:
static void checkTransaction (Job&, int flags, SerializedTransaction::pointer stx, std::weak_ptr<Peer> peer)
{
#ifndef TRUST_NETWORK
try
{
#endif
if (stx->isFieldPresent(sfLastLedgerSequence) &&
(stx->getFieldU32 (sfLastLedgerSequence) <
getApp().getLedgerMaster().getValidLedgerIndex()))
{ // Transaction has expired
{ // Transaction has expired
getApp().getHashRouter().setFlag(stx->getTransactionID(), SF_BAD);
charge (peer, Resource::feeUnwantedData);
return;
@@ -1107,16 +1104,12 @@ private:
bool const trusted (flags & SF_TRUSTED);
getApp().getOPs ().processTransaction (tx, trusted, false, false);
#ifndef TRUST_NETWORK
}
catch (...)
{
getApp().getHashRouter ().setFlag (stx->getTransactionID (), SF_BAD);
charge (peer, Resource::feeInvalidRequest);
}
#endif
}
// Called from our JobQueue
@@ -1195,10 +1188,7 @@ private:
static void checkValidation (Job&, Overlay* pPeers, SerializedValidation::pointer val, bool isTrusted, bool isCluster,
std::shared_ptr<protocol::TMValidation> packet, std::weak_ptr<Peer> peer)
{
#ifndef TRUST_NETWORK
try
#endif
{
uint256 signingHash = val->getSigningHash();
if (!isCluster && !val->isValid (signingHash))
@@ -1238,14 +1228,11 @@ private:
peer_in_set(peers)));
}
}
#ifndef TRUST_NETWORK
catch (...)
{
WriteLog(lsTRACE, Peer) << "Exception processing validation";
charge (peer, Resource::feeInvalidRequest);
}
#endif
}
};