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 conditional check for feature introduced in 0.28.1-b7

Browse Source
This commit is contained in:
Crypto Brad Garlinghouse
2018-09-22 20:58:50 +00:00
committed by Nik Bougalis
parent cd820b3777
commit aa49be65a1
4 changed files with 25 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/ripple/overlay/impl/OverlayImpl.cpp
View File

@@ -1088,12 +1088,10 @@ OverlayImpl::send (protocol::TMProposeSet& m)
{
if (setup_.expire)
m.set_hops(0);
auto const sm = std::make_shared<Message>(
m, protocol::mtPROPOSE_LEDGER);
auto const sm = std::make_shared<Message>(m, protocol::mtPROPOSE_LEDGER);
for_each([&](std::shared_ptr<PeerImp>&& p)
{
if (! m.has_hops() || p->hopsAware())
p->send(sm);
p->send(sm);
});
}
void
@@ -1101,12 +1099,10 @@ OverlayImpl::send (protocol::TMValidation& m)
{
if (setup_.expire)
m.set_hops(0);
auto const sm = std::make_shared<Message>(
m, protocol::mtVALIDATION);
auto const sm = std::make_shared<Message>(m, protocol::mtVALIDATION);
for_each([&](std::shared_ptr<PeerImp>&& p)
{
if (! m.has_hops() || p->hopsAware())
p->send(sm);
p->send(sm);
});
SerialIter sit (m.validation().data(), m.validation().size());
@@ -1120,43 +1116,35 @@ OverlayImpl::send (protocol::TMValidation& m)
}
void
OverlayImpl::relay (protocol::TMProposeSet& m,
uint256 const& uid)
OverlayImpl::relay (protocol::TMProposeSet& m, uint256 const& uid)
{
if (m.has_hops() && m.hops() >= maxTTL)
return;
auto const toSkip = app_.getHashRouter().shouldRelay(uid);
if (!toSkip)
return;
auto const sm = std::make_shared<Message>(
m, protocol::mtPROPOSE_LEDGER);
for_each([&](std::shared_ptr<PeerImp>&& p)
if (auto const toSkip = app_.getHashRouter().shouldRelay(uid))
{
if (toSkip->find(p->id()) != toSkip->end())
return;
if (! m.has_hops() || p->hopsAware())
p->send(sm);
});
auto const sm = std::make_shared<Message>(m, protocol::mtPROPOSE_LEDGER);
for_each([&](std::shared_ptr<PeerImp>&& p)
{
if (toSkip->find(p->id()) == toSkip->end())
p->send(sm);
});
}
}
void
OverlayImpl::relay (protocol::TMValidation& m,
uint256 const& uid)
OverlayImpl::relay (protocol::TMValidation& m, uint256 const& uid)
{
if (m.has_hops() && m.hops() >= maxTTL)
return;
auto const toSkip = app_.getHashRouter().shouldRelay(uid);
if (! toSkip)
return;
auto const sm = std::make_shared<Message>(
m, protocol::mtVALIDATION);
for_each([&](std::shared_ptr<PeerImp>&& p)
if (auto const toSkip = app_.getHashRouter().shouldRelay(uid))
{
if (toSkip->find(p->id()) != toSkip->end())
return;
if (! m.has_hops() || p->hopsAware())
p->send(sm);
});
auto const sm = std::make_shared<Message>(m, protocol::mtVALIDATION);
for_each([&](std::shared_ptr<PeerImp>&& p)
{
if (toSkip->find(p->id()) == toSkip->end())
p->send(sm);
});
}
}
//------------------------------------------------------------------------------
@@ -1248,6 +1236,7 @@ Overlay::Setup
setup_Overlay (BasicConfig const& config)
{
Overlay::Setup setup;
{
auto const& section = config.section("overlay");
setup.context = make_SSLContext("");