SIM-116: Update list of performance metrics in E2 setup request for oransim

Change-Id: Ie325e09c6ddf205a854825ad6628cfa4ffa4bbf7
Signed-off-by: Tuan Nguyen <hoang.su.tk@gmail.com>

diff --git a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.cpp b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.cpp
index 8bfe7c6..c34c370 100755 (executable)
--- a/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.cpp
+++ b/e2sim/e2sm_examples/kpm_e2sm/src/kpm/encode_kpm.cpp
@@ -27,15 +27,26 @@
 #include "e2sim_defs.h"
 using namespace std;
 
+const char* performance_measurements[] = {
+  "DRB.RlcSduTransmittedVolumeDL_Filter", 
+  "DRB.RlcSduTransmittedVolumeUL_Filter", 
+  "DRB.PerDataVolumeDLDist.Bin ", 
+  "DRB.PerDataVolumeULDist.Bin", 
+  "DRB.RlcPacketDropRateDLDist", 
+  "DRB.PacketLossRateULDist", 
+  "L1M.DL-SS-RSRP.SSB",
+  "L1M.DL-SS-SINR.SSB",
+  "L1M.UL-SRS-RSRP"
+  };
+
+int NUMBER_MEASUREMENTS = 9;
+
 void encode_kpm_function_description(E2SM_KPM_RANfunction_Description_t* ranfunc_desc) {
   uint8_t* short_name = (uint8_t*)"ORAN-E2SM-KPM";
   uint8_t* func_desc = (uint8_t*)"KPM Monitor";
   uint8_t* e2sm_odi = (uint8_t*)"OID123";
 
   LOG_I("short_name: %s, func_desc: %s, e2sm_odi: %s", short_name, func_desc, e2sm_odi);
-
-  long inst = 1;
-
   ASN_STRUCT_RESET(asn_DEF_E2SM_KPM_RANfunction_Description, ranfunc_desc);
 
   ranfunc_desc->ranFunction_Name.ranFunction_ShortName.size = strlen((char*)short_name);
@@ -49,7 +60,8 @@ void encode_kpm_function_description(E2SM_KPM_RANfunction_Description_t* ranfunc
   memcpy(ranfunc_desc->ranFunction_Name.ranFunction_Description.buf, func_desc,
          strlen((char*)func_desc));
   ranfunc_desc->ranFunction_Name.ranFunction_Description.size = strlen((char*)func_desc);
-  ranfunc_desc->ranFunction_Name.ranFunction_Instance = &inst;
+  ranfunc_desc->ranFunction_Name.ranFunction_Instance = (long *)calloc(1, sizeof(long));
+  *ranfunc_desc->ranFunction_Name.ranFunction_Instance = 1;
 
   ranfunc_desc->ranFunction_Name.ranFunction_E2SM_OID.buf =
       (uint8_t*)calloc(1, strlen((char*)e2sm_odi));
@@ -66,7 +78,7 @@ void encode_kpm_function_description(E2SM_KPM_RANfunction_Description_t* ranfunc
   trigger_style->ric_EventTriggerStyle_Name.buf = (uint8_t*)calloc(1, strlen((char*)style_name));
   memcpy(trigger_style->ric_EventTriggerStyle_Name.buf, style_name, strlen((char*)style_name));
   trigger_style->ric_EventTriggerStyle_Name.size = strlen((char*)style_name);
-  trigger_style->ric_EventTriggerFormat_Type = 5;
+  trigger_style->ric_EventTriggerFormat_Type = 1;
 
   ranfunc_desc->ric_EventTriggerStyle_List =
       (E2SM_KPM_RANfunction_Description::
@@ -80,10 +92,9 @@ void encode_kpm_function_description(E2SM_KPM_RANfunction_Description_t* ranfunc
 
   MeasurementInfo_Action_List_t* measInfo_Action_List =
       (MeasurementInfo_Action_List_t*)calloc(1, sizeof(MeasurementInfo_Action_List_t));
-  uint8_t* measured_metrics[] = {(uint8_t*)"CQI", (uint8_t*)"RSRP", (uint8_t*)"RSRQ"};
 
-  for (int i = 0; i < 3; i++) {
-    uint8_t* metrics = measured_metrics[i];
+  for (int i = 0; i < NUMBER_MEASUREMENTS; i++) {
+    uint8_t* metrics = (uint8_t *)performance_measurements[i];
     MeasurementInfo_Action_Item_t* measItem =
         (MeasurementInfo_Action_Item_t*)calloc(1, sizeof(MeasurementInfo_Action_Item_t));
     measItem->measName.buf = (uint8_t*)calloc(1, strlen((char*)metrics));
@@ -218,90 +229,67 @@ void kpm_report_indication_header_initialized(E2SM_KPM_IndicationHeader_t* ihead
   ind_header->colletStartTime = *ts;
   if (ts) free(ts);
 
-  uint8_t* buf5 = (uint8_t*)"1.0";
-  ind_header->fileFormatversion = (PrintableString_t*)calloc(1, sizeof(PrintableString_t));
-  ind_header->fileFormatversion->buf = (uint8_t*)calloc(1, strlen((char*)buf5));
-  memcpy(ind_header->fileFormatversion->buf, buf5, strlen((char*)buf5));
-  ind_header->fileFormatversion->size = strlen((char*)buf5);
-
   ihead->indicationHeader_formats.present =
       E2SM_KPM_IndicationHeader__indicationHeader_formats_PR_indicationHeader_Format1;
   ihead->indicationHeader_formats.choice.indicationHeader_Format1 = ind_header;
 
-  // xer_fprint(stderr, &asn_DEF_E2SM_KPM_IndicationHeader, ihead);
 }
 
 void ue_meas_kpm_report_indication_message_initialized(
     E2SM_KPM_IndicationMessage_t* indicationmessage, uint8_t* nrcellid_buf, uint8_t* crnti_buf,
     const uint8_t* serving_buf, const uint8_t* neighbor_buf) {
-  GranularityPeriod_t period = 1;
-  MeasurementData_t* measData = (MeasurementData_t*)calloc(1, sizeof(MeasurementData_t));
-  MeasurementDataItem_t* measDataItem =
-      (MeasurementDataItem_t*)calloc(1, sizeof(MeasurementDataItem_t));
-  MeasurementRecord_t* measDataItem_record =
-      (MeasurementRecord_t*)calloc(1, sizeof(MeasurementRecord_t));
-  MeasurementRecordItem_t* measDataRecordItem =
-      (MeasurementRecordItem_t*)calloc(1, sizeof(MeasurementRecordItem_t));
-
-  unsigned long val = 1;
-  measDataRecordItem->present = MeasurementRecordItem_PR_integer;
-  measDataRecordItem->choice.integer = val;
-
-  ASN_SEQUENCE_ADD(&measDataItem_record->list, measDataRecordItem);
+  
+  MeasurementRecord_t* measDataItem_record = (MeasurementRecord_t*)calloc(1, sizeof(MeasurementRecord_t));
+  for (size_t i = 0; i < NUMBER_MEASUREMENTS; i++)
+  {
+    MeasurementRecordItem_t* measDataRecordItem = (MeasurementRecordItem_t*)calloc(1, sizeof(MeasurementRecordItem_t));
+    measDataRecordItem->present = MeasurementRecordItem_PR_integer;
+    measDataRecordItem->choice.integer = 1;
+
+    ASN_SEQUENCE_ADD(&measDataItem_record->list, measDataRecordItem);
+  }
 
+  MeasurementDataItem_t* measDataItem = (MeasurementDataItem_t*)calloc(1, sizeof(MeasurementDataItem_t));
   measDataItem->measRecord = *measDataItem_record;
-  long incomplete = 0;
   measDataItem->incompleteFlag = (long*)calloc(1, sizeof(long));
-  *measDataItem->incompleteFlag = incomplete;
+  *measDataItem->incompleteFlag = 0;
+
+  MeasurementData_t* measData = (MeasurementData_t*)calloc(1, sizeof(MeasurementData_t));
   ASN_SEQUENCE_ADD(&measData->list, measDataItem);
 
+  MeasurementInfoList_t* measList = (MeasurementInfoList_t*)calloc(1, sizeof(MeasurementInfoList_t));
+  for (size_t i = 0; i < NUMBER_MEASUREMENTS; i++)
+  {
+    MeasurementLabel_t* measLabel = (MeasurementLabel_t*)calloc(1, sizeof(MeasurementLabel_t));
+    measLabel->noLabel = (long *)calloc(1, sizeof(long));
+    *measLabel->noLabel = 0;
+
+    LabelInfoItem_t* labelItem = (LabelInfoItem_t*)calloc(1, sizeof(LabelInfoItem_t));
+    labelItem->measLabel = *measLabel;
+
+    LabelInfoList_t* labelList = (LabelInfoList_t*)calloc(1, sizeof(LabelInfoList_t));
+    ASN_SEQUENCE_ADD(&labelList->list, labelItem);
+
+    MeasurementType_t measType;
+    measType.present = MeasurementType_PR_measID;
+    uint8_t* metrics = (uint8_t *)performance_measurements[i];
+    measType.choice.measName.buf = (uint8_t*)calloc(1, strlen((char*)metrics));
+    memcpy(measType.choice.measName.buf, metrics, strlen((char*)metrics));
+    measType.choice.measName.size = strlen((char*)metrics);
+
+    MeasurementInfoItem_t* measItem = (MeasurementInfoItem_t*)calloc(1, sizeof(MeasurementInfoItem_t));
+    measItem->measType = measType;
+    measItem->labelInfoList = *labelList;
+    if (labelList) free(labelList);
+    
+    ASN_SEQUENCE_ADD(&measList->list, measItem);
+  }
+  
   E2SM_KPM_IndicationMessage_Format1_t* format = (E2SM_KPM_IndicationMessage_Format1_t*)calloc(
       1, sizeof(E2SM_KPM_IndicationMessage_Format1_t));
   format->granulPeriod = (GranularityPeriod_t*)calloc(1, sizeof(GranularityPeriod_t));
-  *format->granulPeriod = period;
+  *format->granulPeriod = 1;
   format->measData = *measData;
-
-  MeasurementInfoList_t* measList =
-      (MeasurementInfoList_t*)calloc(1, sizeof(MeasurementInfoList_t));
-  MeasurementInfoItem_t* measItem =
-      (MeasurementInfoItem_t*)calloc(1, sizeof(MeasurementInfoItem_t));
-  LabelInfoList_t* labelList = (LabelInfoList_t*)calloc(1, sizeof(LabelInfoList_t));
-  LabelInfoItem_t* labelItem = (LabelInfoItem_t*)calloc(1, sizeof(LabelInfoItem_t));
-  MeasurementLabel_t* measLabel = (MeasurementLabel_t*)calloc(1, sizeof(MeasurementLabel_t));
-
-  uint8_t* plmnid_buf = (uint8_t*)"747";
-  uint8_t* sst_buf = (uint8_t*)"1";
-  uint8_t* sd_buf = (uint8_t*)"100";
-
-  S_NSSAI_t* snssai = (S_NSSAI_t*)calloc(1, sizeof(S_NSSAI_t));
-  snssai->sST.buf = (uint8_t*)calloc(strlen((char*)sst_buf), sizeof(uint8_t));
-  snssai->sST.size = strlen((char*)sst_buf);
-  memcpy(snssai->sST.buf, sst_buf, strlen((char*)sst_buf));
-
-  snssai->sD = (SD_t*)calloc(1, sizeof(SD_t));
-  snssai->sD->buf = (uint8_t*)calloc(strlen((char*)sd_buf), sizeof(uint8_t));
-  snssai->sD->size = strlen((char*)sd_buf);
-  memcpy(snssai->sD->buf, sd_buf, strlen((char*)sd_buf));
-
-  int plmnid_size = strlen((char*)plmnid_buf);
-  PLMNIdentity_t* plmnidstr = (PLMNIdentity_t*)calloc(1, sizeof(PLMNIdentity_t));
-  plmnidstr->buf = (uint8_t*)calloc(plmnid_size, 1);
-  plmnidstr->size = plmnid_size;
-  memcpy(plmnidstr->buf, plmnid_buf, plmnidstr->size);
-
-  measLabel->plmnID = plmnidstr;
-  measLabel->sliceID = snssai;
-
-  labelItem->measLabel = *measLabel;
-  ASN_SEQUENCE_ADD(&labelList->list, labelItem);
-  measItem->labelInfoList = *labelList;
-  if (labelList) free(labelList);
-  MeasurementType_t measType;
-  measType.present = MeasurementType_PR_measID;
-  measType.choice.measID = 1;
-  measItem->measType = measType;
-  ASN_SEQUENCE_ADD(&measList->list, measItem);
-
   format->measInfoList = measList;
 
   E2SM_KPM_IndicationMessage__indicationMessage_formats_PR pres =
@@ -417,7 +405,6 @@ void cell_meas_kpm_report_indication_message_style_1_initialized(
   if (ret) {
     LOG_I("Constraint validation of indication message failed: %s\n", error_buf);
   }
-  // xer_fprint(stderr, &asn_DEF_E2SM_KPM_IndicationMessage, indicationmessage);
 }
 
 void encode_kpm_report_style1(E2SM_KPM_IndicationMessage_t* indicationmessage) {
@@ -478,9 +465,11 @@ void encode_kpm_report_style1(E2SM_KPM_IndicationMessage_t* indicationmessage) {
                            indicationmessage, e2smbuffer, e2smbuffer_size);
 
   if (er.encoded == -1) {
-    LOG_I("Failed to serialize message. Detail: %s.\n", asn_DEF_E2SM_KPM_IndicationMessage.name);
+    LOG_E("Failed to serialize message. Detail: %s.\n", asn_DEF_E2SM_KPM_IndicationMessage.name);
+    exit(1);
   } else if (er.encoded > e2smbuffer_size) {
-    LOG_I("Buffer of size %zu is too small for %s, need %zu\n", e2smbuffer_size, asn_DEF_E2SM_KPM_IndicationMessage.name, er.encoded);
+    LOG_E("Buffer of size %zu is too small for %s, need %zu\n", e2smbuffer_size, asn_DEF_E2SM_KPM_IndicationMessage.name, er.encoded);
+    exit(1);
   }
 }
 

diff --git a/e2sim/src/base/e2sim.cpp b/e2sim/src/base/e2sim.cpp
index 9c3ec42..45927e5 100755 (executable)
--- a/e2sim/src/base/e2sim.cpp
+++ b/e2sim/src/base/e2sim.cpp
@@ -79,9 +79,7 @@ void E2Sim::encode_and_send_sctp_data(E2AP_PDU_t* pdu)
   memcpy(data.buffer, buf, min(data.len, MAX_SCTP_BUFFER));
   if (buf) free(buf);
   
-  LOG_I("Number of bytes sent via SCTP connection %d", min(data.len, MAX_SCTP_BUFFER));
-
-  sctp_send_data(client_fd, data);
+    sctp_send_data(client_fd, data);
 }
 
 

diff --git a/e2sim/src/messagerouting/e2ap_message_handler.cpp b/e2sim/src/messagerouting/e2ap_message_handler.cpp
index 57d28c2..c08d55c 100755 (executable)
--- a/e2sim/src/messagerouting/e2ap_message_handler.cpp
+++ b/e2sim/src/messagerouting/e2ap_message_handler.cpp
@@ -23,223 +23,198 @@
 //#include <iostream>\r
 //#include <vector>\r
 \r
-#include "encode_e2apv1.hpp"\r
-\r
-\r
 #include <unistd.h>\r
 \r
-void e2ap_handle_sctp_data(int &socket_fd, sctp_buffer_t &data, bool xmlenc, E2Sim *e2sim)\r
-{\r
-  fprintf(stderr, "in e2ap_handle_sctp_data()\n");\r
-  //decode the data into E2AP-PDU\r
+#include "encode_e2apv1.hpp"\r
+\r
+void e2ap_handle_sctp_data(int& socket_fd, sctp_buffer_t& data, bool xmlenc, E2Sim* e2sim) {\r
   E2AP_PDU_t* pdu = (E2AP_PDU_t*)calloc(1, sizeof(E2AP_PDU));\r
   ASN_STRUCT_RESET(asn_DEF_E2AP_PDU, pdu);\r
 \r
-  fprintf(stderr, "decoding...\n");\r
-\r
   asn_transfer_syntax syntax;\r
-  \r
 \r
   syntax = ATS_ALIGNED_BASIC_PER;\r
-  \r
+  auto rval = asn_decode(nullptr, syntax, &asn_DEF_E2AP_PDU, (void**)&pdu, data.buffer, data.len);\r
 \r
-  fprintf(stderr, "full buffer\n%s\n", data.buffer);\r
-  //  e2ap_asn1c_decode_pdu(pdu, data.buffer, data.len);\r
-\r
-  auto rval = asn_decode(nullptr, syntax, &asn_DEF_E2AP_PDU, (void **) &pdu,\r
-                   data.buffer, data.len);\r
-  \r
+  switch (rval.code) {\r
+    case RC_WMORE:\r
+    case RC_FAIL:\r
+    default:\r
+      LOG_E("Failed to decode E2AP data from SCTP connection");\r
+      ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pdu);\r
+      exit(1);\r
+  }\r
 \r
-  int index = (int)pdu->present;\r
-  fprintf(stderr, "length of data %d\n", rval.consumed);\r
-  fprintf(stderr, "result %d\n", rval.code);\r
-  fprintf(stderr, "index is %d\n", index);\r
-  \r
-  fprintf(stderr, "showing xer of data\n");  \r
-  \r
-  xer_fprint(stderr, &asn_DEF_E2AP_PDU, pdu);\r
-  \r
   int procedureCode = e2ap_asn1c_get_procedureCode(pdu);\r
-  index = (int)pdu->present;\r
+  int index = (int)pdu->present;\r
 \r
-  LOG_D("[E2AP] Unpacked E2AP-PDU: index = %d, procedureCode = %d\n",\r
-                            index, procedureCode);\r
+  LOG_D("Unpacked E2AP-PDU: index = %d, procedureCode = %d\n", index, procedureCode);\r
 \r
-  switch(procedureCode)\r
-    {\r
-      \r
+  switch (procedureCode) {\r
     case ProcedureCode_id_E2setup:\r
-      switch(index)\r
-       {\r
+      LOG_I("Received a message of E2 setup procedure");\r
+      switch (index) {\r
         case E2AP_PDU_PR_initiatingMessage:\r
-         e2ap_handle_E2SetupRequest(pdu, socket_fd);\r
-          LOG_I("[E2AP] Received SETUP-REQUEST");\r
+          e2ap_handle_E2SetupRequest(pdu, socket_fd);\r
+          LOG_I("Received SETUP-REQUEST");\r
           break;\r
-         \r
+\r
         case E2AP_PDU_PR_successfulOutcome:\r
-          LOG_I("[E2AP] Received SETUP-RESPONSE-SUCCESS");\r
+          LOG_I("Received SETUP-RESPONSE-SUCCESS");\r
           break;\r
-         \r
+\r
         case E2AP_PDU_PR_unsuccessfulOutcome:\r
-          LOG_I("[E2AP] Received SETUP-RESPONSE-FAILURE");\r
+          LOG_I("Received SETUP-RESPONSE-FAILURE");\r
           break;\r
-         \r
+\r
         default:\r
-          LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU", index);\r
+          LOG_E("Invalid message index=%d in E2AP-PDU", index);\r
           break;\r
-       }\r
-      break;    \r
-      \r
-    case ProcedureCode_id_Reset: //reset = 7\r
-      switch(index)\r
-       {\r
+      }\r
+      break;\r
+\r
+    case ProcedureCode_id_Reset:  // reset = 7\r
+      LOG_I("Received a message of Reset procedure");\r
+      switch (index) {\r
         case E2AP_PDU_PR_initiatingMessage:\r
-          LOG_I("[E2AP] Received RESET-REQUEST");\r
+          LOG_I("Received RESET-REQUEST");\r
           break;\r
-         \r
+\r
         case E2AP_PDU_PR_successfulOutcome:\r
           break;\r
-         \r
+\r
         case E2AP_PDU_PR_unsuccessfulOutcome:\r
           break;\r
-         \r
+\r
         default:\r
-          LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU", index);\r
+          LOG_E("Invalid message index=%d in E2AP-PDU", index);\r
           break;\r
-       }\r
+      }\r
       break;\r
-      \r
-    case ProcedureCode_id_RICsubscription: //RIC SUBSCRIPTION = 201\r
-      switch(index)\r
-       {\r
-        case E2AP_PDU_PR_initiatingMessage: { //initiatingMessage \r
-          LOG_I("[E2AP] Received RIC-SUBSCRIPTION-REQUEST");\r
-         //          e2ap_handle_RICSubscriptionRequest(pdu, socket_fd);\r
-         long func_id = encoding::get_function_id_from_subscription(pdu);\r
-         fprintf(stderr, "Function Id of message is %d\n", func_id);\r
-         SubscriptionCallback cb;\r
-\r
-         bool func_exists = true;\r
-\r
-         try {\r
-           cb = e2sim->get_subscription_callback(func_id);\r
-         } catch(const std::out_of_range& e) {\r
-           func_exists = false;\r
-         }\r
-\r
-         if (func_exists) {\r
-           fprintf(stderr, "Calling callback function\n");\r
-           cb(pdu);\r
-         } else {\r
-           fprintf(stderr, "Error: No RAN Function with this ID exists\n");\r
-         }\r
-         //      callback_kpm_subscription_request(pdu, socket_fd);\r
-\r
-       }\r
-          break;\r
-         \r
+\r
+    case ProcedureCode_id_RICsubscription:  // RIC SUBSCRIPTION = 201\r
+      LOG_I("Received a message of RIC subscription procedure");\r
+      switch (index) {\r
+        case E2AP_PDU_PR_initiatingMessage: {  // initiatingMessage\r
+          LOG_I("Received RIC-SUBSCRIPTION-REQUEST");\r
+          //          e2ap_handle_RICSubscriptionRequest(pdu, socket_fd);\r
+          long func_id = encoding::get_function_id_from_subscription(pdu);\r
+          fprintf(stderr, "Function Id of message is %d\n", func_id);\r
+          SubscriptionCallback cb;\r
+\r
+          bool func_exists = true;\r
+\r
+          try {\r
+            cb = e2sim->get_subscription_callback(func_id);\r
+          } catch (const std::out_of_range& e) {\r
+            func_exists = false;\r
+          }\r
+\r
+          if (func_exists) {\r
+            fprintf(stderr, "Calling callback function\n");\r
+            cb(pdu);\r
+          } else {\r
+            fprintf(stderr, "Error: No RAN Function with this ID exists\n");\r
+          }\r
+          //     callback_kpm_subscription_request(pdu, socket_fd);\r
+\r
+        } break;\r
+\r
         case E2AP_PDU_PR_successfulOutcome:\r
-          LOG_I("[E2AP] Received RIC-SUBSCRIPTION-RESPONSE");\r
+          LOG_I("Received RIC-SUBSCRIPTION-RESPONSE");\r
           break;\r
-         \r
+\r
         case E2AP_PDU_PR_unsuccessfulOutcome:\r
-          LOG_I("[E2AP] Received RIC-SUBSCRIPTION-FAILURE");\r
+          LOG_I("Received RIC-SUBSCRIPTION-FAILURE");\r
           break;\r
-         \r
+\r
         default:\r
-          LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU", index);\r
+          LOG_E("Invalid message index=%d in E2AP-PDU", index);\r
           break;\r
-       }\r
+      }\r
       break;\r
 \r
-    case ProcedureCode_id_RICindication: // 205\r
-      switch(index)\r
-       {\r
-        case E2AP_PDU_PR_initiatingMessage: //initiatingMessage\r
-          LOG_I("[E2AP] Received RIC-INDICATION-REQUEST");\r
+    case ProcedureCode_id_RICindication:  // 205\r
+      LOG_I("Received a message of RIC indication procedure");\r
+      switch (index) {\r
+        case E2AP_PDU_PR_initiatingMessage:  // initiatingMessage\r
+          LOG_I("Received RIC-INDICATION-REQUEST");\r
           // e2ap_handle_RICSubscriptionRequest(pdu, socket_fd);\r
           break;\r
         case E2AP_PDU_PR_successfulOutcome:\r
-          LOG_I("[E2AP] Received RIC-INDICATION-RESPONSE");\r
+          LOG_I("Received RIC-INDICATION-RESPONSE");\r
           break;\r
-         \r
+\r
         case E2AP_PDU_PR_unsuccessfulOutcome:\r
-          LOG_I("[E2AP] Received RIC-INDICATION-FAILURE");\r
+          LOG_I("Received RIC-INDICATION-FAILURE");\r
           break;\r
-         \r
+\r
         default:\r
-          LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU %d", index,\r
-                                    (int)ProcedureCode_id_RICindication);\r
+          LOG_E("Invalid message index=%d in E2AP-PDU %d", index, (int)ProcedureCode_id_RICindication);\r
           break;\r
-       }\r
+      }\r
       break;\r
 \r
     case ProcedureCode_id_RICserviceQuery:\r
-      switch (index)\r
-        {\r
-          case E2AP_PDU_PR_initiatingMessage:\r
-          LOG_I("[E2AP] Received RIC-Service-Query")\r
+      LOG_I("Received a message of RIC service query procedure");\r
+      switch (index) {\r
+        case E2AP_PDU_PR_initiatingMessage:\r
+          LOG_I("Received RIC-Service-Query")\r
           e2ap_handle_E2SeviceRequest(pdu, socket_fd, e2sim);\r
           break;\r
 \r
-          default:\r
-            LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU %d", index,\r
-                                    (int)ProcedureCode_id_RICserviceQuery);\r
+        default:\r
+          LOG_E("Invalid message index=%d in E2AP-PDU %d", index, (int)ProcedureCode_id_RICserviceQuery);\r
           break;\r
-        }\r
+      }\r
       break;\r
 \r
     case ProcedureCode_id_E2nodeConfigurationUpdate:\r
-      switch (index)\r
-        {\r
-          case E2AP_PDU_PR_successfulOutcome:\r
-          LOG_I("[E2AP] Received E2nodeConfigurationUpdate")\r
+      LOG_I("Received a message of E2 node configuration update procedure");\r
+      switch (index) {\r
+        case E2AP_PDU_PR_successfulOutcome:\r
+          LOG_I("Received E2nodeConfigurationUpdate")\r
           break;\r
 \r
-          default:\r
-            LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU %d", index,\r
-                                    (int)ProcedureCode_id_E2nodeConfigurationUpdate);\r
+        default:\r
+          LOG_E("Invalid message index=%d in E2AP-PDU %d", index, (int)ProcedureCode_id_E2nodeConfigurationUpdate);\r
           break;\r
-        }\r
+      }\r
       break;\r
 \r
     case ProcedureCode_id_RICserviceUpdate:\r
-      switch (index)\r
-        {\r
-          case E2AP_PDU_PR_successfulOutcome:\r
-          LOG_I("[E2AP] Received RIC-SERVICE-UPDATE-SUCCESS")\r
+      LOG_I("Received a message of RIC service update procedure");\r
+      switch (index) {\r
+        case E2AP_PDU_PR_successfulOutcome:\r
+          LOG_I("Received RIC-SERVICE-UPDATE-SUCCESS")\r
           break;\r
 \r
-          case E2AP_PDU_PR_unsuccessfulOutcome:\r
-          LOG_I("[E2AP] Received RIC-SERVICE-UPDATE-FAILURE")\r
+        case E2AP_PDU_PR_unsuccessfulOutcome:\r
+          LOG_I("Received RIC-SERVICE-UPDATE-FAILURE")\r
           break;\r
 \r
-          default:\r
-            LOG_E("[E2AP] Invalid message index=%d in E2AP-PDU %d", index,\r
-                                    (int)ProcedureCode_id_RICserviceUpdate);\r
+        default:\r
+          LOG_E("Invalid message index=%d in E2AP-PDU %d", index, (int)ProcedureCode_id_RICserviceUpdate);\r
           break;\r
-        }\r
+      }\r
       break;\r
-    \r
-    default:\r
-      \r
-      LOG_E("[E2AP] No available handler for procedureCode=%d", procedureCode);\r
 \r
+    default:\r
+      LOG_E("No available handler for procedureCode=%d", procedureCode);\r
       break;\r
-    }\r
+  }\r
   ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, pdu);\r
 }\r
 \r
-void e2ap_handle_E2SeviceRequest(E2AP_PDU_t* pdu, int &socket_fd, E2Sim *e2sim) {\r
-\r
+void e2ap_handle_E2SeviceRequest(E2AP_PDU_t* pdu, int& socket_fd, E2Sim* e2sim) {\r
   auto buffer_size = MAX_SCTP_BUFFER;\r
   unsigned char buffer[MAX_SCTP_BUFFER];\r
-  E2AP_PDU_t* res_pdu = (E2AP_PDU_t*)calloc(1,sizeof(E2AP_PDU));\r
+  E2AP_PDU_t* res_pdu = (E2AP_PDU_t*)calloc(1, sizeof(E2AP_PDU));\r
 \r
   // prepare ran function defination\r
   std::vector<encoding::ran_func_info> all_funcs;\r
 \r
-  //Loop through RAN function definitions that are registered\r
+  // Loop through RAN function definitions that are registered\r
 \r
   for (std::pair<long, OCTET_STRING_t*> elem : e2sim->getRegistered_ran_functions()) {\r
     printf("looping through ran func\n");\r
@@ -250,18 +225,20 @@ void e2ap_handle_E2SeviceRequest(E2AP_PDU_t* pdu, int &socket_fd, E2Sim *e2sim)
     next_func.ranFunctionRev = (long)3;\r
     all_funcs.push_back(next_func);\r
   }\r
-    \r
+\r
   printf("about to call service update encode\n");\r
 \r
   encoding::generate_e2apv1_service_update(res_pdu, all_funcs);\r
 \r
-  LOG_D("[E2AP] Created E2-SERVICE-UPDATE");\r
+  LOG_D("Created E2-SERVICE-UPDATE");\r
 \r
   e2ap_asn1c_print_pdu(res_pdu);\r
 \r
   sctp_buffer_t data;\r
 \r
-  char error_buf[300] = {0, };\r
+  char error_buf[300] = {\r
+      0,\r
+  };\r
   size_t errlen = 0;\r
 \r
   asn_check_constraints(&asn_DEF_E2AP_PDU, res_pdu, error_buf, &errlen);\r
@@ -269,92 +246,107 @@ void e2ap_handle_E2SeviceRequest(E2AP_PDU_t* pdu, int &socket_fd, E2Sim *e2sim)
   printf("error buf %s\n", error_buf);\r
 \r
   auto er = asn_encode_to_buffer(nullptr, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, res_pdu, buffer, buffer_size);\r
+  \r
+  if (er.encoded == -1) {\r
+    LOG_E("Failed to serialize message. Detail: %s.\n", asn_DEF_E2AP_PDU.name);\r
+    exit(1);\r
+  } else if (er.encoded > buffer_size) {\r
+    LOG_E("Buffer of size %zu is too small for %s, need %zu\n", buffer_size, asn_DEF_E2AP_PDU.name, er.encoded);\r
+    exit(1);\r
+  }\r
 \r
   data.len = er.encoded;\r
-  fprintf(stderr, "er encoded is %d\n", er.encoded);\r
 \r
   memcpy(data.buffer, buffer, er.encoded);\r
 \r
-  //send response data over sctp\r
-  if(sctp_send_data(socket_fd, data) > 0) {\r
-    LOG_I("[SCTP] Sent E2-SERVICE-UPDATE");\r
+  // send response data over sctp\r
+  if (sctp_send_data(socket_fd, data) > 0) {\r
+    LOG_I("Sent E2-SERVICE-UPDATE");\r
   } else {\r
-    LOG_E("[SCTP] Unable to send E2-SERVICE-UPDATE to peer");\r
+    LOG_E("Unable to send E2-SERVICE-UPDATE to peer");\r
   }\r
 }\r
 \r
-void e2ap_send_e2nodeConfigUpdate(int &socket_fd) {\r
-\r
+void e2ap_send_e2nodeConfigUpdate(int& socket_fd) {\r
   auto buffer_size = MAX_SCTP_BUFFER;\r
   unsigned char buffer[MAX_SCTP_BUFFER];\r
-  E2AP_PDU_t* pdu = (E2AP_PDU_t*)calloc(1,sizeof(E2AP_PDU));\r
+  E2AP_PDU_t* pdu = (E2AP_PDU_t*)calloc(1, sizeof(E2AP_PDU));\r
 \r
-  LOG_D("about to call e2nodeconfigUpdate encode\n");\r
+  LOG_I("Generating E2 node configure update");\r
 \r
   encoding::generate_e2apv2_config_update(pdu);\r
 \r
-  LOG_D("[E2AP] Created E2nodeConfigUpdate");\r
-\r
   e2ap_asn1c_print_pdu(pdu);\r
 \r
   sctp_buffer_t data;\r
 \r
-  char error_buf[300] = {0, };\r
+  char error_buf[300] = {\r
+      0,\r
+  };\r
   size_t errlen = 0;\r
 \r
   asn_check_constraints(&asn_DEF_E2AP_PDU, pdu, error_buf, &errlen);\r
 \r
   auto er = asn_encode_to_buffer(nullptr, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, pdu, buffer, buffer_size);\r
 \r
+  if (er.encoded == -1) {\r
+    LOG_E("Failed to serialize message. Detail: %s.\n", asn_DEF_E2AP_PDU.name);\r
+    exit(1);\r
+  } else if (er.encoded > buffer_size) {\r
+    LOG_E("Buffer of size %zu is too small for %s, need %zu\n", buffer_size, asn_DEF_E2AP_PDU.name, er.encoded);\r
+    exit(1);\r
+  }\r
+\r
   data.len = er.encoded;\r
-  fprintf(stderr, "er encoded is %d\n", er.encoded);\r
 \r
   memcpy(data.buffer, buffer, er.encoded);\r
 \r
-  //send response data over sctp\r
-  if(sctp_send_data(socket_fd, data) > 0) {\r
-    LOG_I("[SCTP] Sent E2nodeConfigUpdate");\r
+  // send response data over sctp\r
+  if (sctp_send_data(socket_fd, data) > 0) {\r
+    LOG_I("Sent E2nodeConfigUpdate");\r
   } else {\r
     LOG_E("[SCTP] Unable to send E2nodeConfigUpdate to peer");\r
   }\r
 }\r
 \r
-void e2ap_handle_E2SetupRequest(E2AP_PDU_t* pdu, int &socket_fd) {\r
-\r
-  \r
+void e2ap_handle_E2SetupRequest(E2AP_PDU_t* pdu, int& socket_fd) {\r
   E2AP_PDU_t* res_pdu = (E2AP_PDU_t*)calloc(1, sizeof(E2AP_PDU));\r
   encoding::generate_e2apv1_setup_response(res_pdu);\r
 \r
-  \r
-  LOG_D("[E2AP] Created E2-SETUP-RESPONSE");\r
+  LOG_D("Created E2-SETUP-RESPONSE");\r
 \r
   e2ap_asn1c_print_pdu(res_pdu);\r
 \r
-\r
   auto buffer_size = MAX_SCTP_BUFFER;\r
   unsigned char buffer[MAX_SCTP_BUFFER];\r
-  \r
+\r
   sctp_buffer_t data;\r
   auto er = asn_encode_to_buffer(nullptr, ATS_BASIC_XER, &asn_DEF_E2AP_PDU, res_pdu, buffer, buffer_size);\r
 \r
+  if (er.encoded == -1) {\r
+    LOG_E("Failed to serialize message. Detail: %s.\n", asn_DEF_E2AP_PDU.name);\r
+    exit(1);\r
+  } else if (er.encoded > buffer_size) {\r
+    LOG_E("Buffer of size %zu is too small for %s, need %zu\n", buffer_size, asn_DEF_E2AP_PDU.name, er.encoded);\r
+    exit(1);\r
+  }\r
+\r
   data.len = er.encoded;\r
-  fprintf(stderr, "er encoded is %d\n", er.encoded);  \r
   \r
-  //data.len = e2ap_asn1c_encode_pdu(res_pdu, &buf);\r
   memcpy(data.buffer, buffer, er.encoded);\r
 \r
-  //send response data over sctp\r
-  if(sctp_send_data(socket_fd, data) > 0) {\r
-    LOG_I("[SCTP] Sent E2-SETUP-RESPONSE");\r
+  // send response data over sctp\r
+  if (sctp_send_data(socket_fd, data) > 0) {\r
+    LOG_I("Sent E2-SETUP-RESPONSE");\r
   } else {\r
     LOG_E("[SCTP] Unable to send E2-SETUP-RESPONSE to peer");\r
   }\r
 \r
   sleep(5);\r
 \r
-  //Sending Subscription Request\r
+  // Sending Subscription Request\r
 \r
-  E2AP_PDU_t* pdu_sub = (E2AP_PDU_t*)calloc(1,sizeof(E2AP_PDU));\r
+  E2AP_PDU_t* pdu_sub = (E2AP_PDU_t*)calloc(1, sizeof(E2AP_PDU));\r
 \r
   encoding::generate_e2apv1_subscription_request(pdu_sub);\r
 \r
@@ -362,23 +354,27 @@ void e2ap_handle_E2SetupRequest(E2AP_PDU_t* pdu, int &socket_fd) {
 \r
   auto buffer_size2 = MAX_SCTP_BUFFER;\r
   unsigned char buffer2[MAX_SCTP_BUFFER];\r
-  \r
+\r
   sctp_buffer_t data2;\r
 \r
   auto er2 = asn_encode_to_buffer(nullptr, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, pdu_sub, buffer2, buffer_size2);\r
-  \r
+\r
+  if (er2.encoded == -1) {\r
+    LOG_E("Failed to serialize message. Detail: %s.\n", asn_DEF_E2AP_PDU.name);\r
+    exit(1);\r
+  } else if (er2.encoded > buffer_size2) {\r
+    LOG_E("Buffer of size %zu is too small for %s, need %zu\n", buffer_size2, asn_DEF_E2AP_PDU.name, er2.encoded);\r
+    exit(1);\r
+  }\r
+\r
   data2.len = er2.encoded;\r
   memcpy(data2.buffer, buffer2, er2.encoded);\r
-  \r
-  fprintf(stderr, "er encded is %d\n", er2.encoded);\r
 \r
-  if(sctp_send_data(socket_fd, data2) > 0) {\r
-    LOG_I("[SCTP] Sent E2-SUBSCRIPTION-REQUEST");\r
+  if (sctp_send_data(socket_fd, data2) > 0) {\r
+    LOG_I("Sent E2-SUBSCRIPTION-REQUEST");\r
   } else {\r
     LOG_E("[SCTP] Unable to send E2-SUBSCRIPTION-REQUEST to peer");\r
-  }  \r
-\r
-\r
+  }\r
 }\r
 \r
 /*\r
@@ -397,7 +393,7 @@ void e2ap_handle_RICSubscriptionRequest(E2AP_PDU_t* pdu, int &socket_fd)
 \r
   auto buffer_size2 = MAX_SCTP_BUFFER;\r
   unsigned char buffer2[MAX_SCTP_BUFFER];\r
-  \r
+\r
   sctp_buffer_t data2;\r
 \r
   auto er2 = asn_encode_to_buffer(nullptr, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, pdu_resp, buffer2, buffer_size2);\r
@@ -408,12 +404,12 @@ void e2ap_handle_RICSubscriptionRequest(E2AP_PDU_t* pdu, int &socket_fd)
   memcpy(data2.buffer, buffer2, er2.encoded);\r
 \r
   if(sctp_send_data(socket_fd, data2) > 0) {\r
-    LOG_I("[SCTP] Sent RIC-SUBSCRIPTION-RESPONSE");\r
+    LOG_I("Sent RIC-SUBSCRIPTION-RESPONSE");\r
   } else {\r
     LOG_E("[SCTP] Unable to send RIC-SUBSCRIPTION-RESPONSE to peer");\r
   }\r
-  \r
-  \r
+\r
+\r
   //Send back an Indication\r
 \r
   E2AP_PDU_t* pdu_ind = (E2AP_PDU_t*)calloc(1,sizeof(E2AP_PDU));\r
@@ -424,7 +420,7 @@ void e2ap_handle_RICSubscriptionRequest(E2AP_PDU_t* pdu, int &socket_fd)
 \r
   auto buffer_size = MAX_SCTP_BUFFER;\r
   unsigned char buffer[MAX_SCTP_BUFFER];\r
-  \r
+\r
   sctp_buffer_t data;\r
 \r
   auto er = asn_encode_to_buffer(nullptr, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, pdu_ind, buffer, buffer_size);\r
@@ -435,13 +431,10 @@ void e2ap_handle_RICSubscriptionRequest(E2AP_PDU_t* pdu, int &socket_fd)
   memcpy(data.buffer, buffer, er.encoded);\r
 \r
   if(sctp_send_data(socket_fd, data) > 0) {\r
-    LOG_I("[SCTP] Sent RIC-INDICATION-REQUEST");\r
+    LOG_I("Sent RIC-INDICATION-REQUEST");\r
   } else {\r
     LOG_E("[SCTP] Unable to send RIC-INDICATION-REQUEST to peer");\r
-  }  \r
+  }\r
 \r
 }\r
 */\r
-\r
-\r
-\r