From 3a780d2972f451d42b86e472bd433a3b3a628a2a Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Mon, 14 Jan 2019 17:47:57 +0100
Subject: [PATCH] cleanup: beautified some log messages

---
 core/src/include/jcr.h             |  2 +-
 core/src/include/version_numbers.h | 12 ++++++++++++
 core/src/lib/bsock.cc              | 10 ++++++++--
 core/src/tests/lib_tests.cc        |  9 +++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h
index e59759b19a8..ba3af8ae234 100644
--- a/core/src/include/jcr.h
+++ b/core/src/include/jcr.h
@@ -317,7 +317,7 @@ class JobControlRecord {
    bool my_thread_killable;               /**< Can we kill the thread? */
 public:
       JobControlRecord() {
-            Dmsg0(100, "Contruct JobControlRecord\n");
+            Dmsg0(100, "Construct JobControlRecord\n");
       }
 
       ~JobControlRecord() {
diff --git a/core/src/include/version_numbers.h b/core/src/include/version_numbers.h
index 4895ddf6767..ea0c908d02d 100644
--- a/core/src/include/version_numbers.h
+++ b/core/src/include/version_numbers.h
@@ -32,4 +32,16 @@ enum class BareosVersionNumber : uint32_t
   kUndefined    = static_cast<uint32_t>(1)
 };
 
+class BareosVersionToMajorMinor
+{
+public:
+  uint32_t major = 0;
+  uint32_t minor = 0;
+  BareosVersionToMajorMinor(BareosVersionNumber version) {
+    uint32_t version_number = static_cast<uint32_t>(version);
+    major = version_number / 100;
+    minor = version_number % 100;
+  }
+};
+
 #endif /* BAREOS_INCLUDE_RELEASE_NUMBERS_H_ */
diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
index d88765003f4..912084a9fe7 100644
--- a/core/src/lib/bsock.cc
+++ b/core/src/lib/bsock.cc
@@ -76,7 +76,7 @@ BareosSocket::BareosSocket()
     , last_tick_{0}
     , tls_established_(false)
 {
-  Dmsg0(100, "Contruct BareosSocket\n");
+  Dmsg0(100, "Construct BareosSocket\n");
 }
 
 BareosSocket::BareosSocket(const BareosSocket &other)
@@ -606,7 +606,13 @@ bool BareosSocket::EvaluateCleartextBareosHello(bool &cleartext_hello,
       std::string code;
       BareosVersionNumber version = BareosVersionNumber::kUndefined;
       if (GetNameAndResourceTypeAndVersionFromHello(received, name, code, version)) {
-        Dmsg3(200, "Identified from cleartext handshake: %s-%s recognized version: %d\n", name.c_str(), code.c_str(), version);
+        if (version > BareosVersionNumber::kUndefined) {
+          BareosVersionToMajorMinor v(version);
+          Dmsg4(200, "Identified from Bareos handshake: %s-%s recognized version: %d.%d\n",
+                name.c_str(), code.c_str(), v.major, v.minor);
+        } else {
+          Dmsg2(200, "Identified from Bareos handshake: %s-%s version not recognized\n", name.c_str(), code.c_str());
+        }
         client_name_out = name;
         r_code_str_out = code;
         version_out = version;
diff --git a/core/src/tests/lib_tests.cc b/core/src/tests/lib_tests.cc
index 75b11c64a4c..19a9a0238b6 100644
--- a/core/src/tests/lib_tests.cc
+++ b/core/src/tests/lib_tests.cc
@@ -214,3 +214,12 @@ TEST(Util, version_number_test)
   EXPECT_NE(BareosVersionNumber::kRelease_18_2, static_cast<BareosVersionNumber>(1702));
   EXPECT_GT(BareosVersionNumber::kRelease_18_2, BareosVersionNumber::kUndefined);
 }
+
+TEST(Util, version_number_major_minor)
+{
+  BareosVersionNumber version = BareosVersionNumber::kRelease_18_2;
+  BareosVersionToMajorMinor v(version);
+  EXPECT_EQ(v.major, 18);
+  EXPECT_EQ(v.minor,  2);
+}
+