bsock: beautyfied comments

bareos · Aug 16, 2018 · a5ca64b · a5ca64b
1 parent 92f870a
commit a5ca64b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 52 deletions.
diff --git a/core/src/lib/bsock_tcp.cc b/core/src/lib/bsock_tcp.cc
@@ -928,38 +928,38 @@ void BareosSocketTCP::close()
 
 void BareosSocketTCP::destroy()
 {
-   if (msg) {
+   /* if this object is cloned
+    * some memory or file descriptors
+    * are duplicated not just copied */
+
+   if (msg) { /* duplicated */
       FreePoolMemory(msg);
       msg = nullptr;
    }
-   if (errmsg) {
+   if (errmsg) { /* duplicated */
       FreePoolMemory(errmsg);
       errmsg = nullptr;
    }
-   if (who_) {
+   if (who_) { /* duplicated */
       free(who_);
       who_ = nullptr;
    }
-   if (host_) {
+   if (host_) { /* duplicated */
       free(host_);
       host_ = nullptr;
    }
-   if (src_addr) {
+   if (src_addr) { /* duplicated */
       free(src_addr);
       src_addr = nullptr;
    }
-   if (fd_ >= 0) {
+   if (fd_ >= 0) { /* duplicated */
       socketClose(fd_);
       fd_ = -1;
    }
-   if(spool_fd_ >= 0) {
+   if(spool_fd_ >= 0) { /* duplicated */
       socketClose(spool_fd_);
       spool_fd_ = -1;
    }
-   if(src_addr) {
-      delete (src_addr);
-      src_addr = nullptr;
-   }
 }
 
 /*

diff --git a/core/src/lib/tls_conf_cert.cc b/core/src/lib/tls_conf_cert.cc
@@ -34,35 +34,6 @@ uint32_t TlsConfigCert::GetPolicy() const
    return result << TlsConfigCert::policy_offset;
 }
 
-
-//std::shared_ptr<TLS_IMPLEMENTATION> TlsConfigCert::CreateClientContext() const
-//{
-//   return new_tls_context((!CaCertfile || CaCertfile->empty()) ? nullptr : CaCertfile->c_str(),
-//                          (!CaCertdir || CaCertdir->empty()) ? nullptr : CaCertdir->c_str(),
-//                          (!crlfile || crlfile->empty()) ? nullptr : crlfile->c_str(),
-//                          (!certfile || certfile->empty()) ? nullptr : certfile->c_str(),
-//                          (!keyfile || keyfile->empty()) ? nullptr : keyfile->c_str(),
-//                          TlsPemCallback,
-//                          (!pem_message || pem_message->empty()) ? nullptr : pem_message->c_str(),
-//                          nullptr,
-//                          (!cipherlist || cipherlist->empty()) ? nullptr : cipherlist->c_str(),
-//                          VerifyPeer);
-//}
-//
-//std::shared_ptr<TLS_IMPLEMENTATION> TlsConfigCert::CreateServerContext() const
-//{
-//   return new_tls_context((!CaCertfile || CaCertfile->empty()) ? nullptr : CaCertfile->c_str(),
-//                          (!CaCertdir || CaCertdir->empty()) ? nullptr : CaCertdir->c_str(),
-//                          (!crlfile || crlfile->empty()) ? nullptr : crlfile->c_str(),
-//                          (!certfile || certfile->empty()) ? nullptr : certfile->c_str(),
-//                          (!keyfile || keyfile->empty()) ? nullptr : keyfile->c_str(),
-//                          TlsPemCallback,
-//                          (!pem_message || pem_message->empty()) ? nullptr : pem_message->c_str(),
-//                          nullptr,
-//                          (!cipherlist || cipherlist->empty()) ? nullptr : cipherlist->c_str(),
-//                          VerifyPeer);
-//}
-
 bool TlsConfigCert::enabled(u_int32_t policy)
 {
    return ((policy >> TlsConfigCert::policy_offset) & BNET_TLS_ENABLED) == BNET_TLS_ENABLED;

diff --git a/core/src/lib/tls_conf_psk.cc b/core/src/lib/tls_conf_psk.cc
@@ -45,18 +45,6 @@ bool TlsConfigPsk::required(u_int32_t policy)
    return ((policy >> TlsConfigPsk::policy_offset) & BNET_TLS_REQUIRED) == BNET_TLS_REQUIRED;
 }
 
-//std::shared_ptr<TLS_IMPLEMENTATION> TlsConfigPsk::CreateClientContext() const
-//{
-//   ASSERT(psk_credentials_);
-//   return new_tls_psk_client_context(cipherlist, psk_credentials_);
-//}
-//
-//std::shared_ptr<TLS_IMPLEMENTATION> TlsConfigPsk::CreateServerContext() const
-//{
-//   ASSERT(psk_credentials_);
-//   return new_tls_psk_server_context(cipherlist, psk_credentials_);
-//}
-
 TlsConfigPsk::~TlsConfigPsk()
 {
    if (cipherlist != nullptr) {