From 4a737c4bee1868e0584ba194ce88a35c15c3fa95 Mon Sep 17 00:00:00 2001 From: clemahieu Date: Tue, 3 Aug 2021 12:38:42 +0100 Subject: [PATCH] Converting node_id_handshake from unnecessarily using channel::send_buffer to using channel::send --- nano/core_test/telemetry.cpp | 4 ++-- nano/node/transport/tcp.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nano/core_test/telemetry.cpp b/nano/core_test/telemetry.cpp index 6c841ce5d..e0b414229 100644 --- a/nano/core_test/telemetry.cpp +++ b/nano/core_test/telemetry.cpp @@ -572,8 +572,8 @@ TEST (telemetry, remove_peer_different_genesis) ASSERT_TIMELY (1s, 0 == node0->network.size ()); ASSERT_TIMELY (1s, 0 == node1->network.size ()); - ASSERT_EQ (node0->stats.count (nano::stat::type::message, nano::stat::detail::node_id_handshake, nano::stat::dir::out), 1); - ASSERT_EQ (node1->stats.count (nano::stat::type::message, nano::stat::detail::node_id_handshake, nano::stat::dir::out), 1); + ASSERT_GE (node0->stats.count (nano::stat::type::message, nano::stat::detail::node_id_handshake, nano::stat::dir::out), 1); + ASSERT_GE (node1->stats.count (nano::stat::type::message, nano::stat::detail::node_id_handshake, nano::stat::dir::out), 1); nano::lock_guard guard (node0->network.excluded_peers.mutex); ASSERT_EQ (1, node0->network.excluded_peers.peers.get ().count (node1->network.endpoint ().address ())); diff --git a/nano/node/transport/tcp.cpp b/nano/node/transport/tcp.cpp index 83b62db22..69f2cf763 100644 --- a/nano/node/transport/tcp.cpp +++ b/nano/node/transport/tcp.cpp @@ -572,7 +572,6 @@ void nano::transport::tcp_channels::start_tcp (nano::endpoint const & endpoint_a // TCP node ID handshake auto cookie (node_l->network.syn_cookies.assign (endpoint_a)); nano::node_id_handshake message (cookie, boost::none); - auto bytes = message.to_shared_const_buffer (); if (node_l->config.logging.network_node_id_handshake_logging ()) { node_l->logger.try_log (boost::str (boost::format ("Node ID handshake request sent with node ID %1% to %2%: query %3%") % node_l->node_id.pub.to_node_id () % endpoint_a % (*cookie).to_string ())); @@ -581,7 +580,7 @@ void nano::transport::tcp_channels::start_tcp (nano::endpoint const & endpoint_a std::shared_ptr> receive_buffer (std::make_shared> ()); receive_buffer->resize (256); node_l->network.tcp_channels.push_node_id_handshake_socket (socket); - channel->send_buffer (bytes, [node_w, channel, endpoint_a, receive_buffer, callback_a] (boost::system::error_code const & ec, size_t size_a) { + channel->send (message, [node_w, channel, endpoint_a, receive_buffer, callback_a] (boost::system::error_code const & ec, size_t size_a) { if (auto node_l = node_w.lock ()) { if (!ec)