From f13d3e7b35d2a295be3ce37ba96e0d37ba322df1 Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 21 Mar 2024 11:43:53 +0100 Subject: [PATCH] Merge branch 'master' into develop --- src/common/util.cpp | 8 ++------ src/p2p/net_node.inl | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/common/util.cpp b/src/common/util.cpp index f5d4baa9..1fdbe537 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -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; diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 22c2e457..46a39ee5 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -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; }