cleanup: pullrequest review

- removed unneccessary includes
- refactored some code

core/src/console/connect_to_director.cc

@@ -20,7 +20,6 @@
 */
 
 #include "include/bareos.h"
-#include "include/make_unique.h"
 #include "console/console_conf.h"
 #include "console/console_globals.h"
 #include "console/console_output.h"
@@ -43,27 +42,18 @@ BareosSocket* ConnectToDirector(JobControlRecord& jcr,
     delete UA_sock;
     return nullptr;
   }
-
   jcr.dir_bsock = UA_sock;
 
   const char* name;
   s_password* password = NULL;
 
   TlsResource* local_tls_resource;
-  BareosResource* own_resource;
   if (console_resource) {
-    own_resource = console_resource;
     name = console_resource->resource_name_;
     ASSERT(console_resource->password.encoding == p_encoding_md5);
     password = &console_resource->password;
     local_tls_resource = console_resource;
   } else { /* default console */
-    static ConsoleResource consoleresource_for_bsock_debugging;
-    consoleresource_for_bsock_debugging.resource_name_ =
-        const_cast<char*>("*UserAgent*");
-    consoleresource_for_bsock_debugging.rcode_ = R_CONSOLE;
-    consoleresource_for_bsock_debugging.rcode_str_ = "R_CONSOLE";
-    own_resource = &consoleresource_for_bsock_debugging;
     name = "*UserAgent*";
     ASSERT(director_resource->password_.encoding == p_encoding_md5);
     password = &director_resource->password_;
@@ -96,6 +86,6 @@ BareosSocket* ConnectToDirector(JobControlRecord& jcr,
     return nullptr;
   }
   return UA_sock;
-}  // namespace console
+}
 
 } /* namespace console */

core/src/dird/dird.cc

@@ -195,7 +195,6 @@ static void usage()
         "        -f          run in foreground (for debugging)\n"
         "        -g <group>  run as group <group>\n"
         "        -m          print kaboom output (for debugging)\n"
-        //        "        -n <file>   switch network debugging on\n"
         "        -r <job>    run <job> now\n"
         "        -s          no signals (for debugging)\n"
         "        -t          test - read configuration and exit\n"

core/src/dird/dird_conf.cc

@@ -3711,16 +3711,6 @@ static void ConfigReadyCallback(ConfigurationParser& my_config)
 {
   CreateAndAddUserAgentConsoleResource(my_config);
 
-  std::map<int, std::string> map{
-      {R_DIRECTOR, "R_DIRECTOR"}, {R_CLIENT, "R_CLIENT"},
-      {R_JOBDEFS, "R_JOBDEFS"},   {R_JOB, "R_JOB"},
-      {R_STORAGE, "R_STORAGE"},   {R_CATALOG, "R_CATALOG"},
-      {R_SCHEDULE, "R_SCHEDULE"}, {R_FILESET, "R_FILESET"},
-      {R_POOL, "R_POOL"},         {R_MSGS, "R_MSGS"},
-      {R_COUNTER, "R_COUNTER"},   {R_PROFILE, "R_PROFILE"},
-      {R_CONSOLE, "R_CONSOLE"},   {R_DEVICE, "R_DEVICE"}};
-  my_config.InitializeQualifiedResourceNameTypeConverter(map);
-
   ResetAllClientConnectionHandshakeModes(my_config);
 }
 

core/src/lib/backtrace.cc

@@ -59,21 +59,21 @@ std::vector<BacktraceInfo> Backtrace(int skip, int amount)
     Dl_info info;
     if (dladdr(callstack[i], &info)) {
       int status;
-      char* demangled = nullptr;
-      demangled = abi::__cxa_demangle(info.dli_sname, nullptr, 0, &status);
+      char* demangled =
+          abi::__cxa_demangle(info.dli_sname, nullptr, 0, &status);
       const char* name;
       if (status == 0) {
         name = demangled ? demangled : "(no demangeled name)";
       } else {
         name = info.dli_sname ? info.dli_sname : "(no dli_sname)";
       }
       trace_buf.emplace_back(i, name);
-      free(demangled);
+      if (demangled) { free(demangled); }
     } else {
       trace_buf.emplace_back(i, "unknown");
     }
   }
-  free(symbols);
+  if (symbols) { free(symbols); }
   if (nFrames == nMaxFrames) {
     trace_buf.emplace_back(nMaxFrames + 1, "[truncated]");
   }

core/src/lib/bnet_network_dump_private.cc

@@ -111,7 +111,7 @@ std::string BnetDumpPrivate::CreateFormatStringForNetworkMessage(
 
 bool BnetDumpPrivate::IsExcludedRcode(const BStringList& l) const
 {
-  if (l.size() > 1) {
+  if (l.size() > 0) {
     const std::string& probe = l[0];
     if (exclude_rcodes_.find(probe) != exclude_rcodes_.end()) { return true; }
   }
@@ -123,10 +123,7 @@ bool BnetDumpPrivate::SuppressMessageIfRcodeIsInExcludeList() const
   BStringList own_name(own_qualified_name_, "::");
   BStringList destination_name(destination_qualified_name_, "::");
 
-  if (IsExcludedRcode(own_name) || IsExcludedRcode(destination_name)) {
-    return true;
-  }
-  return false;
+  return IsExcludedRcode(own_name) || IsExcludedRcode(destination_name);
 }
 
 void BnetDumpPrivate::CreateAndWriteMessageToBuffer(const char* ptr, int nbytes)
@@ -169,25 +166,25 @@ void BnetDumpPrivate::DumpToFile(const char* ptr, int nbytes)
 {
   if (SuppressMessageIfRcodeIsInExcludeList()) { return; }
 
-  if (state == State::kRunNormal) {
+  if (state_ == State::kRunNormal) {
     CreateAndWriteMessageToBuffer(ptr, nbytes);
     CreateAndWriteStacktraceToBuffer();
     output_file_ << output_buffer_;
     output_file_.flush();
 
-  } else if (state == State::kWaitForDestinationName) {
+  } else if (state_ == State::kWaitForDestinationName) {
     return;
   }
 }
 
 void BnetDumpPrivate::SaveAndSendMessageIfNoDestinationDefined(const char* ptr,
                                                                int nbytes)
 {
-  if (state != State::kWaitForDestinationName) { return; }
+  if (state_ != State::kWaitForDestinationName) { return; }
 
   if (destination_qualified_name_.empty()) {
     std::size_t amount = nbytes;
-    amount = amount > max_data_dump_bytes_ ? max_data_dump_bytes_ : amount;
+    amount = std::min(amount, max_data_dump_bytes_);
 
     std::vector<char> temp_data;
     std::copy(ptr, ptr + amount, std::back_inserter(temp_data));
@@ -199,10 +196,10 @@ void BnetDumpPrivate::SaveAndSendMessageIfNoDestinationDefined(const char* ptr,
     }
 
   } else {  // !empty() -> send all buffered messages
-    state = State::kRunNormal;
-    std::vector<std::vector<char>> temp =
-        std::move(temporary_buffer_for_initial_messages_);
-    for (const std::vector<char>& v : temp) { DumpToFile(v.data(), v.size()); }
-
+    state_ = State::kRunNormal;
+    for (auto& v : temporary_buffer_for_initial_messages_) {
+      DumpToFile(v.data(), v.size());
+    }
+    temporary_buffer_for_initial_messages_.clear();
   }  // destination_qualified_name_.empty()
 }

core/src/lib/bnet_network_dump_private.h

@@ -74,7 +74,7 @@ class BnetDumpPrivate {
     kWaitForDestinationName,
     kRunNormal
   };
-  State state = State::kWaitForDestinationName;
+  State state_ = State::kWaitForDestinationName;
 };
 
 #endif  // BAREOS_LIB_BNET_NETWORK_DUMP_PRIVATE_H_

core/src/lib/bsock_tcp.cc

@@ -1053,7 +1053,7 @@ int32_t BareosSocketTCP::write_nbytes(char* ptr, int32_t nbytes)
     return nbytes;
   }
 
-  if (bnet_dump_) { bnet_dump_->DumpMessageAndStacktraceToFile(ptr, nbytes); }
+  if (IsBnetDumpEnabled()) { bnet_dump_->DumpMessageAndStacktraceToFile(ptr, nbytes); }
 
 #ifdef HAVE_TLS
   if (tls_conn) { return (tls_conn->TlsBsockWriten(this, ptr, nbytes)); }

core/src/lib/util.cc

@@ -27,15 +27,11 @@
 
 #include "include/bareos.h"
 #include "include/jcr.h"
-#include "include/make_unique.h"
-#include "lib/bsock.h"
 #include "lib/edit.h"
 #include "lib/ascii_control_characters.h"
 #include "lib/bstringlist.h"
 #include "lib/qualified_resource_name_type_converter.h"
 #include "include/version_numbers.h"
-#include "lib/parse_conf.h"
-#include "lib/qualified_resource_name_type_converter.h"
 
 #include <algorithm>
 

core/src/stored/socket_server.cc

@@ -37,9 +37,7 @@
 #include "stored/sd_cmds.h"
 #include "lib/bnet_server_tcp.h"
 #include "lib/bsock.h"
-#include "lib/parse_conf.h"
 #include "lib/try_tls_handshake_as_a_server.h"
-#include "lib/util.h"
 
 namespace storagedaemon {