From 8e62362cd3cf60425604109ca5ecd82c2a0209ee Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 4 Dec 2020 19:02:00 +0000 Subject: [PATCH 1/2] p2p: ifx getting seed nodes for uncommon cases The code is technically correct, but liable to easily become incorrect with changes --- src/p2p/net_node.inl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 93a925971..6df7f36ca 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -799,6 +799,7 @@ namespace nodetool "4pixvbejrvihnkxmduo2agsnmc3rrulrqc7s3cbwwrep6h6hrzsibeqd.onion:18083" }; } + return {}; case epee::net_utils::zone::i2p: if (m_nettype == cryptonote::MAINNET) { @@ -806,7 +807,8 @@ namespace nodetool "s3l6ke4ed3df466khuebb4poienoingwof7oxtbo6j4n56sghe3a.b32.i2p:18080", "sel36x6fibfzujwvt4hf5gxolz6kd3jpvbjqg6o3ud2xtionyl2q.b32.i2p:18080" }; - } + } + return {}; default: break; } From f3c0d4f9dfef7947b7f90b197d44c4d0a5125795 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 4 Dec 2020 19:41:50 +0000 Subject: [PATCH 2/2] protocol: remove unused (and cunningly uninitialized) field --- src/cryptonote_protocol/levin_notify.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/cryptonote_protocol/levin_notify.cpp b/src/cryptonote_protocol/levin_notify.cpp index 2d04dffb6..69df22a92 100644 --- a/src/cryptonote_protocol/levin_notify.cpp +++ b/src/cryptonote_protocol/levin_notify.cpp @@ -286,7 +286,6 @@ namespace levin connection_count(0), flush_callbacks(0), nzone(zone), - is_public(is_public), pad_txs(pad_txs), fluffing(false) { @@ -304,7 +303,6 @@ namespace levin std::atomic connection_count; //!< Only update in strand, can be read at any time std::uint32_t flush_callbacks; //!< Number of active fluff flush callbacks queued const epee::net_utils::zone nzone; //!< Zone is public ipv4/ipv6 connections, or i2p or tor - const bool is_public; //!< Zone is public ipv4/ipv6 connections const bool pad_txs; //!< Pad txs to the next boundary for privacy bool fluffing; //!< Zone is in Dandelion++ fluff epoch };