Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
sowle 2024-03-21 11:43:53 +01:00
parent 1f5c862168
commit f13d3e7b35
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/util.cpp
View file

@ -684,12 +684,8 @@ std::string get_nix_version_display_string()
// got v_major, v_minor, v_revision
// allow 1.1.x and greater
if (v_major < 1)
return false;
if (v_major == 1 && v_minor < 1)
// allow 2.x and greater
if (v_major < 2)
return false;
return true;

2
src/p2p/net_node.inl
View file

@ -525,7 +525,7 @@ namespace nodetool
if (!tools::check_remote_client_version(rsp.payload_data.client_version))
{
LOG_ERROR_CCONTEXT("COMMAND_HANDSHAKE Failed, wrong client version: " << rsp.payload_data.client_version << ", closing connection.");
LOG_PRINT_CC_YELLOW(context, "COMMAND_HANDSHAKE Failed, wrong client version: " << rsp.payload_data.client_version << ", closing connection.", LOG_LEVEL_1);
return;
}