Merge pull request #913 from AntelopeIO/opt-vote-handling

[1.0.3] Optimize handling of invalid vote message
AntelopeIO · Oct 9, 2024 · cc90288 · cc90288
2 parents f3a4fda + ba4d011
commit cc90288
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp
@@ -4024,20 +4024,26 @@ namespace eosio {
       case vote_result_t::unknown_public_key:
       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));
-         my_impl->connections.for_each_connection([connection_id](const connection_ptr& c) {
+         fc_elog(vote_logger, "Invalid vote(s), closing connection - ${c}", ("c", connection_id));
+         my_impl->connections.any_of_connections([connection_id](const connection_ptr& c) {
             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