ngap/ngap_ies/DrbsSubjectToStatusTransferItem.cpp

@@ -21,7 +21,7 @@
 
 #include "DrbsSubjectToStatusTransferItem.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -76,8 +76,8 @@ bool DrbSubjectToStatusTransferItem::encode(
     return false;
   }
 
-  Logger::ngap().debug(
-      "Encode from DrbSubjectToStatusTransferItem successfully");
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("Encode from DrbSubjectToStatusTransferItem successfully");
   return true;
 }
 }  // namespace oai::ngap

ngap/ngap_ies/DrbsSubjectToStatusTransferList.cpp

@@ -21,7 +21,7 @@
 
 #include "DrbsSubjectToStatusTransferList.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "utils.hpp"
 
 namespace oai::ngap {
@@ -54,13 +54,14 @@ bool DrbSubjectToStatusTransferList::encode(
     if (!ie) return false;
 
     if (!item.encode(*ie)) {
-      Logger::ngap().error("Encode DrbSubjectToStatusTransferList IE error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("Encode DrbSubjectToStatusTransferList IE error!");
       oai::utils::utils::free_wrapper((void**) &ie);
       return false;
     }
     if (ASN_SEQUENCE_ADD(&drbsSubjectToStatusTransferList.list, ie) != 0) {
-      Logger::ngap().error(
-          "ASN_SEQUENCE_ADD DrbSubjectToStatusTransferList IE error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("ASN_SEQUENCE_ADD DrbSubjectToStatusTransferList IE error!");
       return false;
     }
   }
@@ -74,7 +75,8 @@ bool DrbSubjectToStatusTransferList::decode(
   for (int i = 0; i < drbsSubjectToStatusTransferList.list.count; i++) {
     DrbSubjectToStatusTransferItem item = {};
     if (!item.decode(*drbsSubjectToStatusTransferList.list.array[i])) {
-      Logger::ngap().error("Decode DrbSubjectToStatusTransferList IE error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("Decode DrbSubjectToStatusTransferList IE error!");
       return false;
     }
     m_ItemList.push_back(item);

ngap/ngap_ies/GlobalRanNodeId.cpp

@@ -21,7 +21,7 @@
 
 #include "GlobalRanNodeId.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -98,7 +98,8 @@ bool GlobalRanNodeId::encode(Ngap_GlobalRANNodeID_t& globalRANNodeID) const {
       break;
     }
     default:
-      Logger::ngap().warn("GlobalRanNodeId Present encode error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .warn("GlobalRanNodeId Present encode error!");
       return false;
   }
   return true;
@@ -117,16 +118,19 @@ bool GlobalRanNodeId::decode(const Ngap_GlobalRANNodeID_t& globalRANNodeID) {
     }
     case Ngap_GlobalRANNodeID_PR_globalNgENB_ID: {
       // TODO:
-      Logger::ngap().warn("GlobalRANNodeID Present is globalNgENB!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .warn("GlobalRANNodeID Present is globalNgENB!");
       break;
     }
     case Ngap_GlobalRANNodeID_PR_globalN3IWF_ID: {
       // TODO:
-      Logger::ngap().warn("GlobalRANNodeID Present is globalN3IWF!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .warn("GlobalRANNodeID Present is globalN3IWF!");
       break;
     }
     default:
-      Logger::ngap().warn("GlobalRanNodeId Present decode error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .warn("GlobalRanNodeId Present decode error!");
       return false;
   }
   return true;

ngap/ngap_ies/GnbId.cpp

@@ -21,7 +21,7 @@
 
 #include "GnbId.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -44,7 +44,8 @@ void GnbId::set(const gNBId_t& gnbId) {
 bool GnbId::set(const uint32_t& id, const uint8_t& bitLength) {
   if (!((bitLength >= NGAP_GNB_ID_SIZE_MIN) &&
         (bitLength <= NGAP_GNB_ID_SIZE_MAX))) {
-    Logger::ngap().warn("gNBID length out of range!");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .warn("gNBID length out of range!");
     return false;
   }
 

ngap/ngap_ies/MessageType.cpp

@@ -21,7 +21,7 @@
 
 #include "MessageType.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 extern "C" {
 #include "Ngap_Criticality.h"
@@ -128,8 +128,8 @@ int MessageType::encode(Ngap_NGAP_PDU_t& pdu) const {
       break;
     }
     case Ngap_NGAP_PDU_PR_NOTHING: {
-      Logger::ngap().debug(
-          "Ngap_NGAP_PDU_PR_NOTHING (messageType encode error)");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .debug("Ngap_NGAP_PDU_PR_NOTHING (messageType encode error)");
       return 0;
     }
   }

ngap/ngap_ies/PduSessionResourceHandoverCommandTransfer.cpp

@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "ngap_utils.hpp"
 
 namespace oai::ngap {
@@ -60,20 +60,24 @@ void PduSessionResourceHandoverCommandTransfer::setQosFlowToBeForwardedList(
       std::make_optional<QosFlowToBeForwardedList>(qosList);
   int ret = m_QosFlowToBeForwardedList.value().encode(
       m_HandoverCommandTransferIe->qosFlowToBeForwardedList);
-  Logger::ngap().debug(
-      "Number of QoS flows in the list %d",
-      m_HandoverCommandTransferIe->qosFlowToBeForwardedList->list.count);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug(
+          "Number of QoS flows in the list %d",
+          m_HandoverCommandTransferIe->qosFlowToBeForwardedList->list.count);
   if (m_HandoverCommandTransferIe->qosFlowToBeForwardedList->list.array) {
     if (m_HandoverCommandTransferIe->qosFlowToBeForwardedList->list.array[0]) {
-      Logger::ngap().debug(
-          "QFI in the list %d",
-          m_HandoverCommandTransferIe->qosFlowToBeForwardedList->list.array[0]
-              ->qosFlowIdentifier);
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .debug(
+              "QFI in the list %d",
+              m_HandoverCommandTransferIe->qosFlowToBeForwardedList->list
+                  .array[0]
+                  ->qosFlowIdentifier);
     }
   }
 
   if (!ret) {
-    Logger::ngap().debug("Encode QosFlowToBeForwardedList IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Encode QosFlowToBeForwardedList IE error");
     return;
   }
 }
@@ -96,7 +100,8 @@ void PduSessionResourceHandoverCommandTransfer::setUPTransportLayerInformation(
   int ret = m_DlForwardingUpTnlInformation.value().encode(
       *m_HandoverCommandTransferIe->dLForwardingUP_TNLInformation);
   if (!ret) {
-    Logger::ngap().debug("Encode dLForwardingUP_TNLInformation IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Encode dLForwardingUP_TNLInformation IE error");
     return;
   }
 }
@@ -109,7 +114,8 @@ int PduSessionResourceHandoverCommandTransfer::encode(
   asn_enc_rval_t er = aper_encode_to_buffer(
       &asn_DEF_Ngap_HandoverCommandTransfer, NULL, m_HandoverCommandTransferIe,
       buf, buf_size);
-  Logger::ngap().debug("er.encoded( %d)", er.encoded);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("er.encoded( %d)", er.encoded);
   return er.encoded;
 }
 

ngap/ngap_ies/PduSessionResourceHandoverRequestAckTransfer.cpp

@@ -21,7 +21,7 @@
 
 #include "PduSessionResourceHandoverRequestAckTransfer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -45,28 +45,32 @@ bool PduSessionResourceHandoverRequestAckTransfer::decode(
       &asn_DEF_Ngap_HandoverRequestAcknowledgeTransfer,
       (void**) &m_HandoverRequestAcknowledegTransferIe, buf, buf_size);
   if (rc.code == RC_OK) {
-    Logger::ngap().debug(
-        "Decoded handoverRequestAcknowledegTransfer successfully");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Decoded handoverRequestAcknowledegTransfer successfully");
   } else if (rc.code == RC_WMORE) {
-    Logger::ngap().debug("More data expected, call again");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("More data expected, call again");
     return false;
   } else {
-    Logger::ngap().debug(
-        "Failure to decode handoverRequestAcknowledegTransfer data");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Failure to decode handoverRequestAcknowledegTransfer data");
     // return false;
   }
-  Logger::ngap().debug("rc.consumed to decode: %d", rc.consumed);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("rc.consumed to decode: %d", rc.consumed);
 
   if (!m_DlForwardingUpTnlInformation.decode(
           *m_HandoverRequestAcknowledegTransferIe
                ->dLForwardingUP_TNLInformation)) {
-    Logger::ngap().error("Decode NGAP DL_NGU_UP_TNLInformation IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Decode NGAP DL_NGU_UP_TNLInformation IE error");
     return false;
   }
 
   if (!m_QosFlowSetupResponseList.decode(
           m_HandoverRequestAcknowledegTransferIe->qosFlowSetupResponseList)) {
-    Logger::ngap().error("Decode NGAP QosFlowSetupResponseList IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Decode NGAP QosFlowSetupResponseList IE error");
     return false;
   }
   return true;

ngap/ngap_ies/PduSessionResourceHandoverRequiredTransfer.cpp

@@ -21,7 +21,7 @@
 
 #include "PduSessionResourceHandoverRequiredTransfer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "ngap_utils.hpp"
 
 namespace oai::ngap {
@@ -61,7 +61,8 @@ int PduSessionResourceHandoverRequiredTransfer::encode(
   asn_enc_rval_t er = aper_encode_to_buffer(
       &asn_DEF_Ngap_HandoverRequiredTransfer, NULL, m_HandoverRquiredTransferIe,
       buf, buf_size);
-  Logger::ngap().debug("er.encoded %d", er.encoded);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("er.encoded %d", er.encoded);
   return er.encoded;
 }
 
@@ -72,15 +73,19 @@ bool PduSessionResourceHandoverRequiredTransfer::decode(
       NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_Ngap_HandoverRequiredTransfer,
       (void**) &m_HandoverRquiredTransferIe, buf, buf_size);
   if (rc.code == RC_OK) {
-    Logger::ngap().debug("Decoded successfully");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Decoded successfully");
   } else if (rc.code == RC_WMORE) {
-    Logger::ngap().debug("More data expected, call again");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("More data expected, call again");
     return false;
   } else {
-    Logger::ngap().debug("Failure to decode data");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Failure to decode data");
     return false;
   }
-  Logger::ngap().debug("rc.consumed to decode %d", rc.consumed);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("rc.consumed to decode %d", rc.consumed);
 
   // asn_fprint(stderr, &asn_DEF_Ngap_PDUSessionResourceSetupResponseTransfer,
   // pduSessionResourceSetupResponseTransferIEs);

ngap/ngap_ies/PduSessionResourceReleaseCommandTransfer.cpp

@@ -21,7 +21,7 @@
 
 #include "PduSessionResourceReleaseCommandTransfer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "ngap_utils.hpp"
 
 namespace oai::ngap {
@@ -52,7 +52,8 @@ void PduSessionResourceReleaseCommandTransfer::setCauseRadioNetwork(
   int ret =
       m_CauseValue.encode(m_PduSessionResourceReleaseCommandTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseRadioNetwork IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseRadioNetwork IE error");
     return;
   }
 }
@@ -66,7 +67,8 @@ void PduSessionResourceReleaseCommandTransfer::setCauseTransport(
   int ret =
       m_CauseValue.encode(m_PduSessionResourceReleaseCommandTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseTransport IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseTransport IE error");
     return;
   }
 }
@@ -80,7 +82,8 @@ void PduSessionResourceReleaseCommandTransfer::setCauseNas(
   int ret =
       m_CauseValue.encode(m_PduSessionResourceReleaseCommandTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseNas IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseNas IE error");
     return;
   }
 }
@@ -94,7 +97,8 @@ void PduSessionResourceReleaseCommandTransfer::setCauseProtocol(
   int ret =
       m_CauseValue.encode(m_PduSessionResourceReleaseCommandTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseProtocol IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseProtocol IE error");
     return;
   }
 }
@@ -108,7 +112,8 @@ void PduSessionResourceReleaseCommandTransfer::setCauseMisc(
   int ret =
       m_CauseValue.encode(m_PduSessionResourceReleaseCommandTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseMisc IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseMisc IE error");
     return;
   }
 }
@@ -122,7 +127,8 @@ int PduSessionResourceReleaseCommandTransfer::encode(
   asn_enc_rval_t er = aper_encode_to_buffer(
       &asn_DEF_Ngap_PDUSessionResourceReleaseCommandTransfer, NULL,
       m_PduSessionResourceReleaseCommandTransferIe, buf, buf_size);
-  Logger::ngap().debug("er.encoded( %d)", er.encoded);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("er.encoded( %d)", er.encoded);
   return er.encoded;
 }
 
@@ -135,23 +141,28 @@ bool PduSessionResourceReleaseCommandTransfer::decode(
       (void**) &m_PduSessionResourceReleaseCommandTransferIe, buf, buf_size);
 
   if (rc.code == RC_OK) {
-    Logger::ngap().debug("Decoded successfully");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Decoded successfully");
   } else if (rc.code == RC_WMORE) {
-    Logger::ngap().debug("More data expected, call again");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("More data expected, call again");
     return false;
   } else {
-    Logger::ngap().debug("Failure to decode data");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Failure to decode data");
     return false;
   }
 
-  Logger::ngap().debug("rc.consumed to decode %d", rc.consumed);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("rc.consumed to decode %d", rc.consumed);
   // asn_fprint(stderr,
   // &asn_DEF_Ngap_PDUSessionResourceSetupUnsuccessfulTransfer,
   // pduSessionResourceSetupUnsuccessfulTransferIEs);
 
   if (!m_CauseValue.decode(
           m_PduSessionResourceReleaseCommandTransferIe->cause)) {
-    Logger::ngap().error("Decode Cause IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Decode Cause IE error");
     return false;
   }
   return true;

ngap/ngap_ies/PduSessionResourceSetupItemCxtReq.cpp

@@ -21,7 +21,6 @@
 
 #include "PduSessionResourceSetupItemCxtReq.hpp"
 
-#include "logger.hpp"
 #include "utils.hpp"
 
 namespace oai::ngap {

ngap/ngap_ies/PduSessionResourceSetupRequestTransfer.cpp

@@ -21,7 +21,7 @@
 
 #include "PduSessionResourceSetupRequestTransfer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "ngap_utils.hpp"
 #include "utils.hpp"
 
@@ -62,7 +62,8 @@ void PduSessionResourceSetupRequestTransferIE::
   int ret = m_PduSessionAggregateMaximumBitRateIe.value().encode(
       ie->value.choice.PDUSessionAggregateMaximumBitRate);
   if (!ret) {
-    Logger::ngap().error("Encode PDUSessionAggregateMaximumBitRate IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode PDUSessionAggregateMaximumBitRate IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
@@ -70,7 +71,8 @@ void PduSessionResourceSetupRequestTransferIE::
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
   if (ret != 0)
-    Logger::ngap().error("Encode PDUSessionAggregateMaximumBitRate IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode PDUSessionAggregateMaximumBitRate IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -94,7 +96,8 @@ void PduSessionResourceSetupRequestTransferIE::setUlNgUUpTnlInformation(
   int ret = m_UpTransportLayerInformation.encode(
       ie->value.choice.UPTransportLayerInformation);
   if (!ret) {
-    Logger::ngap().error("Encode UPTransportLayerInformation IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode UPTransportLayerInformation IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
@@ -102,7 +105,8 @@ void PduSessionResourceSetupRequestTransferIE::setUlNgUUpTnlInformation(
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
   if (ret != 0)
-    Logger::ngap().error("Encode UPTransportLayerInformation IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode UPTransportLayerInformation IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -123,7 +127,8 @@ void PduSessionResourceSetupRequestTransferIE::setDataForwardingNotPossible() {
       std::make_optional<DataForwardingNotPossible>(tmp);
 
   if (!ret) {
-    Logger::ngap().error("Encode DataForwardingNotPossible IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode DataForwardingNotPossible IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
@@ -131,7 +136,8 @@ void PduSessionResourceSetupRequestTransferIE::setDataForwardingNotPossible() {
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
   if (ret != 0)
-    Logger::ngap().error("Encode DataForwardingNotPossible IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode DataForwardingNotPossible IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -150,14 +156,17 @@ void PduSessionResourceSetupRequestTransferIE::setPduSessionType(
 
   int ret = m_PduSessionType.encode(ie->value.choice.PDUSessionType);
   if (!ret) {
-    Logger::ngap().error("Encode PDUSessionType IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode PDUSessionType IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
 
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
-  if (ret != 0) Logger::ngap().error("Encode PDUSessionType IE error");
+  if (ret != 0)
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode PDUSessionType IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -192,14 +201,17 @@ void PduSessionResourceSetupRequestTransferIE::setSecurityIndication(
   int ret =
       m_SecurityIndication.value().encode(ie->value.choice.SecurityIndication);
   if (!ret) {
-    Logger::ngap().error("Encode SecurityIndication IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode SecurityIndication IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
 
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
-  if (ret != 0) Logger::ngap().error("Encode SecurityIndication IE error");
+  if (ret != 0)
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode SecurityIndication IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -229,14 +241,17 @@ void PduSessionResourceSetupRequestTransferIE::setSecurityIndication(
   int ret =
       m_SecurityIndication.value().encode(ie->value.choice.SecurityIndication);
   if (!ret) {
-    Logger::ngap().error("Encode SecurityIndication IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode SecurityIndication IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
 
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
-  if (ret != 0) Logger::ngap().error("Encode SecurityIndication IE error");
+  if (ret != 0)
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode SecurityIndication IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -255,14 +270,17 @@ void PduSessionResourceSetupRequestTransferIE::setNetworkInstance(
 
   int ret = m_NetworkInstance.value().encode(ie->value.choice.NetworkInstance);
   if (!ret) {
-    Logger::ngap().error("Encode NetworkInstance IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode NetworkInstance IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
 
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
-  if (ret != 0) Logger::ngap().error("Encode NetworkInstance IE error");
+  if (ret != 0)
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode NetworkInstance IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -428,14 +446,17 @@ void PduSessionResourceSetupRequestTransferIE::setQosFlowSetupRequestList(
   int ret = m_QosFlowSetupRequestList.encode(
       ie->value.choice.QosFlowSetupRequestList);
   if (!ret) {
-    Logger::ngap().error("Encode QosFlowSetupRequestList IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode QosFlowSetupRequestList IE error");
     oai::utils::utils::free_wrapper((void**) &ie);
     return;
   }
 
   ret = ASN_SEQUENCE_ADD(
       &m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list, ie);
-  if (ret != 0) Logger::ngap().error("Encode QosFlowSetupRequestList IE error");
+  if (ret != 0)
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode QosFlowSetupRequestList IE error");
   // oai::utils::utils::free_wrapper((void**) &ie);
 }
 
@@ -448,7 +469,8 @@ int PduSessionResourceSetupRequestTransferIE::encode(
   asn_enc_rval_t er = aper_encode_to_buffer(
       &asn_DEF_Ngap_PDUSessionResourceSetupRequestTransfer, NULL,
       m_PduSessionResourceSetupRequestTransferIe, buf, buf_size);
-  Logger::ngap().debug("er.encoded( %d)", er.encoded);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("er.encoded( %d)", er.encoded);
   // asn_fprint(stderr, er.failed_type, er.structure_ptr);
   return er.encoded;
 }
@@ -462,12 +484,15 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
       &asn_DEF_Ngap_PDUSessionResourceSetupRequestTransfer,
       (void**) &m_PduSessionResourceSetupRequestTransferIe, buf, buf_size);
   if (rc.code == RC_OK) {
-    Logger::ngap().debug("Decoded successfully");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Decoded successfully");
   } else if (rc.code == RC_WMORE) {
-    Logger::ngap().debug("More data expected, call again");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("More data expected, call again");
     return false;
   } else {
-    Logger::ngap().debug("Failure to decode data");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Failure to decode data");
     return false;
   }
 
@@ -494,16 +519,17 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.PDUSessionAggregateMaximumBitRate)) {
-            Logger::ngap().error(
-                "Decode NGAP PDUSessionAggregateMaximumBitRate IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error(
+                    "Decode NGAP PDUSessionAggregateMaximumBitRate IE error");
             return false;
           }
           m_PduSessionAggregateMaximumBitRateIe =
               std::make_optional<PduSessionAggregateMaximumBitRate>(
                   aggregate_maximum_bit_rate);
         } else {
-          Logger::ngap().error(
-              "Decode NGAP PDUSessionAggregateMaximumBitRate IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP PDUSessionAggregateMaximumBitRate IE error");
           return false;
         }
       } break;
@@ -519,14 +545,14 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.UPTransportLayerInformation)) {
-            Logger::ngap().error(
-                "Decode NGAP UPTransportLayerInformation IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error("Decode NGAP UPTransportLayerInformation IE error");
 
             return false;
           }
         } else {
-          Logger::ngap().error(
-              "Decode NGAP UPTransportLayerInformation IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP UPTransportLayerInformation IE error");
           return false;
         }
       } break;
@@ -543,16 +569,16 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.DataForwardingNotPossible)) {
-            Logger::ngap().error(
-                "Decode NGAP DataForwardingNotPossible IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error("Decode NGAP DataForwardingNotPossible IE error");
             return false;
           }
           m_DataForwardingNotPossible =
               std::make_optional<DataForwardingNotPossible>(
                   data_forwarding_not_possible);
         } else {
-          Logger::ngap().error(
-              "Decode NGAP DataForwardingNotPossible IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP DataForwardingNotPossible IE error");
           return false;
         }
       } break;
@@ -568,11 +594,13 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.PDUSessionType)) {
-            Logger::ngap().error("Decode NGAP PDUSessionType IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error("Decode NGAP PDUSessionType IE error");
             return false;
           }
         } else {
-          Logger::ngap().error("Decode NGAP PDUSessionType IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP PDUSessionType IE error");
           return false;
         }
       } break;
@@ -589,14 +617,16 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.SecurityIndication)) {
-            Logger::ngap().error("Decode NGAP SecurityIndication IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error("Decode NGAP SecurityIndication IE error");
 
             return false;
           }
           m_SecurityIndication =
               std::make_optional<SecurityIndication>(security_indication);
         } else {
-          Logger::ngap().error("Decode NGAP SecurityIndication IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP SecurityIndication IE error");
           return false;
         }
       } break;
@@ -613,13 +643,15 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.NetworkInstance)) {
-            Logger::ngap().error("Decode NGAP NetworkInstance IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error("Decode NGAP NetworkInstance IE error");
             return false;
           }
           m_NetworkInstance =
               std::make_optional<NetworkInstance>(network_instance);
         } else {
-          Logger::ngap().error("Decode NGAP NetworkInstance IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP NetworkInstance IE error");
           return false;
         }
       } break;
@@ -635,20 +667,22 @@ bool PduSessionResourceSetupRequestTransferIE::decode(
                   m_PduSessionResourceSetupRequestTransferIe->protocolIEs.list
                       .array[i]
                       ->value.choice.QosFlowSetupRequestList)) {
-            Logger::ngap().error(
-                "Decode NGAP QosFlowSetupRequestList IE error");
+            oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+                .error("Decode NGAP QosFlowSetupRequestList IE error");
             return false;
           }
         } else {
-          Logger::ngap().error("Decode NGAP QosFlowSetupRequestList IE error");
+          oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+              .error("Decode NGAP QosFlowSetupRequestList IE error");
           return false;
         }
       } break;
 
       default: {
-        Logger::ngap().error(
-            "Decode NGAP message PduSessionResourceSetupRequestTransferIE "
-            "error");
+        oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+            .error(
+                "Decode NGAP message PduSessionResourceSetupRequestTransferIE "
+                "error");
         return false;
       }
     }

ngap/ngap_ies/PduSessionResourceSetupResponseTransfer.cpp

@@ -21,7 +21,7 @@
 
 #include "PduSessionResourceSetupResponseTransfer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "ngap_utils.hpp"
 
 namespace oai::ngap {
@@ -72,7 +72,8 @@ void PduSessionResourceSetupResponseTransferIE::set(
   int ret = m_DlQosFlowPerTnlInformation.encode(
       m_PduSessionResourceSetupResponseTransferIe->dLQosFlowPerTNLInformation);
   if (!ret) {
-    Logger::ngap().error("Encode DLQoSFlowPerTNLInformation IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode DLQoSFlowPerTNLInformation IE error");
     return;
   }
 }
@@ -121,7 +122,7 @@ void PduSessionResourceSetupResponseTransferIE::
 
     int ret = m_AdditionalDlQosFlowPerTnlInformation.value().encode(ie);
     if (!ret) {
-      Logger::ngap().error(
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON).error(
           "Encode AdditionalDLQoSFlowPerTNLInformation IE error");
       return;
     }
@@ -150,7 +151,8 @@ void PduSessionResourceSetupResponseTransferIE::setSecurityResult(
       (Ngap_SecurityResult_t*) calloc(1, sizeof(Ngap_SecurityResult_t));
   int ret = m_SecurityResult.value().encode(*ie);
   if (!ret) {
-    Logger::ngap().error("Encode SecurityResult IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode SecurityResult IE error");
     return;
   }
   m_PduSessionResourceSetupResponseTransferIe->securityResult = ie;
@@ -165,7 +167,8 @@ int PduSessionResourceSetupResponseTransferIE::encode(
   asn_enc_rval_t er = aper_encode_to_buffer(
       &asn_DEF_Ngap_PDUSessionResourceSetupResponseTransfer, NULL,
       m_PduSessionResourceSetupResponseTransferIe, buf, buf_size);
-  Logger::ngap().debug("er.encoded %d", er.encoded);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("er.encoded %d", er.encoded);
   return er.encoded;
 }
 
@@ -178,22 +181,27 @@ bool PduSessionResourceSetupResponseTransferIE::decode(
       &asn_DEF_Ngap_PDUSessionResourceSetupResponseTransfer,
       (void**) &m_PduSessionResourceSetupResponseTransferIe, buf, buf_size);
   if (rc.code == RC_OK) {
-    Logger::ngap().debug("Decoded successfully");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Decoded successfully");
   } else if (rc.code == RC_WMORE) {
-    Logger::ngap().debug("More data expected, call again");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("More data expected, call again");
     return false;
   } else {
-    Logger::ngap().error("Failure to decode data");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Failure to decode data");
     return false;
   }
-  Logger::ngap().debug("rc.consumed to decode %d", rc.consumed);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("rc.consumed to decode %d", rc.consumed);
   // asn_fprint(stderr, &asn_DEF_Ngap_PDUSessionResourceSetupResponseTransfer,
   // m_PduSessionResourceSetupResponseTransferIe);
 
   if (!m_DlQosFlowPerTnlInformation.decode(
           m_PduSessionResourceSetupResponseTransferIe
               ->dLQosFlowPerTNLInformation)) {
-    Logger::ngap().error("Decode NGAP DLQoSFlowPerTNLInformation IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Decode NGAP DLQoSFlowPerTNLInformation IE error");
     return false;
   }
 
@@ -203,8 +211,8 @@ bool PduSessionResourceSetupResponseTransferIE::decode(
     if (!additional_qos_flow.decode(
             *m_PduSessionResourceSetupResponseTransferIe
                  ->additionalDLQosFlowPerTNLInformation)) {
-      Logger::ngap().error(
-          "Decode NGAP AdditionalDLQoSFlowPerTNLInformation IE error");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("Decode NGAP AdditionalDLQoSFlowPerTNLInformation IE error");
       return false;
     }
     m_AdditionalDlQosFlowPerTnlInformation =
@@ -214,7 +222,8 @@ bool PduSessionResourceSetupResponseTransferIE::decode(
     SecurityResult security_result = {};
     if (!security_result.decode(
             *m_PduSessionResourceSetupResponseTransferIe->securityResult)) {
-      Logger::ngap().error("Decode NGAP SecurityResult IE error");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("Decode NGAP SecurityResult IE error");
       return false;
     }
     m_SecurityResult = std::make_optional<SecurityResult>(security_result);

ngap/ngap_ies/PduSessionResourceSetupUnsuccessfulTransfer.cpp

@@ -21,7 +21,7 @@
 
 #include "PduSessionResourceSetupUnsuccessfulTransfer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "ngap_utils.hpp"
 
 namespace oai::ngap {
@@ -47,7 +47,8 @@ void PduSessionResourceSetupUnSuccessfulTransferIE::setCauseRadioNetwork(
   int ret =
       m_Cause.encode(m_PduSessionResourceSetupUnsuccessfulTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseRadioNetwork IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseRadioNetwork IE error");
     return;
   }
 }
@@ -61,7 +62,8 @@ void PduSessionResourceSetupUnSuccessfulTransferIE::setCauseTransport(
   int ret =
       m_Cause.encode(m_PduSessionResourceSetupUnsuccessfulTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseTransport IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseTransport IE error");
     return;
   }
 }
@@ -75,7 +77,8 @@ void PduSessionResourceSetupUnSuccessfulTransferIE::setCauseNas(
   int ret =
       m_Cause.encode(m_PduSessionResourceSetupUnsuccessfulTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseNas IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseNas IE error");
     return;
   }
 }
@@ -89,7 +92,8 @@ void PduSessionResourceSetupUnSuccessfulTransferIE::setCauseProtocol(
   int ret =
       m_Cause.encode(m_PduSessionResourceSetupUnsuccessfulTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseProtocol IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseProtocol IE error");
     return;
   }
 }
@@ -103,7 +107,8 @@ void PduSessionResourceSetupUnSuccessfulTransferIE::setCauseMisc(
   int ret =
       m_Cause.encode(m_PduSessionResourceSetupUnsuccessfulTransferIe->cause);
   if (!ret) {
-    Logger::ngap().error("Encode CauseMisc IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode CauseMisc IE error");
     return;
   }
 }
@@ -117,7 +122,8 @@ int PduSessionResourceSetupUnSuccessfulTransferIE::encode(
   asn_enc_rval_t er = aper_encode_to_buffer(
       &asn_DEF_Ngap_PDUSessionResourceSetupUnsuccessfulTransfer, NULL,
       m_PduSessionResourceSetupUnsuccessfulTransferIe, buf, buf_size);
-  Logger::ngap().debug("er.encoded( %d)", er.encoded);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("er.encoded( %d)", er.encoded);
   return er.encoded;
 }
 
@@ -131,22 +137,27 @@ bool PduSessionResourceSetupUnSuccessfulTransferIE::decode(
       (void**) &m_PduSessionResourceSetupUnsuccessfulTransferIe, buf, buf_size);
 
   if (rc.code == RC_OK) {
-    Logger::ngap().debug("Decoded successfully");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Decoded successfully");
   } else if (rc.code == RC_WMORE) {
-    Logger::ngap().debug("More data expected, call again");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("More data expected, call again");
     return false;
   } else {
-    Logger::ngap().debug("Failure to decode data");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("Failure to decode data");
     return false;
   }
-  Logger::ngap().debug("rc.consumed to decode %d", rc.consumed);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("rc.consumed to decode %d", rc.consumed);
 
   // asn_fprint(stderr,
   // &asn_DEF_Ngap_PDUSessionResourceSetupUnsuccessfulTransfer,
   // m_PduSessionResourceSetupUnsuccessfulTransferIe);
 
   if (!m_Cause.decode(m_PduSessionResourceSetupUnsuccessfulTransferIe->cause)) {
-    Logger::ngap().error("Decode Cause IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Decode Cause IE error");
     return false;
   }
 

ngap/ngap_ies/QosFlowToBeForwardedList.cpp

@@ -21,7 +21,7 @@
 
 #include "QosFlowToBeForwardedList.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -48,13 +48,16 @@ bool QosFlowToBeForwardedList::encode(
             1, sizeof(Ngap_QosFlowToBeForwardedItem_t));
     if (!response) return false;
     if (!m_ItemList[i].encode(*response)) {
-      Logger::ngap().debug("Encode QosFlowTowardedItem error");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .debug("Encode QosFlowTowardedItem error");
       return false;
     }
-    Logger::ngap().debug("QFI %d", response->qosFlowIdentifier);
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .debug("QFI %d", response->qosFlowIdentifier);
 
     if (ASN_SEQUENCE_ADD(&qosList->list, response) != 0) {
-      Logger::ngap().debug("Encode QosFlowTowardedList error");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .debug("Encode QosFlowTowardedList error");
       return false;
     }
   }

ngap/ngap_ies/RanStatusTransferTransparentContainer.cpp

@@ -21,7 +21,7 @@
 
 #include "RanStatusTransferTransparentContainer.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -49,8 +49,8 @@ void RanStatusTransferTransparentContainer::setDrbSubjectList(
 bool RanStatusTransferTransparentContainer::encode(
     Ngap_RANStatusTransfer_TransparentContainer_t& ranStatusTransfer) const {
   if (!m_DrbList.encode(ranStatusTransfer.dRBsSubjectToStatusTransferList)) {
-    Logger::ngap().error(
-        "Encode RANStatusTransferTransparentContainer IE error!");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode RANStatusTransferTransparentContainer IE error!");
     return false;
   }
   return true;
@@ -60,8 +60,8 @@ bool RanStatusTransferTransparentContainer::encode(
 bool RanStatusTransferTransparentContainer::decode(
     const Ngap_RANStatusTransfer_TransparentContainer_t& ranStatusTransfer) {
   if (!m_DrbList.decode(ranStatusTransfer.dRBsSubjectToStatusTransferList)) {
-    Logger::ngap().error(
-        "Decode RANStatusTransferTransparentContainer IE error!");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Decode RANStatusTransferTransparentContainer IE error!");
     return false;
   }
   return true;

ngap/ngap_ies/Tac.cpp

@@ -21,7 +21,7 @@
 
 #include "Tac.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -61,7 +61,8 @@ bool TAC::decode(const Ngap_TAC_t& tac) {
   for (int i = 0; i < tac.size; i++) {
     m_Tac |= tac.buf[i] << ((tac.size - 1 - i) * 8);
   }
-  Logger::ngap().debug("Received TAC 0x%x", m_Tac);
+  oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+      .debug("Received TAC 0x%x", m_Tac);
   return true;
 }
 

ngap/ngap_ies/UeAssociatedLogicalNgConnectionItem.cpp

@@ -21,7 +21,7 @@
 
 #include "UeAssociatedLogicalNgConnectionItem.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 #include "utils.hpp"
 
 namespace oai::ngap {
@@ -46,7 +46,8 @@ bool UeAssociatedLogicalNgConnectionItem::setAmfUeNgapId(const uint64_t& id) {
 
   int ret = m_AmfUeNgapId.value().encode(ie->value.choice.AMF_UE_NGAP_ID);
   if (!ret) {
-    Logger::ngap().error("Encode AMF_UE_NGAP_ID IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode AMF_UE_NGAP_ID IE error");
   }
   oai::utils::utils::free_wrapper((void**) &ie);
   return true;
@@ -75,7 +76,8 @@ void UeAssociatedLogicalNgConnectionItem::setRanUeNgapId(
 
   int ret = m_RanUeNgapId.value().encode(ie->value.choice.RAN_UE_NGAP_ID);
   if (!ret) {
-    Logger::ngap().error("Encode RAN_UE_NGAP_ID IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .error("Encode RAN_UE_NGAP_ID IE error");
   }
   oai::utils::utils::free_wrapper((void**) &ie);
   return;
@@ -118,7 +120,8 @@ bool UeAssociatedLogicalNgConnectionItem::decode(
   if (item.aMF_UE_NGAP_ID) {
     AmfUeNgapId tmp = {};
     if (!tmp.decode(*item.aMF_UE_NGAP_ID)) {
-      Logger::ngap().error("Decoded NGAP AmfUeNgapId IE error");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("Decoded NGAP AmfUeNgapId IE error");
       return false;
     }
     m_AmfUeNgapId = std::optional<AmfUeNgapId>(tmp);
@@ -127,7 +130,8 @@ bool UeAssociatedLogicalNgConnectionItem::decode(
   if (item.rAN_UE_NGAP_ID) {
     RanUeNgapId tmp = {};
     if (!tmp.decode(*item.rAN_UE_NGAP_ID)) {
-      Logger::ngap().error("Decoded NGAP RAN_UE_NGAP_ID IE error");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .error("Decoded NGAP RAN_UE_NGAP_ID IE error");
       return false;
     }
     m_RanUeNgapId = std::optional<RanUeNgapId>(tmp);

ngap/ngap_ies/UeSecurityCapabilities.cpp

@@ -21,8 +21,6 @@
 
 #include "UeSecurityCapabilities.hpp"
 
-#include "conversions.h"
-
 namespace oai::ngap {
 
 //------------------------------------------------------------------------------

ngap/ngap_ies/UserLocationInformation.cpp

@@ -21,7 +21,7 @@
 
 #include "UserLocationInformation.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -96,7 +96,8 @@ bool UserLocationInformation::encode(
       break;
     }
     default:
-      Logger::ngap().warn("UserLocationInformation encode error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .warn("UserLocationInformation encode error!");
       return false;
   }
   return true;
@@ -125,7 +126,8 @@ bool UserLocationInformation::decode(
       break;
     }
     default:
-      Logger::ngap().warn("UserLocationInformation decode error!");
+      oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+          .warn("UserLocationInformation decode error!");
       return false;
   }
   return true;

ngap/ngap_ies/UserLocationInformationEutra.cpp

@@ -21,7 +21,7 @@
 
 #include "UserLocationInformationEutra.hpp"
 
-#include "logger.hpp"
+#include "logger_base.hpp"
 
 namespace oai::ngap {
 
@@ -48,11 +48,13 @@ void UserLocationInformationEutra::get(EutraCgi& eutraCgi, Tai& tai) const {
 bool UserLocationInformationEutra::encode(
     Ngap_UserLocationInformationEUTRA_t& userLocationInformation) const {
   if (!m_EutraCgi.encode(userLocationInformation.eUTRA_CGI)) {
-    Logger::ngap().warn("Encode eUTRA_CGI IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .warn("Encode eUTRA_CGI IE error");
     return false;
   }
   if (!m_Tai.encode(userLocationInformation.tAI)) {
-    Logger::ngap().warn("Encode Tai IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .warn("Encode Tai IE error");
     return false;
   }
   return true;
@@ -62,12 +64,14 @@ bool UserLocationInformationEutra::encode(
 bool UserLocationInformationEutra::decode(
     const Ngap_UserLocationInformationEUTRA_t& userLocationInformation) {
   if (!m_EutraCgi.decode(userLocationInformation.eUTRA_CGI)) {
-    Logger::ngap().warn("Decode eUTRA_CGI IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .warn("Decode eUTRA_CGI IE error");
     return false;
   }
 
   if (!m_Tai.decode(userLocationInformation.tAI)) {
-    Logger::ngap().warn("Decode Tai IE error");
+    oai::logger::logger_registry::get_logger(LOGGER_COMMON)
+        .warn("Decode Tai IE error");
     return false;
   }
   return true;