Fix issue for usage of free_wrapper

src/amf-app/amf_n1.cpp

@@ -1278,7 +1278,6 @@ void amf_n1::registration_request_handle(
     Logger::amf_n1().error("Missing Mandatory IE ngKSI...");
     send_registration_reject_msg(
         _5GMM_CAUSE_INVALID_MANDATORY_INFO, ran_ue_ngap_id, amf_ue_ngap_id);
-    free_wrapper((void**) &registration_request);
     return;
   }
   nc.get()->ngKsi = ngKSI;

src/amf-app/amf_n2.hpp

@@ -45,21 +45,21 @@ class amf_n2 : public ngap::ngap_app {
   void handle_itti_message(itti_new_sctp_association& new_assoc);
 
   /*
-   * Handle ITTI message (Downlink NAS Transfer)
+   * Handle ITTI message (NG Setup Request)
    * @param [itti_downlink_nas_transfer&]: ITTI message
    * @return void
    */
   void handle_itti_message(itti_ng_setup_request& ng_setup_req);
 
   /*
-   * Handle ITTI message (Downlink NAS Transfer)
+   * Handle ITTI message (NG Setup Request)
    * @param [std::shared_ptr<itti_ng_setup_request>]: ITTI message
    * @return void
    */
   void handle_itti_message(std::shared_ptr<itti_ng_setup_request> ng_setup_req);
 
   /*
-   * Handle ITTI message (Downlink NAS Transfer)
+   * Handle ITTI message (NG Reset)
    * @param [itti_downlink_nas_transfer&]: ITTI message
    * @return void
    */

src/itti/msgs/itti_msg_n2.hpp

@@ -70,7 +70,7 @@ class itti_ng_setup_request : public itti_msg_n2 {
   itti_ng_setup_request(const itti_ng_setup_request& i) : itti_msg_n2(i) {
     ngSetupReq = i.ngSetupReq;
   }
-  virtual ~itti_ng_setup_request() { free_wrapper((void**) &ngSetupReq); }
+  virtual ~itti_ng_setup_request() { delete ngSetupReq; }
 
  public:
   NGSetupRequestMsg* ngSetupReq;
@@ -85,7 +85,7 @@ class itti_ng_reset : public itti_msg_n2 {
   itti_ng_reset(const itti_ng_reset& i) : itti_msg_n2(i) {
     ngReset = i.ngReset;
   }
-  virtual ~itti_ng_reset() { free_wrapper((void**) &ngReset); }
+  virtual ~itti_ng_reset() { delete ngReset; }
 
  public:
   NGResetMsg* ngReset;
@@ -108,7 +108,7 @@ class itti_initial_ue_message : public itti_msg_n2 {
   itti_initial_ue_message(const itti_initial_ue_message& i) : itti_msg_n2(i) {
     initUeMsg = i.initUeMsg;
   }
-  virtual ~itti_initial_ue_message() { free_wrapper((void**) &initUeMsg); }
+  virtual ~itti_initial_ue_message() { delete initUeMsg; }
 
   InitialUEMessageMsg* initUeMsg;
 };
@@ -122,7 +122,7 @@ class itti_ul_nas_transport : public itti_msg_n2 {
   itti_ul_nas_transport(const itti_ul_nas_transport& i) : itti_msg_n2(i) {
     ulNas = i.ulNas;
   }
-  virtual ~itti_ul_nas_transport() { free_wrapper((void**) &ulNas); }
+  virtual ~itti_ul_nas_transport() { delete ulNas; }
 
   UplinkNASTransportMsg* ulNas;
 };
@@ -140,7 +140,7 @@ class itti_dl_nas_transport : public itti_msg_n2 {
     amf_ue_ngap_id = i.amf_ue_ngap_id;
     nas            = i.nas;
   }
-  virtual ~itti_dl_nas_transport() { free_wrapper((void**) &nas); }
+  virtual ~itti_dl_nas_transport() { bdestroy_wrapper(&nas); }
 
  public:
   uint32_t ran_ue_ngap_id;
@@ -177,9 +177,9 @@ class itti_initial_context_setup_request : public itti_msg_n2 {
     is_n2sm_avaliable = i.is_n2sm_avaliable;
   }
   virtual ~itti_initial_context_setup_request() {
-    free_wrapper((void**) &kgnb);
-    free_wrapper((void**) &nas);
-    free_wrapper((void**) &n2sm);
+    bdestroy_wrapper(&kgnb);
+    bdestroy_wrapper(&nas);
+    bdestroy_wrapper(&n2sm);
   }
 
   uint32_t ran_ue_ngap_id;
@@ -214,8 +214,8 @@ class itti_pdu_session_resource_setup_request : public itti_msg_n2 {
     pdu_session_id = i.pdu_session_id;
   }
   virtual ~itti_pdu_session_resource_setup_request() {
-    free_wrapper((void**) &nas);
-    free_wrapper((void**) &n2sm);
+    bdestroy_wrapper(&nas);
+    bdestroy_wrapper(&n2sm);
   }
 
   bstring nas;
@@ -248,8 +248,8 @@ class itti_pdu_session_resource_modify_request : public itti_msg_n2 {
     s_NSSAI        = i.s_NSSAI;
   }
   virtual ~itti_pdu_session_resource_modify_request() {
-    free_wrapper((void**) &nas);
-    free_wrapper((void**) &n2sm);
+    bdestroy_wrapper(&nas);
+    bdestroy_wrapper(&n2sm);
   }
 
   bstring nas;
@@ -281,8 +281,8 @@ class itti_pdu_session_resource_release_command : public itti_msg_n2 {
     pdu_session_id = i.pdu_session_id;
   }
   virtual ~itti_pdu_session_resource_release_command() {
-    free_wrapper((void**) &nas);
-    free_wrapper((void**) &n2sm);
+    bdestroy_wrapper(&nas);
+    bdestroy_wrapper(&n2sm);
   }
 
   bstring nas;
@@ -303,9 +303,7 @@ class itti_ue_context_release_request : public itti_msg_n2 {
       : itti_msg_n2(i) {
     ueCtxRel = i.ueCtxRel;
   }
-  virtual ~itti_ue_context_release_request() {
-    free_wrapper((void**) &ueCtxRel);
-  }
+  virtual ~itti_ue_context_release_request() { delete ueCtxRel; }
 
   UEContextReleaseRequestMsg* ueCtxRel;
 };
@@ -343,9 +341,7 @@ class itti_ue_context_release_complete : public itti_msg_n2 {
       : itti_msg_n2(i) {
     ueCtxRelCmpl = i.ueCtxRelCmpl;
   }
-  virtual ~itti_ue_context_release_complete() {
-    free_wrapper((void**) &ueCtxRelCmpl);
-  }
+  virtual ~itti_ue_context_release_complete() { delete ueCtxRelCmpl; }
 
   UEContextReleaseCompleteMsg* ueCtxRelCmpl;
 };
@@ -362,9 +358,7 @@ class itti_ue_radio_capability_indication : public itti_msg_n2 {
       : itti_msg_n2(i) {
     ueRadioCap = i.ueRadioCap;
   }
-  virtual ~itti_ue_radio_capability_indication() {
-    free_wrapper((void**) &ueRadioCap);
-  }
+  virtual ~itti_ue_radio_capability_indication() { delete ueRadioCap; }
 
   UeRadioCapabilityInfoIndicationMsg* ueRadioCap;
 };
@@ -378,7 +372,7 @@ class itti_handover_required : public itti_msg_n2 {
   itti_handover_required(const itti_handover_required& i) : itti_msg_n2(i) {
     handoverReq = i.handoverReq;
   }
-  virtual ~itti_handover_required() { free_wrapper((void**) &handoverReq); }
+  virtual ~itti_handover_required() { delete handoverReq; }
 
   HandoverRequiredMsg* handoverReq;
 };
@@ -410,9 +404,7 @@ class itti_handover_request_Ack : public itti_msg_n2 {
       : itti_msg_n2(i) {
     handoverrequestAck = i.handoverrequestAck;
   }
-  virtual ~itti_handover_request_Ack() {
-    free_wrapper((void**) &handoverrequestAck);
-  }
+  virtual ~itti_handover_request_Ack() { delete handoverrequestAck; }
 
   HandoverRequestAck* handoverrequestAck;
 };
@@ -426,7 +418,7 @@ class itti_handover_notify : public itti_msg_n2 {
   itti_handover_notify(const itti_handover_notify& i) : itti_msg_n2(i) {
     handovernotify = i.handovernotify;
   }
-  virtual ~itti_handover_notify() { free_wrapper((void**) &handovernotify); }
+  virtual ~itti_handover_notify() { delete handovernotify; }
 
   HandoverNotifyMsg* handovernotify;
 };
@@ -442,9 +434,7 @@ class itti_uplink_ran_status_transfer : public itti_msg_n2 {
       : itti_msg_n2(i) {
     uplinkrantransfer = i.uplinkrantransfer;
   }
-  virtual ~itti_uplink_ran_status_transfer() {
-    free_wrapper((void**) &uplinkrantransfer);
-  }
+  virtual ~itti_uplink_ran_status_transfer() { delete uplinkrantransfer; }
 
   UplinkRANStatusTransfer* uplinkrantransfer;
 };