From 79f37f9328de985bd7edec9332d5231634565f95 Mon Sep 17 00:00:00 2001 From: Dmitry Chapyshev Date: Sat, 2 Dec 2023 22:47:46 +0100 Subject: [PATCH] Reduce count of debug messages. --- source/base/peer/client_authenticator.cc | 8 +++----- source/base/peer/server_authenticator.cc | 24 +++++++++++------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/source/base/peer/client_authenticator.cc b/source/base/peer/client_authenticator.cc index dd471c47a3..9728c88e09 100644 --- a/source/base/peer/client_authenticator.cc +++ b/source/base/peer/client_authenticator.cc @@ -435,11 +435,9 @@ bool ClientAuthenticator::readSessionChallenge(const ByteArray& buffer) setPeerComputerName(challenge->computer_name()); setPeerArch(challenge->arch()); - LOG(LS_INFO) << "Server Version: " << peerVersion(); - LOG(LS_INFO) << "Server Name: " << challenge->computer_name(); - LOG(LS_INFO) << "Server OS: " << challenge->os_name(); - LOG(LS_INFO) << "Server CPU Cores: " << challenge->cpu_cores(); - LOG(LS_INFO) << "Server Arch: " << challenge->arch(); + LOG(LS_INFO) << "Server (version=" << peerVersion() << " name=" << challenge->computer_name() + << " os=" << challenge->os_name() << " cores=" << challenge->cpu_cores() + << " arch=" << challenge->arch() << ")"; if (peerVersion() < base::Version::kMinimumSupportedVersion) { diff --git a/source/base/peer/server_authenticator.cc b/source/base/peer/server_authenticator.cc index 6363080063..a6c9e593d6 100644 --- a/source/base/peer/server_authenticator.cc +++ b/source/base/peer/server_authenticator.cc @@ -590,25 +590,23 @@ void ServerAuthenticator::onSessionResponse(const ByteArray& buffer) { LOG(LS_INFO) << "Received: SessionResponse"; - std::unique_ptr session_response = + std::unique_ptr response = std::make_unique(); - if (!parse(buffer, session_response.get())) + if (!parse(buffer, response.get())) { finish(FROM_HERE, ErrorCode::PROTOCOL_ERROR); return; } - setPeerVersion(session_response->version()); - setPeerOsName(session_response->os_name()); - setPeerComputerName(session_response->computer_name()); - setPeerArch(session_response->arch()); + setPeerVersion(response->version()); + setPeerOsName(response->os_name()); + setPeerComputerName(response->computer_name()); + setPeerArch(response->arch()); - LOG(LS_INFO) << "Client Session Type: " << session_response->session_type(); - LOG(LS_INFO) << "Client Version: " << peerVersion(); - LOG(LS_INFO) << "Client Name: " << session_response->computer_name(); - LOG(LS_INFO) << "Client OS: " << session_response->os_name(); - LOG(LS_INFO) << "Client CPU Cores: " << session_response->cpu_cores(); - LOG(LS_INFO) << "Client Arch: " << session_response->arch(); + LOG(LS_INFO) << "Client (session_type=" << response->session_type() + << " version=" << peerVersion() << " name=" << response->computer_name() + << " os=" << response->os_name() << " cores=" << response->cpu_cores() + << " arch=" << response->arch() << ")"; if (peerVersion() < base::Version::kMinimumSupportedVersion) { @@ -616,7 +614,7 @@ void ServerAuthenticator::onSessionResponse(const ByteArray& buffer) return; } - BitSet session_type = session_response->session_type(); + BitSet session_type = response->session_type(); if (session_type.count() != 1) { finish(FROM_HERE, ErrorCode::PROTOCOL_ERROR);