mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-10 13:13:27 +01:00
Merge pull request #7075
f3c0d4f
protocol: remove unused (and cunningly uninitialized) field (moneromooo-monero)8e62362
p2p: ifx getting seed nodes for uncommon cases (moneromooo-monero)
This commit is contained in:
commit
7ee37e4b38
@ -287,7 +287,6 @@ namespace levin
|
|||||||
connection_count(0),
|
connection_count(0),
|
||||||
flush_callbacks(0),
|
flush_callbacks(0),
|
||||||
nzone(zone),
|
nzone(zone),
|
||||||
is_public(is_public),
|
|
||||||
pad_txs(pad_txs),
|
pad_txs(pad_txs),
|
||||||
fluffing(false)
|
fluffing(false)
|
||||||
{
|
{
|
||||||
@ -305,7 +304,6 @@ namespace levin
|
|||||||
std::atomic<std::size_t> connection_count; //!< Only update in strand, can be read at any time
|
std::atomic<std::size_t> connection_count; //!< Only update in strand, can be read at any time
|
||||||
std::uint32_t flush_callbacks; //!< Number of active fluff flush callbacks queued
|
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 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
|
const bool pad_txs; //!< Pad txs to the next boundary for privacy
|
||||||
bool fluffing; //!< Zone is in Dandelion++ fluff epoch
|
bool fluffing; //!< Zone is in Dandelion++ fluff epoch
|
||||||
};
|
};
|
||||||
|
@ -804,6 +804,7 @@ namespace nodetool
|
|||||||
"zbjkbsxc5munw3qusl7j2hpcmikhqocdf4pqhnhtpzw5nt5jrmofptid.onion:18083",
|
"zbjkbsxc5munw3qusl7j2hpcmikhqocdf4pqhnhtpzw5nt5jrmofptid.onion:18083",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
return {};
|
||||||
case epee::net_utils::zone::i2p:
|
case epee::net_utils::zone::i2p:
|
||||||
if (m_nettype == cryptonote::MAINNET)
|
if (m_nettype == cryptonote::MAINNET)
|
||||||
{
|
{
|
||||||
@ -812,6 +813,7 @@ namespace nodetool
|
|||||||
"sel36x6fibfzujwvt4hf5gxolz6kd3jpvbjqg6o3ud2xtionyl2q.b32.i2p:18080"
|
"sel36x6fibfzujwvt4hf5gxolz6kd3jpvbjqg6o3ud2xtionyl2q.b32.i2p:18080"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
return {};
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user