1. Transitioned to using latest asn1c compiler

[ric-app/admin.git] / src / E2AP-c / subscription / subscription_delete_request.cc

diff --git a/src/E2AP-c/subscription/subscription_delete_request.cc b/src/E2AP-c/subscription/subscription_delete_request.cc
index 2f6d5c5..d103d2e 100644 (file)
--- a/src/E2AP-c/subscription/subscription_delete_request.cc
+++ b/src/E2AP-c/subscription/subscription_delete_request.cc
@@ -25,15 +25,19 @@ subscription_delete::subscription_delete(void){
 
   _name = "default";
   
-  e2ap_pdu_obj = (E2AP_PDU_t * )calloc(1, sizeof(E2AP_PDU_t));
+  e2ap_pdu_obj = (E2N_E2AP_PDU_t * )calloc(1, sizeof(E2N_E2AP_PDU_t));
   assert(e2ap_pdu_obj != 0);
 
-  initMsg = (InitiatingMessage_t * )calloc(1, sizeof(InitiatingMessage_t));
+  initMsg = (E2N_InitiatingMessage_t * )calloc(1, sizeof(E2N_InitiatingMessage_t));
   assert(initMsg != 0);
   
-  IE_array = (RICsubscriptionDeleteRequest_IEs_t *)calloc(NUM_SUBSCRIPTION_DELETE_IES, sizeof(RICsubscriptionDeleteRequest_IEs_t));
+  IE_array = (E2N_RICsubscriptionDeleteRequest_IEs_t *)calloc(NUM_SUBSCRIPTION_DELETE_IES, sizeof(E2N_RICsubscriptionDeleteRequest_IEs_t));
   assert(IE_array != 0);
   
+  E2N_RICsubscriptionDeleteRequest_t * subscription_delete = &(initMsg->value.choice.RICsubscriptionDeleteRequest);
+  for(int i = 0; i < NUM_SUBSCRIPTION_DELETE_IES; i++){
+    ASN_SEQUENCE_ADD(&subscription_delete->protocolIEs, &(IE_array[i]));
+  }
   
 };
 
@@ -42,8 +46,8 @@ subscription_delete::subscription_delete(void){
 // Clear assigned protocolIE list from RIC indication IE container
 subscription_delete::~subscription_delete(void){
     
-  mdclog_write(MDCLOG_INFO, "Freeing subscription delete request object memory");
-  RICsubscriptionDeleteRequest_t * subscription_delete = &(initMsg->value.choice.RICsubscriptionDeleteRequest);
+  mdclog_write(MDCLOG_DEBUG, "Freeing subscription delete request object memory");
+  E2N_RICsubscriptionDeleteRequest_t * subscription_delete = &(initMsg->value.choice.RICsubscriptionDeleteRequest);
   
   for(int i = 0; i < subscription_delete->protocolIEs.list.size; i++){
     subscription_delete->protocolIEs.list.array[i] = 0;
@@ -60,8 +64,8 @@ subscription_delete::~subscription_delete(void){
   free(initMsg);
   e2ap_pdu_obj->choice.initiatingMessage = 0;
 
-  ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj);
-  mdclog_write(MDCLOG_INFO, "Freed subscription delete request object memory");
+  ASN_STRUCT_FREE(asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj);
+  mdclog_write(MDCLOG_DEBUG, "Freed subscription delete request object memory");
   
 
 };
@@ -70,19 +74,23 @@ subscription_delete::~subscription_delete(void){
 bool subscription_delete::encode_e2ap_subscription(unsigned char *buf, size_t *size,  subscription_helper &dinput){
 
   e2ap_pdu_obj->choice.initiatingMessage = initMsg;
-  e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage;
-  set_fields(e2ap_pdu_obj->choice.initiatingMessage, dinput);
-  
-  //xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj);
+  e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_initiatingMessage;
+  set_fields( dinput);
+
+  initMsg->procedureCode = E2N_ProcedureCode_id_ricSubscriptionDelete;
+  initMsg->criticality = E2N_Criticality_reject;
+  initMsg->value.present = E2N_InitiatingMessage__value_PR_RICsubscriptionDeleteRequest;
+
+  //xer_fprint(stdout, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj);
   
-  int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, (void *) e2ap_pdu_obj, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_E2N_E2AP_PDU, (void *) e2ap_pdu_obj, errbuf, &errbuf_len);
   if(ret_constr){
     error_string.assign(errbuf, errbuf_len);
     error_string = "Constraints failed for encoding subscription delete request. Reason = " + error_string;
     return false;
   }
   
-  asn_enc_rval_t res = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, e2ap_pdu_obj, buf, *size);
+  asn_enc_rval_t res = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj, buf, *size);
     
   if(res.encoded == -1){
     error_string.assign(strerror(errno));
@@ -105,42 +113,28 @@ bool subscription_delete::encode_e2ap_subscription(unsigned char *buf, size_t *s
 }
 
 
-bool  subscription_delete::set_fields(InitiatingMessage_t *ref_initMsg, subscription_helper &helper){
+bool  subscription_delete::set_fields( subscription_helper &helper){
   unsigned int ie_index;
-
-  if (ref_initMsg == 0){
-    error_string = "Invalid reference for initating message ";
-    return false;
-  }
-  
-  ref_initMsg->procedureCode = ProcedureCode_id_ricSubscriptionDelete;
-  ref_initMsg->criticality = Criticality_reject;
-  ref_initMsg->value.present = InitiatingMessage__value_PR_RICsubscriptionDeleteRequest;
-
-  RICsubscriptionDeleteRequest_t * subscription_delete = &(ref_initMsg->value.choice.RICsubscriptionDeleteRequest);
-
-  // Reset field count for protocolIEs
-  subscription_delete->protocolIEs.list.count = 0;
   
   ie_index = 0;
-  RICsubscriptionDeleteRequest_IEs_t *ies_ricreq = &IE_array[ie_index];
-  ies_ricreq->criticality = Criticality_reject;
-  ies_ricreq->id = ProtocolIE_ID_id_RICrequestID;
-  ies_ricreq->value.present = RICsubscriptionDeleteRequest_IEs__value_PR_RICrequestID;
-  RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
+  E2N_RICsubscriptionDeleteRequest_IEs_t *ies_ricreq = &IE_array[ie_index];
+  ies_ricreq->criticality = E2N_Criticality_reject;
+  ies_ricreq->id = E2N_ProtocolIE_ID_id_RICrequestID;
+  ies_ricreq->value.present = E2N_RICsubscriptionDeleteRequest_IEs__value_PR_RICrequestID;
+  E2N_RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
   ricrequest_ie->ricRequestorID = helper.get_request_id();
   ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq();
 
-  ASN_SEQUENCE_ADD(&subscription_delete->protocolIEs, ies_ricreq);
+
   
   ie_index = 1;
-  RICsubscriptionDeleteRequest_IEs_t *ies_ranfunc = &IE_array[ie_index];
-  ies_ranfunc->criticality = Criticality_reject;
-  ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID;
-  ies_ranfunc->value.present = RICsubscriptionDeleteRequest_IEs__value_PR_RANfunctionID;
-  RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  E2N_RICsubscriptionDeleteRequest_IEs_t *ies_ranfunc = &IE_array[ie_index];
+  ies_ranfunc->criticality = E2N_Criticality_reject;
+  ies_ranfunc->id = E2N_ProtocolIE_ID_id_RANfunctionID;
+  ies_ranfunc->value.present = E2N_RICsubscriptionDeleteRequest_IEs__value_PR_RANfunctionID;
+  E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
   *ranfunction_ie = helper.get_function_id();
-  ASN_SEQUENCE_ADD(&subscription_delete->protocolIEs, ies_ranfunc);
+
   
   return true;
 };
@@ -148,7 +142,7 @@ bool  subscription_delete::set_fields(InitiatingMessage_t *ref_initMsg, subscrip
 
    
 
-bool  subscription_delete:: get_fields(InitiatingMessage_t * init_msg,  subscription_helper & dout)
+bool  subscription_delete:: get_fields(E2N_InitiatingMessage_t * init_msg,  subscription_helper & dout)
 {
 
   if (init_msg == 0){
@@ -156,27 +150,27 @@ bool  subscription_delete:: get_fields(InitiatingMessage_t * init_msg,  subscrip
     return false;
   }
   
-  RICrequestID_t *requestid;
-  RANfunctionID_t * ranfunctionid;
+  E2N_RICrequestID_t *requestid;
+  E2N_RANfunctionID_t * ranfunctionid;
     
   for(int edx = 0; edx < init_msg->value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.count; edx++) {
-    RICsubscriptionDeleteRequest_IEs_t *memb_ptr = init_msg->value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.array[edx];
+    E2N_RICsubscriptionDeleteRequest_IEs_t *memb_ptr = init_msg->value.choice.RICsubscriptionDeleteRequest.protocolIEs.list.array[edx];
     
     switch(memb_ptr->id)
       {
-      case (ProtocolIE_ID_id_RICrequestID):
+      case (E2N_ProtocolIE_ID_id_RICrequestID):
        requestid = &memb_ptr->value.choice.RICrequestID;
        dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber);
        break;
          
-      case (ProtocolIE_ID_id_RANfunctionID):
+      case (E2N_ProtocolIE_ID_id_RANfunctionID):
        ranfunctionid = &memb_ptr->value.choice.RANfunctionID;
        dout.set_function_id(*ranfunctionid);
        break;
        
       }
     
-  //asn_fprint(stdout, &asn_DEF_E2AP_PDU, e2pdu);
+  //asn_fprint(stdout, &asn_DEF_E2N_E2AP_PDU, e2pdu);
   }
 
   return true;