mirror of
https://github.com/monero-project/monero.git
synced 2024-12-13 11:56:31 +02:00
Merge pull request #5732
a96c1a46
cryptonote_protocol: drop peers we can't download from when syncing (moneromooo-monero)ab361df2
p2p: add a few missing connection close calls (moneromooo-monero)
This commit is contained in:
commit
8eb075e789
@ -341,6 +341,11 @@ namespace cryptonote
|
||||
|
||||
if(m_core.have_block(hshd.top_id))
|
||||
{
|
||||
if (target > hshd.current_height)
|
||||
{
|
||||
MINFO(context << "peer is not ahead of us and we're syncing, disconnecting");
|
||||
return false;
|
||||
}
|
||||
context.m_state = cryptonote_connection_context::state_normal;
|
||||
if(is_inital && target == m_core.get_current_blockchain_height())
|
||||
on_connection_synchronized();
|
||||
|
@ -944,7 +944,10 @@ namespace nodetool
|
||||
}
|
||||
if(!context.m_is_income)
|
||||
m_network_zones.at(context.m_remote_address.get_zone()).m_peerlist.set_peer_just_seen(context.peer_id, context.m_remote_address, context.m_pruning_seed, context.m_rpc_port);
|
||||
m_payload_handler.process_payload_sync_data(rsp.payload_data, context, false);
|
||||
if (!m_payload_handler.process_payload_sync_data(rsp.payload_data, context, false))
|
||||
{
|
||||
m_network_zones.at(context.m_remote_address.get_zone()).m_net_server.get_config_object().close(context.m_connection_id );
|
||||
}
|
||||
});
|
||||
|
||||
if(!r)
|
||||
@ -1090,6 +1093,7 @@ namespace nodetool
|
||||
LOG_PRINT_CC_PRIORITY_NODE(is_priority, *con, "Failed to HANDSHAKE with peer "
|
||||
<< na.str()
|
||||
/*<< ", try " << try_count*/);
|
||||
zone.m_net_server.get_config_object().close(con->m_connection_id);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1149,7 +1153,7 @@ namespace nodetool
|
||||
bool is_priority = is_priority_node(na);
|
||||
|
||||
LOG_PRINT_CC_PRIORITY_NODE(is_priority, *con, "Failed to HANDSHAKE with peer " << na.str());
|
||||
|
||||
zone.m_net_server.get_config_object().close(con->m_connection_id);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user