dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removing callback passed through merge_peer as it's only used for udp_fallback. Directly call send_keepalive in place of using this callback.

Browse source
This commit is contained in:
clemahieu 2021-09-12 10:56:58 +01:00
commit 809e50bf5d
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nano/node/network.cpp
View file

@ -575,12 +575,7 @@ void nano::network::merge_peer (nano::endpoint const & peer_a)
if (!reachout (peer_a, node.config.allow_local_peers))
{
std::weak_ptr<nano::node> node_w (node.shared ());
node.network.tcp_channels.start_tcp (peer_a, [node_w] (std::shared_ptr<nano::transport::channel> const & channel_a) {
if (auto node_l = node_w.lock ())
{
node_l->network.send_keepalive (channel_a);
}
});
node.network.tcp_channels.start_tcp (peer_a);
}
}

8
nano/node/transport/tcp.cpp
View file

@ -714,9 +714,13 @@ void nano::transport::tcp_channels::udp_fallback (nano::endpoint const & endpoin
nano::lock_guard<nano::mutex> lock (mutex);
attempts.get<endpoint_tag> ().erase (nano::transport::map_endpoint_to_tcp (endpoint_a));
}
if (callback_a && !node.flags.disable_udp)
if (!node.flags.disable_udp)
{
auto channel_udp (node.network.udp_channels.create (endpoint_a));
callback_a (channel_udp);
node.network.send_keepalive (channel_udp);
if (callback_a)
{
callback_a (channel_udp);
}
}
}