From ce17b7969ed41f62678e58e1e79c5b9d6dfc749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Mon, 14 Apr 2025 22:35:53 +0200 Subject: [PATCH] Immediately abort legacy bootstrap connections (#4879) --- nano/node/transport/tcp_server.cpp | 39 +----------------------------- nano/node/transport/tcp_server.hpp | 16 ------------ 2 files changed, 1 insertion(+), 54 deletions(-) diff --git a/nano/node/transport/tcp_server.cpp b/nano/node/transport/tcp_server.cpp index 251d76ce2..2ed501510 100644 --- a/nano/node/transport/tcp_server.cpp +++ b/nano/node/transport/tcp_server.cpp @@ -238,11 +238,7 @@ auto nano::transport::tcp_server::process_message (std::unique_ptrvisit (bootstrap_visitor); - - // Pause receiving new messages if bootstrap serving started - return bootstrap_visitor.processed ? process_result::pause : process_result::progress; + return process_result::abort; } debug_assert (false); @@ -503,39 +499,6 @@ void nano::transport::tcp_server::realtime_message_visitor::asc_pull_ack (const process = true; } -/* - * bootstrap_message_visitor - */ - -nano::transport::tcp_server::bootstrap_message_visitor::bootstrap_message_visitor (std::shared_ptr server) : - server{ std::move (server) } -{ -} - -void nano::transport::tcp_server::bootstrap_message_visitor::bulk_pull (const nano::bulk_pull & message) -{ - // Ignored since V28 - // TODO: Abort connection? -} - -void nano::transport::tcp_server::bootstrap_message_visitor::bulk_pull_account (const nano::bulk_pull_account & message) -{ - // Ignored since V28 - // TODO: Abort connection? -} - -void nano::transport::tcp_server::bootstrap_message_visitor::bulk_push (const nano::bulk_push &) -{ - // Ignored since V28 - // TODO: Abort connection? -} - -void nano::transport::tcp_server::bootstrap_message_visitor::frontier_req (const nano::frontier_req & message) -{ - // Ignored since V28 - // TODO: Abort connection? -} - /* * */ diff --git a/nano/node/transport/tcp_server.hpp b/nano/node/transport/tcp_server.hpp index c4971464d..13f615e24 100644 --- a/nano/node/transport/tcp_server.hpp +++ b/nano/node/transport/tcp_server.hpp @@ -119,22 +119,6 @@ private: // Visitors tcp_server & server; }; - class bootstrap_message_visitor : public nano::message_visitor - { - public: - bool processed{ false }; - - explicit bootstrap_message_visitor (std::shared_ptr); - - void bulk_pull (nano::bulk_pull const &) override; - void bulk_pull_account (nano::bulk_pull_account const &) override; - void bulk_push (nano::bulk_push const &) override; - void frontier_req (nano::frontier_req const &) override; - - private: - std::shared_ptr server; - }; - friend class handshake_message_visitor; }; }