Fix memory leakage

[sim/e2-interface.git] / e2sim / e2sm_examples / kpm_e2sm / src / kpm / kpm_callbacks.cpp

diff --git a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 26958b6..bcfb513
--- a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
+++ b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/kpm_callbacks.cpp
@@ -245,7 +245,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
          
          json::json_pointer p5(std::string("/ueMeasReport/ueMeasReportList/") + std::to_string(i) +"/neighbourCellList");
          
-         uint8_t *crnti_buf = (uint8_t*)calloc(1,2);
+         uint8_t crnti_buf[3] = {0, };
 
          if (ueId.find("Pedestrian") != string::npos) {
            std::string ind = ueId.substr(11);
@@ -306,14 +306,14 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
            }
 
 
-           uint8_t *neighbor_cellid_buf = (uint8_t*)calloc(1,5);
+           uint8_t neighbor_cellid_buf[6] = {0, };
            neighbor_cellid_buf[0] = 0x22;
            neighbor_cellid_buf[1] = 0x5B;
            neighbor_cellid_buf[2] = 0xD6;
            neighbor_cellid_buf[3] = nextNbCell;
            neighbor_cellid_buf[4] = 0x70;
            
-           char *cid_buf = (char*)calloc(1,24);
+           char cid_buf[25] = {0, };
            get_cell_id(neighbor_cellid_buf,cid_buf);
            
            
@@ -333,22 +333,22 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
          const uint8_t *neighbor_buf = reinterpret_cast<const uint8_t*>(neighbor_str.c_str());
 
 
-         uint8_t *nrcellid_buf = (uint8_t*)calloc(1,5);
+         uint8_t nrcellid_buf[6] = {0, };
          nrcellid_buf[0] = 0x22;
          nrcellid_buf[1] = 0x5B;
          nrcellid_buf[2] = 0xD6;
          nrcellid_buf[3] = nextCellId;
          nrcellid_buf[4] = 0x70;
 
-         uint8_t *gnbid_buf = (uint8_t*)calloc(1,3);
+         uint8_t gnbid_buf[4] = {0, };
          gnbid_buf[0] = 0x22;
          gnbid_buf[1] = 0x5B;
          gnbid_buf[2] = 0xD6;
 
-         uint8_t cuupid_buf[1];
+         uint8_t cuupid_buf[2] = {0, };
          cuupid_buf[0] = 20000;
 
-         uint8_t duid_buf[1];
+         uint8_t duid_buf[2] = {0, };
          duid_buf[0] = 20000;
 
          uint8_t *cuupname_buf = (uint8_t*)"GNBCUUP5";   
@@ -369,6 +369,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                   ATS_ALIGNED_BASIC_PER,
                                                                   &asn_DEF_E2SM_KPM_IndicationMessage,
                                                                   ind_msg_cucp_ue, e2sm_message_buf_cucp_ue, e2sm_message_buf_size_cucp_ue);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationMessage, ind_msg_cucp_ue);
          
          fprintf(stderr, "er encded is %d\n", er_message_cucp_ue.encoded);
          fprintf(stderr, "after encoding message\n");
@@ -386,6 +387,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                  ATS_ALIGNED_BASIC_PER,
                                                                  &asn_DEF_E2SM_KPM_IndicationHeader,
                                                                  ind_header_cucp_ue, e2sm_header_buf_cucp_ue, e2sm_header_buf_size_cucp_ue);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationHeader, ind_header_cucp_ue);
 
          fprintf(stderr, "er encded is %d\n", er_header_cucp_ue.encoded);
          fprintf(stderr, "error buf is %s\n", (char*)e2sm_header_buf_cucp_ue);
@@ -427,6 +429,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                               ATS_ALIGNED_BASIC_PER,
                                                               &asn_DEF_E2SM_KPM_IndicationMessage,
                                                               ind_msg_cuup_ue, e2sm_message_buf_cuup_ue, e2sm_message_buf_size_cuup_ue);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationMessage, ind_msg_cuup_ue);
          
          fprintf(stderr, "er encded is %d\n", er_message_cuup_ue.encoded);
          fprintf(stderr, "after encoding message\n");
@@ -442,6 +445,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                  ATS_ALIGNED_BASIC_PER,
                                                                  &asn_DEF_E2SM_KPM_IndicationHeader,
                                                                  ind_header_cuup_ue, e2sm_header_buf_cuup_ue, e2sm_header_buf_size_cuup_ue);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationHeader, ind_header_cuup_ue);
          
          
          E2AP_PDU *pdu_cuup_ue = (E2AP_PDU*)calloc(1,sizeof(E2AP_PDU));        
@@ -480,6 +484,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                 ind_message_du_ue,
                                                                 e2sm_message_buf_du_ue,
                                                                 e2sm_message_buf_size_du_ue);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationMessage, ind_message_du_ue);
          
          fprintf(stderr, "er encded is %d\n", er_message_du_ue.encoded);
          fprintf(stderr, "after encoding message\n");
@@ -496,6 +501,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                &asn_DEF_E2SM_KPM_IndicationHeader,
                                                                ind_header_du_ue, e2sm_header_buf_du_ue,
                                                                e2sm_header_buf_size_du_ue);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationHeader, ind_header_du_ue);
          
          
          E2AP_PDU *pdu_du_ue = (E2AP_PDU*)calloc(1,sizeof(E2AP_PDU));
@@ -557,22 +563,22 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
          uint8_t *sd_buf = (uint8_t*)"100";
          uint8_t *plmnid_buf = (uint8_t*)"747";
 
-         uint8_t *nrcellid_buf = (uint8_t*)calloc(1,5);
+         uint8_t nrcellid_buf[6] = {0, };
          nrcellid_buf[0] = 0x22;
          nrcellid_buf[1] = 0x5B;
          nrcellid_buf[2] = 0xD6;
          nrcellid_buf[3] = cellid;
          nrcellid_buf[4] = 0x70;
 
-         uint8_t *gnbid_buf = (uint8_t*)calloc(1,3);
+         uint8_t gnbid_buf[4] = {0, };
          gnbid_buf[0] = 0x22;
          gnbid_buf[1] = 0x5B;
          gnbid_buf[2] = 0xD6;
 
-         uint8_t cuupid_buf[1];
+         uint8_t cuupid_buf[2] = {0, };
          cuupid_buf[0] = 20000;
 
-         uint8_t duid_buf[1];
+         uint8_t duid_buf[2] = {0, };
          duid_buf[0] = 20000;
 
          uint8_t *cuupname_buf = (uint8_t*)"GNBCUUP5";           
@@ -597,6 +603,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                  ATS_ALIGNED_BASIC_PER,
                                                                  &asn_DEF_E2SM_KPM_IndicationMessage,
                                                                  ind_msg_style5, e2sm_message_buf_style5, e2sm_message_buf_size_style5);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationMessage, ind_msg_style5);
          
          fprintf(stderr, "er encded is %d\n", er_message_style5.encoded);
          fprintf(stderr, "after encoding message\n");
@@ -616,6 +623,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                 &asn_DEF_E2SM_KPM_IndicationHeader,
                                                                 ind_header_style5,
                                                                 e2sm_header_buf_style5, e2sm_header_buf_size_style5);    
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationHeader, ind_header_style5);
          
          
          encoding::generate_e2apv1_indication_request_parameterized(pdu_style5, requestorId,
@@ -660,6 +668,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                  &asn_DEF_E2SM_KPM_IndicationMessage,
                                                                  ind_message_style1,
                                                                  e2sm_message_buf_style1, e2sm_message_buf_size_style1);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationMessage, ind_message_style1);
          
          fprintf(stderr, "er encded is %d\n", er_message_style1.encoded);
          fprintf(stderr, "after encoding message\n");
@@ -681,6 +690,7 @@ void run_report_loop(long requestorId, long instanceId, long ranFunctionId, long
                                                                 &asn_DEF_E2SM_KPM_IndicationHeader,
                                                                 ind_header_style1,
                                                                 e2sm_header_buf_style1, e2sm_header_buf_size_style1);
+         ASN_STRUCT_FREE(asn_DEF_E2SM_KPM_IndicationHeader, ind_header_style1);
          
          encoding::generate_e2apv1_indication_request_parameterized(pdu_style1, requestorId,
                                                                     instanceId, ranFunctionId,