Code Review / ric-app / hw.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Control Message Encode/Decode
[ric-app/hw.git] / src / xapp-asn / e2ap / subscription_request.cc
diff --git a/src/xapp-asn/e2ap/subscription_request.cc b/src/xapp-asn/e2ap/subscription_request.cc
index 9b2f897..91071b3 100644 (file)
--- a/src/xapp-asn/e2ap/subscription_request.cc
+++ b/src/xapp-asn/e2ap/subscription_request.cc
@@ -2,7 +2,7 @@
 
 /*
 ==================================================================================
-        Copyright (c) 2018-2019 AT&T Intellectual Property.
+        Copyright (c) 2019-2020 AT&T Intellectual Property.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -32,29 +32,29 @@ subscription_request::subscription_request(void){
   _name = "default";
 
   e2ap_pdu_obj = 0;
-  e2ap_pdu_obj = (E2N_E2AP_PDU_t * )calloc(1, sizeof(E2N_E2AP_PDU_t));
+  e2ap_pdu_obj = (E2AP_PDU_t * )calloc(1, sizeof(E2AP_PDU_t));
   assert(e2ap_pdu_obj != 0);
 
   initMsg = 0;
-  initMsg = (E2N_InitiatingMessage_t * )calloc(1, sizeof(E2N_InitiatingMessage_t));
+  initMsg = (InitiatingMessage_t * )calloc(1, sizeof(InitiatingMessage_t));
   assert(initMsg != 0);
 
   IE_array = 0;
-  IE_array = (E2N_RICsubscriptionRequest_IEs_t *)calloc(NUM_SUBSCRIPTION_REQUEST_IES, sizeof(E2N_RICsubscriptionRequest_IEs_t));
+  IE_array = (RICsubscriptionRequest_IEs_t *)calloc(NUM_SUBSCRIPTION_REQUEST_IES, sizeof(RICsubscriptionRequest_IEs_t));
   assert(IE_array != 0);
   
   action_array = 0;
-  action_array = (E2N_RICaction_ToBeSetup_ItemIEs_t *)calloc(INITIAL_REQUEST_LIST_SIZE, sizeof(E2N_RICaction_ToBeSetup_ItemIEs_t));
+  action_array = (RICaction_ToBeSetup_ItemIEs_t *)calloc(INITIAL_REQUEST_LIST_SIZE, sizeof(RICaction_ToBeSetup_ItemIEs_t));
   assert(action_array != 0);
   action_array_size = INITIAL_REQUEST_LIST_SIZE;
   // also need to add subsequent action and time to wait ..
   for (unsigned int i = 0; i < action_array_size; i++){
-    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = (struct E2N_RICsubsequentAction *)calloc(1, sizeof(struct E2N_RICsubsequentAction));
+    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = (struct RICsubsequentAction *)calloc(1, sizeof(struct RICsubsequentAction));
     assert(action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction  != 0);
   }
   
   e2ap_pdu_obj->choice.initiatingMessage = initMsg;
-  e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_initiatingMessage;
+  e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage;
 
 
   
@@ -65,10 +65,10 @@ subscription_request::subscription_request(void){
 // Clear assigned protocolIE list from RIC indication IE container
 subscription_request::~subscription_request(void){
     
-  mdclog_write(MDCLOG_DEBUG, "Freeing subscription request memory for");;
+  mdclog_write(MDCLOG_DEBUG, "Freeing subscription request memory");;
   
   // Sequence of actions to be admitted causes special heart-ache. Free ric subscription element manually and reset the ie pointer  
-  E2N_RICsubscription_t * ricsubscription_ie = &(IE_array[2].value.choice.RICsubscription);
+  RICsubscriptionDetails_t * ricsubscription_ie = &(IE_array[2].value.choice.RICsubscriptionDetails);
 
   for(int i = 0; i < ricsubscription_ie->ricAction_ToBeSetup_List.list.size; i++){
     ricsubscription_ie->ricAction_ToBeSetup_List.list.array[i] = 0;
@@ -87,7 +87,7 @@ subscription_request::~subscription_request(void){
   }
   
   free(action_array);
-  E2N_RICsubscriptionRequest_t * subscription_request = &(initMsg->value.choice.RICsubscriptionRequest);
+  RICsubscriptionRequest_t * subscription_request = &(initMsg->value.choice.RICsubscriptionRequest);
   
   for(int i = 0; i < subscription_request->protocolIEs.list.size; i++){
     subscription_request->protocolIEs.list.array[i] = 0;
@@ -104,7 +104,7 @@ subscription_request::~subscription_request(void){
   free(initMsg);
   e2ap_pdu_obj->choice.initiatingMessage = 0;
   
-  ASN_STRUCT_FREE(asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj);
+  ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj);
   mdclog_write(MDCLOG_DEBUG, "Freed subscription request memory ");
 };
 
@@ -113,25 +113,25 @@ bool subscription_request::encode_e2ap_subscription(unsigned char *buf, size_t *
 
   bool res;
 
-  initMsg->procedureCode = E2N_ProcedureCode_id_ricSubscription;
-  initMsg->criticality = E2N_Criticality_ignore;
-  initMsg->value.present = E2N_InitiatingMessage__value_PR_RICsubscriptionRequest;
+  initMsg->procedureCode = ProcedureCode_id_RICsubscription;
+  initMsg->criticality = Criticality_ignore;
+  initMsg->value.present = InitiatingMessage__value_PR_RICsubscriptionRequest;
 
   res = set_fields(initMsg, dinput);
   if (!res){
     return false;
   }
   
-  int ret_constr = asn_check_constraints(&asn_DEF_E2N_E2AP_PDU, (void *) e2ap_pdu_obj, errbuf, &errbuf_len);
+  int ret_constr = asn_check_constraints(&asn_DEF_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 request. Reason = " + error_string;
     return false;
   }
 
-  //xer_fprint(stdout, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj);
+  //xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj);
   
-  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj, buf, *size);
+  asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, e2ap_pdu_obj, buf, *size);
     
   if(retval.encoded == -1){
     error_string.assign(strerror(errno));
@@ -154,7 +154,7 @@ bool subscription_request::encode_e2ap_subscription(unsigned char *buf, size_t *
 }
 
 
-bool subscription_request::set_fields( E2N_InitiatingMessage_t * init_msg, subscription_helper &helper){
+bool subscription_request::set_fields( InitiatingMessage_t * init_msg, subscription_helper &helper){
 
   
   int ie_index;
@@ -165,37 +165,37 @@ bool subscription_request::set_fields( E2N_InitiatingMessage_t * init_msg, subsc
     return false;
   }
 
-  E2N_RICsubscriptionRequest_t * ric_subscription = &(init_msg->value.choice.RICsubscriptionRequest);
+  RICsubscriptionRequest_t * ric_subscription = &(init_msg->value.choice.RICsubscriptionRequest);
   ric_subscription->protocolIEs.list.count = 0;
   
   ie_index = 0;
-  E2N_RICsubscriptionRequest_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_RICsubscriptionRequest_IEs__value_PR_RICrequestID;
-  E2N_RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
+  RICsubscriptionRequest_IEs_t *ies_ricreq = &IE_array[ie_index];
+  ies_ricreq->criticality = Criticality_reject;
+  ies_ricreq->id = ProtocolIE_ID_id_RICrequestID;
+  ies_ricreq->value.present = RICsubscriptionRequest_IEs__value_PR_RICrequestID;
+  RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
   ricrequest_ie->ricRequestorID = helper.get_request_id();
-  ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq();
+  //ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq();
   result = ASN_SEQUENCE_ADD(&(ric_subscription->protocolIEs), &IE_array[ie_index]);
   assert(result == 0);
      
   ie_index = 1;
-  E2N_RICsubscriptionRequest_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_RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
-  E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  RICsubscriptionRequest_IEs_t *ies_ranfunc = &IE_array[ie_index];
+  ies_ranfunc->criticality = Criticality_reject;
+  ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID;
+  ies_ranfunc->value.present = RICsubscriptionRequest_IEs__value_PR_RANfunctionID;
+  RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
   *ranfunction_ie = helper.get_function_id();
   result = ASN_SEQUENCE_ADD(&(ric_subscription->protocolIEs), &IE_array[ie_index]);
   assert(result == 0);
 
 
   ie_index = 2;
-  E2N_RICsubscriptionRequest_IEs_t *ies_actid = &IE_array[ie_index];
-  ies_actid->criticality = E2N_Criticality_reject;
-  ies_actid->id = E2N_ProtocolIE_ID_id_RICsubscription;
-  ies_actid->value.present = E2N_RICsubscriptionRequest_IEs__value_PR_RICsubscription;
-  E2N_RICsubscription_t *ricsubscription_ie = &ies_actid->value.choice.RICsubscription;
+  RICsubscriptionRequest_IEs_t *ies_actid = &IE_array[ie_index];
+  ies_actid->criticality = Criticality_reject;
+  ies_actid->id = ProtocolIE_ID_id_RICsubscriptionDetails;
+  ies_actid->value.present = RICsubscriptionRequest_IEs__value_PR_RICsubscriptionDetails;
+  RICsubscriptionDetails_t *ricsubscription_ie = &ies_actid->value.choice.RICsubscriptionDetails;
 
   ricsubscription_ie->ricEventTriggerDefinition.buf = (uint8_t *) helper.get_event_def();
   ricsubscription_ie->ricEventTriggerDefinition.size = helper.get_event_def_size();
@@ -212,12 +212,12 @@ bool subscription_request::set_fields( E2N_InitiatingMessage_t * init_msg, subsc
     
     action_array_size = 2 * ref_action_array->size();
     free(action_array);
-    action_array = (E2N_RICaction_ToBeSetup_ItemIEs_t *)calloc(action_array_size, sizeof(E2N_RICaction_ToBeSetup_ItemIEs_t));
+    action_array = (RICaction_ToBeSetup_ItemIEs_t *)calloc(action_array_size, sizeof(RICaction_ToBeSetup_ItemIEs_t));
     assert(action_array != 0);
 
     // also need to add subsequent action and time to wait ..
     for (unsigned int i = 0; i < action_array_size; i++){
-      action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = (struct E2N_RICsubsequentAction *)calloc(1, sizeof(struct E2N_RICsubsequentAction));
+      action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction = (struct RICsubsequentAction *)calloc(1, sizeof(struct RICsubsequentAction));
       assert(action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction  != 0);
     }
     
@@ -227,13 +227,12 @@ bool subscription_request::set_fields( E2N_InitiatingMessage_t * init_msg, subsc
   ricsubscription_ie->ricAction_ToBeSetup_List.list.count = 0;
   
   for(unsigned int i = 0; i < ref_action_array->size(); i ++){
-    action_array[i].criticality = E2N_Criticality_ignore;
-    action_array[i].id = E2N_ProtocolIE_ID_id_RICaction_ToBeSetup_Item ;
-    action_array[i].value.present = E2N_RICaction_ToBeSetup_ItemIEs__value_PR_RICaction_ToBeSetup_Item;
+    action_array[i].criticality = Criticality_ignore;
+    action_array[i].id = ProtocolIE_ID_id_RICaction_ToBeSetup_Item ;
+    action_array[i].value.present = RICaction_ToBeSetup_ItemIEs__value_PR_RICaction_ToBeSetup_Item;
     action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionID = (*ref_action_array)[i].get_id();
     action_array[i].value.choice.RICaction_ToBeSetup_Item.ricActionType = (*ref_action_array)[i].get_type();
     action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction->ricSubsequentActionType = (*ref_action_array)[i].get_subsequent_action();
-    action_array[i].value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction->ricTimeToWait = (*ref_action_array)[i].get_wait();
     
     result = ASN_SEQUENCE_ADD(&ricsubscription_ie->ricAction_ToBeSetup_List, &(action_array[i]));
     if (result == -1){
@@ -253,7 +252,7 @@ bool subscription_request::set_fields( E2N_InitiatingMessage_t * init_msg, subsc
 
 
 
-bool subscription_request:: get_fields(E2N_InitiatingMessage_t * init_msg,  subscription_helper & dout)
+bool subscription_request:: get_fields(InitiatingMessage_t * init_msg,  subscription_helper & dout)
 {
 
   if (init_msg == 0){
@@ -261,37 +260,36 @@ bool subscription_request:: get_fields(E2N_InitiatingMessage_t * init_msg,  subs
     return false;
   }
   
-  E2N_RICrequestID_t *requestid;
-  E2N_RANfunctionID_t * ranfunctionid;
-  E2N_RICsubscription_t * ricsubscription;
+  RICrequestID_t *requestid;
+  RANfunctionID_t * ranfunctionid;
+  RICsubscriptionDetails_t * ricsubscription;
     
   for(int edx = 0; edx < init_msg->value.choice.RICsubscriptionRequest.protocolIEs.list.count; edx++) {
-    E2N_RICsubscriptionRequest_IEs_t *memb_ptr = init_msg->value.choice.RICsubscriptionRequest.protocolIEs.list.array[edx];
+    RICsubscriptionRequest_IEs_t *memb_ptr = init_msg->value.choice.RICsubscriptionRequest.protocolIEs.list.array[edx];
     
     switch(memb_ptr->id)
       {
-      case (E2N_ProtocolIE_ID_id_RICrequestID):
+      case (ProtocolIE_ID_id_RICrequestID):
        requestid = &memb_ptr->value.choice.RICrequestID;
-       dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber);
+       //dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber);
        break;
          
-      case (E2N_ProtocolIE_ID_id_RANfunctionID):
+      case (ProtocolIE_ID_id_RANfunctionID):
        ranfunctionid = &memb_ptr->value.choice.RANfunctionID;
        dout.set_function_id(*ranfunctionid);
        break;
          
-      case (E2N_ProtocolIE_ID_id_RICsubscription):
-       ricsubscription = &memb_ptr->value.choice.RICsubscription;
+      case (ProtocolIE_ID_id_RICsubscriptionDetails):
+       ricsubscription = &memb_ptr->value.choice.RICsubscriptionDetails;
        dout.set_event_def(ricsubscription->ricEventTriggerDefinition.buf, ricsubscription->ricEventTriggerDefinition.size);
          
        for(int index = 0; index < ricsubscription->ricAction_ToBeSetup_List.list.count; index ++){
-         E2N_RICaction_ToBeSetup_ItemIEs_t * item = (E2N_RICaction_ToBeSetup_ItemIEs_t *)ricsubscription->ricAction_ToBeSetup_List.list.array[index];
+         RICaction_ToBeSetup_ItemIEs_t * item = (RICaction_ToBeSetup_ItemIEs_t *)ricsubscription->ricAction_ToBeSetup_List.list.array[index];
          if (item->value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction == NULL){
            dout.add_action(item->value.choice.RICaction_ToBeSetup_Item.ricActionID, item->value.choice.RICaction_ToBeSetup_Item.ricActionType);
          }
          else{
            std::string action_def = ""; // for now we are ignoring action definition
-           dout.add_action(item->value.choice.RICaction_ToBeSetup_Item.ricActionID, item->value.choice.RICaction_ToBeSetup_Item.ricActionType, action_def, item->value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction->ricSubsequentActionType, item->value.choice.RICaction_ToBeSetup_Item.ricSubsequentAction->ricTimeToWait);
          }   
        };
        
@@ -300,7 +298,7 @@ bool subscription_request:: get_fields(E2N_InitiatingMessage_t * init_msg,  subs
       
   }
     
-  //asn_fprint(stdout, &asn_DEF_E2N_E2AP_PDU, e2pdu);
+  //asn_fprint(stdout, &asn_DEF_E2AP_PDU, e2pdu);
   return true;
 };
 
"ric_app_hw"