mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-10 05:03:26 +01:00
Merge pull request #9267
7686af7
Skip privacy networks (on tx sends) that don't have outgoing connections (Lee *!* Clagett)
This commit is contained in:
commit
5930557a94
@ -741,9 +741,14 @@ namespace levin
|
|||||||
notify::status notify::get_status() const noexcept
|
notify::status notify::get_status() const noexcept
|
||||||
{
|
{
|
||||||
if (!zone_)
|
if (!zone_)
|
||||||
return {false, false};
|
return {false, false, false};
|
||||||
|
|
||||||
return {!zone_->noise.empty(), CRYPTONOTE_NOISE_CHANNELS <= zone_->connection_count};
|
// `connection_count` is only set when `!noise.empty()`.
|
||||||
|
const std::size_t connection_count = zone_->connection_count;
|
||||||
|
bool has_outgoing = connection_count;
|
||||||
|
if (zone_->noise.empty())
|
||||||
|
has_outgoing = zone_->p2p->get_out_connections_count();
|
||||||
|
return {!zone_->noise.empty(), CRYPTONOTE_NOISE_CHANNELS <= connection_count, has_outgoing};
|
||||||
}
|
}
|
||||||
|
|
||||||
void notify::new_out_connection()
|
void notify::new_out_connection()
|
||||||
|
@ -75,7 +75,8 @@ namespace levin
|
|||||||
struct status
|
struct status
|
||||||
{
|
{
|
||||||
bool has_noise;
|
bool has_noise;
|
||||||
bool connections_filled;
|
bool connections_filled; //!< True when has zone has `CRYPTONOTE_NOISE_CHANNELS` outgoing noise channels
|
||||||
|
bool has_outgoing; //!< True when zone has outgoing connections
|
||||||
};
|
};
|
||||||
|
|
||||||
//! Construct an instance that cannot notify.
|
//! Construct an instance that cannot notify.
|
||||||
|
@ -2300,11 +2300,12 @@ namespace nodetool
|
|||||||
if (enet::zone::tor < network->first)
|
if (enet::zone::tor < network->first)
|
||||||
break; // unknown network
|
break; // unknown network
|
||||||
|
|
||||||
if (network->second.m_connect)
|
const auto status = network->second.m_notifier.get_status();
|
||||||
|
if (network->second.m_connect && status.has_outgoing)
|
||||||
return send(*network);
|
return send(*network);
|
||||||
}
|
}
|
||||||
|
|
||||||
// configuration should not allow this scenario
|
MWARNING("Unable to send " << txs.size() << " transaction(s): anonymity networks had no outgoing connections");
|
||||||
return enet::zone::invalid;
|
return enet::zone::invalid;
|
||||||
}
|
}
|
||||||
//-----------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------
|
||||||
|
@ -591,6 +591,7 @@ TEST_F(levin_notify, defaulted)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_FALSE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
EXPECT_TRUE(notifier.send_txs({}, random_generator_(), cryptonote::relay_method::local));
|
EXPECT_TRUE(notifier.send_txs({}, random_generator_(), cryptonote::relay_method::local));
|
||||||
|
|
||||||
@ -611,6 +612,7 @@ TEST_F(levin_notify, fluff_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -658,6 +660,7 @@ TEST_F(levin_notify, stem_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -731,6 +734,7 @@ TEST_F(levin_notify, stem_no_outs_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_FALSE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -788,6 +792,7 @@ TEST_F(levin_notify, local_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -897,6 +902,7 @@ TEST_F(levin_notify, forward_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -970,6 +976,7 @@ TEST_F(levin_notify, block_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1000,6 +1007,7 @@ TEST_F(levin_notify, none_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1030,6 +1038,7 @@ TEST_F(levin_notify, fluff_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1077,6 +1086,7 @@ TEST_F(levin_notify, stem_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1145,6 +1155,7 @@ TEST_F(levin_notify, stem_no_outs_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_FALSE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1202,6 +1213,7 @@ TEST_F(levin_notify, local_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1303,6 +1315,7 @@ TEST_F(levin_notify, forward_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1371,6 +1384,7 @@ TEST_F(levin_notify, block_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1401,6 +1415,7 @@ TEST_F(levin_notify, none_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1431,6 +1446,7 @@ TEST_F(levin_notify, private_fluff_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1483,6 +1499,7 @@ TEST_F(levin_notify, private_stem_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1535,6 +1552,7 @@ TEST_F(levin_notify, private_local_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1587,6 +1605,7 @@ TEST_F(levin_notify, private_forward_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1639,6 +1658,7 @@ TEST_F(levin_notify, private_block_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1670,6 +1690,7 @@ TEST_F(levin_notify, private_none_without_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1700,6 +1721,7 @@ TEST_F(levin_notify, private_fluff_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1751,6 +1773,7 @@ TEST_F(levin_notify, private_stem_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1802,6 +1825,7 @@ TEST_F(levin_notify, private_local_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1853,6 +1877,7 @@ TEST_F(levin_notify, private_forward_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1904,6 +1929,7 @@ TEST_F(levin_notify, private_block_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1934,6 +1960,7 @@ TEST_F(levin_notify, private_none_with_padding)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -1966,6 +1993,7 @@ TEST_F(levin_notify, stem_mappings)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -2090,6 +2118,7 @@ TEST_F(levin_notify, fluff_multiple)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_FALSE(status.has_noise);
|
EXPECT_FALSE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
notifier.new_out_connection();
|
notifier.new_out_connection();
|
||||||
io_service_.poll();
|
io_service_.poll();
|
||||||
@ -2206,12 +2235,14 @@ TEST_F(levin_notify, noise)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_TRUE(status.has_noise);
|
EXPECT_TRUE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_FALSE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
ASSERT_LT(0u, io_service_.poll());
|
ASSERT_LT(0u, io_service_.poll());
|
||||||
{
|
{
|
||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_TRUE(status.has_noise);
|
EXPECT_TRUE(status.has_noise);
|
||||||
EXPECT_TRUE(status.connections_filled);
|
EXPECT_TRUE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
|
|
||||||
notifier.run_stems();
|
notifier.run_stems();
|
||||||
@ -2298,12 +2329,14 @@ TEST_F(levin_notify, noise_stem)
|
|||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_TRUE(status.has_noise);
|
EXPECT_TRUE(status.has_noise);
|
||||||
EXPECT_FALSE(status.connections_filled);
|
EXPECT_FALSE(status.connections_filled);
|
||||||
|
EXPECT_FALSE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
ASSERT_LT(0u, io_service_.poll());
|
ASSERT_LT(0u, io_service_.poll());
|
||||||
{
|
{
|
||||||
const auto status = notifier.get_status();
|
const auto status = notifier.get_status();
|
||||||
EXPECT_TRUE(status.has_noise);
|
EXPECT_TRUE(status.has_noise);
|
||||||
EXPECT_TRUE(status.connections_filled);
|
EXPECT_TRUE(status.connections_filled);
|
||||||
|
EXPECT_TRUE(status.has_outgoing);
|
||||||
}
|
}
|
||||||
|
|
||||||
notifier.run_stems();
|
notifier.run_stems();
|
||||||
|
Loading…
Reference in New Issue
Block a user