diff options
| author | Lee *!* Clagett <code@leeclagett.com> | 2024-03-28 19:02:17 -0400 |
|---|---|---|
| committer | Lee *!* Clagett <code@leeclagett.com> | 2024-03-29 15:30:14 -0400 |
| commit | 7686af7acfa257b4e0df85e3c57f5bf821fd3f88 (patch) | |
| tree | cd04110ec9a2073912abf951e87445fdaf934538 /src | |
| parent | 81d4db08eb75ce5392c65ca6571e7b08e41b7c95 (diff) | |
| download | monzero-core-7686af7acfa257b4e0df85e3c57f5bf821fd3f88.tar.gz monzero-core-7686af7acfa257b4e0df85e3c57f5bf821fd3f88.tar.xz monzero-core-7686af7acfa257b4e0df85e3c57f5bf821fd3f88.zip | |
Skip privacy networks (on tx sends) that don't have outgoing connections
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_protocol/levin_notify.cpp | 9 | ||||
| -rw-r--r-- | src/cryptonote_protocol/levin_notify.h | 3 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/cryptonote_protocol/levin_notify.cpp b/src/cryptonote_protocol/levin_notify.cpp index 27c6d0278..92034a435 100644 --- a/src/cryptonote_protocol/levin_notify.cpp +++ b/src/cryptonote_protocol/levin_notify.cpp @@ -741,9 +741,14 @@ namespace levin notify::status notify::get_status() const noexcept { 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() diff --git a/src/cryptonote_protocol/levin_notify.h b/src/cryptonote_protocol/levin_notify.h index 2927eea86..9fc7ab892 100644 --- a/src/cryptonote_protocol/levin_notify.h +++ b/src/cryptonote_protocol/levin_notify.h @@ -75,7 +75,8 @@ namespace levin struct status { 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. diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 30e3d31b9..60d9392fd 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -2300,11 +2300,12 @@ namespace nodetool if (enet::zone::tor < network->first) 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); } - // configuration should not allow this scenario + MWARNING("Unable to send " << txs.size() << " transaction(s): anonymity networks had no outgoing connections"); return enet::zone::invalid; } //----------------------------------------------------------------------------------- |