Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6372 

7b9017f p2p: plug tor to clearnet association vector (Aaron Hook)
This commit is contained in:
luigi1111 2020-04-04 13:09:55 -05:00
parent 6aa5da09f5 7b9017f671
commit 97af9649c9
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p2p/net_node.inl
View File

@ -1053,18 +1053,16 @@ namespace nodetool
pi = context.peer_id = rsp.node_data.peer_id; pi = context.peer_id = rsp.node_data.peer_id;
context.m_rpc_port = rsp.node_data.rpc_port; context.m_rpc_port = rsp.node_data.rpc_port;
context.m_rpc_credits_per_hash = rsp.node_data.rpc_credits_per_hash; context.m_rpc_credits_per_hash = rsp.node_data.rpc_credits_per_hash;
m_network_zones.at(context.m_remote_address.get_zone()).m_peerlist.set_peer_just_seen(rsp.node_data.peer_id, context.m_remote_address, context.m_pruning_seed, context.m_rpc_port, context.m_rpc_credits_per_hash); network_zone& zone = m_network_zones.at(context.m_remote_address.get_zone());
zone.m_peerlist.set_peer_just_seen(rsp.node_data.peer_id, context.m_remote_address, context.m_pruning_seed, context.m_rpc_port, context.m_rpc_credits_per_hash);
// move // move
for (auto const& zone : m_network_zones) if(rsp.node_data.peer_id == zone.m_config.m_peer_id)
{
if(rsp.node_data.peer_id == zone.second.m_config.m_peer_id)
{ {
LOG_DEBUG_CC(context, "Connection to self detected, dropping connection"); LOG_DEBUG_CC(context, "Connection to self detected, dropping connection");
hsh_result = false; hsh_result = false;
return; return;
} }
}
LOG_INFO_CC(context, "New connection handshaked, pruning seed " << epee::string_tools::to_string_hex(context.m_pruning_seed)); LOG_INFO_CC(context, "New connection handshaked, pruning seed " << epee::string_tools::to_string_hex(context.m_pruning_seed));
LOG_DEBUG_CC(context, " COMMAND_HANDSHAKE INVOKED OK"); LOG_DEBUG_CC(context, " COMMAND_HANDSHAKE INVOKED OK");
}else }else