diff options
| author | Anthony Towns <aj@erisian.com.au> | 2022-08-31 17:04:13 +1000 |
|---|---|---|
| committer | Anthony Towns <aj@erisian.com.au> | 2022-09-01 20:52:20 +1000 |
| commit | 9dccc3328eeaf9cd66518d812c878def5d014e36 (patch) | |
| tree | 6e99582202e272de78d70e4722e5e258b90677f6 /src/net.cpp | |
| parent | 52dcb1d2a319a34202fc1b21c3a137d45cb010b4 (diff) | |
| download | bitcoin-9dccc3328eeaf9cd66518d812c878def5d014e36.tar.xz | |
net: add CNodeOptions for optional CNode constructor params
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net.cpp b/src/net.cpp index 535a5ce8e2..cbc2b35013 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -556,7 +556,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo pszDest ? pszDest : "", conn_type, /*inbound_onion=*/false, - std::move(i2p_transient_session)); + CNodeOptions{ .i2p_sam_session = std::move(i2p_transient_session) }); pnode->AddRef(); // We're making a new connection, harvest entropy from the time (and our peer count) @@ -2722,7 +2722,7 @@ CNode::CNode(NodeId idIn, const std::string& addrNameIn, ConnectionType conn_type_in, bool inbound_onion, - std::unique_ptr<i2p::sam::Session>&& i2p_sam_session) + CNodeOptions&& node_opts) : m_deserializer{std::make_unique<V1TransportDeserializer>(V1TransportDeserializer(Params(), idIn, SER_NETWORK, INIT_PROTO_VERSION))}, m_serializer{std::make_unique<V1TransportSerializer>(V1TransportSerializer())}, m_sock{sock}, @@ -2735,7 +2735,7 @@ CNode::CNode(NodeId idIn, id{idIn}, nLocalHostNonce{nLocalHostNonceIn}, m_conn_type{conn_type_in}, - m_i2p_sam_session{std::move(i2p_sam_session)} + m_i2p_sam_session{std::move(node_opts.i2p_sam_session)} { if (inbound_onion) assert(conn_type_in == ConnectionType::INBOUND); |