Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.0.3] Optimize handling of invalid vote message #913

Merged
merged 2 commits into from
Oct 9, 2024
Merged

[1.0.3] Optimize handling of invalid vote message #913

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de501db
Optimize handling of invalid vote message
heifner Oct 9, 2024
ba4d011
Improve error message
heifner Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions plugins/net_plugin/net_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4025,19 +4025,25 @@ namespace eosio {
case vote_result_t::invalid_signature:
case vote_result_t::max_exceeded: // close peer immediately
fc_elog(vote_logger, "Exceeded max votes per connection for ${c}", ("c", connection_id));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not from your PR. But this logging only lists Exceeded max votes as the failure reason. It can be unknown_public_key or invalid_signature

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed it.

my_impl->connections.for_each_connection([connection_id](const connection_ptr& c) {
my_impl->connections.any_of_connections([connection_id](const connection_ptr& c) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe define a new API in connections_manager:

      template <typename F>
      void for_connection(uint32_t connection_id, F&& f) {
         any_of_connections([connection_id, f = std::forward<F>(f)](const connection_ptr& c) {
            if (c->connection_id == connection_id) {
               f();
               return true;
            }
            return false;
         });

if (c->connection_id == connection_id) {
c->close( false );
return true;
}
return false;
});
break;
case vote_result_t::unknown_block: // track the failure
fc_dlog(vote_logger, "connection - ${c} vote unknown block #${bn}:${id}..",
("c", connection_id)("bn", block_header::num_from_id(msg->block_id))("id", msg->block_id.str().substr(8,16)));
my_impl->connections.for_each_connection([connection_id](const connection_ptr& c) {
my_impl->connections.any_of_connections([connection_id](const connection_ptr& c) {
if (c->connection_id == connection_id) {
c->block_status_monitor_.rejected();
boost::asio::post(c->strand, [c]() {
c->block_status_monitor_.rejected();
});
return true;
}
return false;
});
break;
case vote_result_t::duplicate: // do nothing
Expand Down