ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squelch Peerfinder fixed connection attempts

Browse Source
This commit is contained in:
Vinnie Falco
2015-01-21 14:59:47 -08:00
parent a9c44a1b9c
commit 4d5dca71ce
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple/overlay/impl/ConnectAttempt.cpp
View File

@@ -51,7 +51,7 @@ ConnectAttempt::ConnectAttempt (boost::asio::io_service& io_service,
, response_, false)
, slot_ (slot)
{
if (journal_.trace) journal_.trace <<
if (journal_.debug) journal_.debug <<
"Connect " << remote_endpoint;
}

12
src/ripple/peerfinder/impl/Logic.h
View File

@@ -485,6 +485,9 @@ public:
/** Create new outbound connection attempts as needed.
This implements PeerFinder's "Outbound Connection Strategy"
*/
// VFALCO TODO This should add the returned addresses to the
// squelch list in one go once the list is built,
// rather than having each module add to the squelch list.
std::vector <beast::IP::Endpoint>
autoconnect()
{
@@ -510,7 +513,7 @@ public:
//
if (state->counts.fixed_active() < state->fixed.size ())
{
get_fixed (needed, h.list(), state);
get_fixed (needed, h.list(), m_squelches, state);
if (! h.list().empty ())
{
@@ -964,6 +967,7 @@ public:
/** Adds eligible Fixed addresses for outbound attempts. */
template <class Container>
void get_fixed (std::size_t needed, Container& c,
typename ConnectHandouts::Squelches& squelches,
typename SharedState::Access& state)
{
auto const now (m_clock.now());
@@ -971,13 +975,15 @@ public:
needed && iter != state->fixed.end (); ++iter)
{
auto const& address (iter->first.address());
if (iter->second.when() <= now && std::none_of (
state->slots.cbegin(), state->slots.cend(),
if (iter->second.when() <= now && squelches.find(address) ==
squelches.end() && std::none_of (
state->slots.cbegin(), state->slots.cend(),
[address](Slots::value_type const& v)
{
return address == v.first.address();
}))
{
squelches.insert(iter->first.address());
c.push_back (iter->first);
--needed;
}