|
|
|
@ -33,6 +33,7 @@
|
|
|
|
|
#include <algorithm>
|
|
|
|
|
#include <boost/date_time/posix_time/posix_time.hpp>
|
|
|
|
|
#include <boost/thread/thread.hpp>
|
|
|
|
|
#include <boost/uuid/uuid_io.hpp>
|
|
|
|
|
#include <boost/bind.hpp>
|
|
|
|
|
#include <atomic>
|
|
|
|
|
|
|
|
|
@ -740,7 +741,7 @@ namespace nodetool
|
|
|
|
|
|
|
|
|
|
if(rsp.node_data.network_id != m_network_id)
|
|
|
|
|
{
|
|
|
|
|
LOG_WARNING_CC(context, "COMMAND_HANDSHAKE Failed, wrong network! (" << epee::string_tools::get_str_from_guid_a(rsp.node_data.network_id) << "), closing connection.");
|
|
|
|
|
LOG_WARNING_CC(context, "COMMAND_HANDSHAKE Failed, wrong network! (" << rsp.node_data.network_id << "), closing connection.");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1686,7 +1687,7 @@ namespace nodetool
|
|
|
|
|
if(arg.node_data.network_id != m_network_id)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
LOG_INFO_CC(context, "WRONG NETWORK AGENT CONNECTED! id=" << epee::string_tools::get_str_from_guid_a(arg.node_data.network_id));
|
|
|
|
|
LOG_INFO_CC(context, "WRONG NETWORK AGENT CONNECTED! id=" << arg.node_data.network_id);
|
|
|
|
|
drop_connection(context);
|
|
|
|
|
add_host_fail(context.m_remote_address);
|
|
|
|
|
return 1;
|
|
|
|
@ -1802,7 +1803,7 @@ namespace nodetool
|
|
|
|
|
{
|
|
|
|
|
ss << cntxt.m_remote_address.str()
|
|
|
|
|
<< " \t\tpeer_id " << cntxt.peer_id
|
|
|
|
|
<< " \t\tconn_id " << epee::string_tools::get_str_from_guid_a(cntxt.m_connection_id) << (cntxt.m_is_income ? " INC":" OUT")
|
|
|
|
|
<< " \t\tconn_id " << cntxt.m_connection_id << (cntxt.m_is_income ? " INC":" OUT")
|
|
|
|
|
<< std::endl;
|
|
|
|
|
return true;
|
|
|
|
|
});
|
|
|
|
|