X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fxapp-asn%2Fe2ap%2Fe2ap_indication.cc;h=04ab301c112e07f5ecea3cacbb74399e7738c648;hb=refs%2Fchanges%2F07%2F4907%2F2;hp=33b2095416bc642ed7d9c14499c2e813d3ee74df;hpb=6df19a4dacb4fcb6edb35a32af9c8f5c07c95e37;p=ric-app%2Fhw.git diff --git a/src/xapp-asn/e2ap/e2ap_indication.cc b/src/xapp-asn/e2ap/e2ap_indication.cc index 33b2095..04ab301 100644 --- a/src/xapp-asn/e2ap/e2ap_indication.cc +++ b/src/xapp-asn/e2ap/e2ap_indication.cc @@ -1,7 +1,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. @@ -23,7 +23,7 @@ * Author: sjana, Ashwin Sridharan */ -#include "e2ap_indication.hpp" +/*#include "e2ap_indication.hpp" // Set up memory allocations for each IE for encoding // We are responsible for memory management for each IE for encoding @@ -33,18 +33,18 @@ ric_indication::ric_indication(void){ 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_RICindication_IEs_t *)calloc(NUM_INDICATION_IES, sizeof(E2N_RICindication_IEs_t)); + IE_array = (RICindication_IEs_t *)calloc(NUM_INDICATION_IES, sizeof(RICindication_IEs_t)); assert(IE_array != 0); - e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_initiatingMessage; + e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage; e2ap_pdu_obj->choice.initiatingMessage = initMsg; @@ -58,7 +58,7 @@ ric_indication::ric_indication(void){ ric_indication::~ric_indication(void){ mdclog_write(MDCLOG_DEBUG, "Freeing E2AP Indication object memory"); - E2N_RICindication_t *ricIndication = &(initMsg->value.choice.RICindication); + RICindication_t *ricIndication = &(initMsg->value.choice.RICindication); for(int i = 0; i < ricIndication->protocolIEs.list.size; i++){ ricIndication->protocolIEs.list.array[i] = 0; } @@ -70,16 +70,16 @@ ric_indication::~ric_indication(void){ } free(IE_array); - 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 E2AP Indication object mempory"); } bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, ric_indication_helper & dinput){ - initMsg->procedureCode = E2N_ProcedureCode_id_ricIndication; - initMsg->criticality = E2N_Criticality_ignore; - initMsg->value.present = E2N_InitiatingMessage__value_PR_RICindication; + initMsg->procedureCode = ProcedureCode_id_RICindication; + initMsg->criticality = Criticality_ignore; + initMsg->value.present = InitiatingMessage__value_PR_RICindication; bool res; asn_enc_rval_t retval; @@ -89,7 +89,7 @@ bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, ri return false; } - int ret_constr = asn_check_constraints(&asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj, errbuf, &errbuf_len); + int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, e2ap_pdu_obj, errbuf, &errbuf_len); if(ret_constr){ error_string.assign(&errbuf[0], errbuf_len); error_string = "Error encoding E2AP Indication message. Reason = " + error_string; @@ -99,7 +99,7 @@ bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, ri // std::cout <<"Constraint check ok ...." << std::endl; // xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj); - retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj, buf, *size); + 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)); return false; @@ -119,7 +119,7 @@ bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, ri } -bool ric_indication::set_fields(E2N_InitiatingMessage_t *initMsg, ric_indication_helper &dinput){ +bool ric_indication::set_fields(InitiatingMessage_t *initMsg, ric_indication_helper &dinput){ unsigned int ie_index; if (initMsg == 0){ @@ -128,73 +128,73 @@ bool ric_indication::set_fields(E2N_InitiatingMessage_t *initMsg, ric_indication } - E2N_RICindication_t * ric_indication = &(initMsg->value.choice.RICindication); + RICindication_t * ric_indication = &(initMsg->value.choice.RICindication); ric_indication->protocolIEs.list.count = 0; ie_index = 0; - E2N_RICindication_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_RICindication_IEs__value_PR_RICrequestID; - E2N_RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID; + RICindication_IEs_t *ies_ricreq = &IE_array[ie_index]; + ies_ricreq->criticality = Criticality_reject; + ies_ricreq->id = ProtocolIE_ID_id_RICrequestID; + ies_ricreq->value.present = RICindication_IEs__value_PR_RICrequestID; + RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID; ricrequest_ie->ricRequestorID = dinput.req_id; - ricrequest_ie->ricRequestSequenceNumber = dinput.req_seq_no; + //ricrequest_ie->ricRequestSequenceNumber = dinput.req_seq_no; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); ie_index = 1; - E2N_RICindication_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_RICindication_IEs__value_PR_RANfunctionID; - E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID; + RICindication_IEs_t *ies_ranfunc = &IE_array[ie_index]; + ies_ranfunc->criticality = Criticality_reject; + ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID; + ies_ranfunc->value.present = RICindication_IEs__value_PR_RANfunctionID; + RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID; *ranfunction_ie = dinput.func_id; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); ie_index = 2; - E2N_RICindication_IEs_t *ies_actid = &IE_array[ie_index]; - ies_actid->criticality = E2N_Criticality_reject; - ies_actid->id = E2N_ProtocolIE_ID_id_RICactionID; - ies_actid->value.present = E2N_RICindication_IEs__value_PR_RICactionID; - E2N_RICactionID_t *ricaction_ie = &ies_actid->value.choice.RICactionID; + RICindication_IEs_t *ies_actid = &IE_array[ie_index]; + ies_actid->criticality = Criticality_reject; + ies_actid->id = ProtocolIE_ID_id_RICactionID; + ies_actid->value.present = RICindication_IEs__value_PR_RICactionID; + RICactionID_t *ricaction_ie = &ies_actid->value.choice.RICactionID; *ricaction_ie = dinput.action_id; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); ie_index = 3; - E2N_RICindication_IEs_t *ies_ricsn = &IE_array[ie_index]; - ies_ricsn->criticality = E2N_Criticality_reject; - ies_ricsn->id = E2N_ProtocolIE_ID_id_RICindicationSN; - ies_ricsn->value.present = E2N_RICindication_IEs__value_PR_RICindicationSN; - E2N_RICindicationSN_t *ricsn_ie = &ies_ricsn->value.choice.RICindicationSN; + RICindication_IEs_t *ies_ricsn = &IE_array[ie_index]; + ies_ricsn->criticality = Criticality_reject; + ies_ricsn->id = ProtocolIE_ID_id_RICindicationSN; + ies_ricsn->value.present = RICindication_IEs__value_PR_RICindicationSN; + RICindicationSN_t *ricsn_ie = &ies_ricsn->value.choice.RICindicationSN; *ricsn_ie = dinput.indication_sn; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); ie_index = 4; - E2N_RICindication_IEs_t *ies_indtyp = &IE_array[ie_index]; - ies_indtyp->criticality = E2N_Criticality_reject; - ies_indtyp->id = E2N_ProtocolIE_ID_id_RICindicationType; - ies_indtyp->value.present = E2N_RICindication_IEs__value_PR_RICindicationType; - E2N_RICindicationType_t *rictype_ie = &ies_indtyp->value.choice.RICindicationType; + RICindication_IEs_t *ies_indtyp = &IE_array[ie_index]; + ies_indtyp->criticality = Criticality_reject; + ies_indtyp->id = ProtocolIE_ID_id_RICindicationType; + ies_indtyp->value.present = RICindication_IEs__value_PR_RICindicationType; + RICindicationType_t *rictype_ie = &ies_indtyp->value.choice.RICindicationType; *rictype_ie = dinput.indication_type; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); ie_index = 5; - E2N_RICindication_IEs_t *ies_richead = &IE_array[ie_index]; - ies_richead->criticality = E2N_Criticality_reject; - ies_richead->id = E2N_ProtocolIE_ID_id_RICindicationHeader; - ies_richead->value.present = E2N_RICindication_IEs__value_PR_RICindicationHeader; - E2N_RICindicationHeader_t *richeader_ie = &ies_richead->value.choice.RICindicationHeader; + RICindication_IEs_t *ies_richead = &IE_array[ie_index]; + ies_richead->criticality = Criticality_reject; + ies_richead->id = ProtocolIE_ID_id_RICindicationHeader; + ies_richead->value.present = RICindication_IEs__value_PR_RICindicationHeader; + RICindicationHeader_t *richeader_ie = &ies_richead->value.choice.RICindicationHeader; richeader_ie->buf = dinput.indication_header; richeader_ie->size = dinput.indication_header_size; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); ie_index = 6; - E2N_RICindication_IEs_t *ies_indmsg = &IE_array[ie_index]; - ies_indmsg->criticality = E2N_Criticality_reject; - ies_indmsg->id = E2N_ProtocolIE_ID_id_RICindicationMessage; - ies_indmsg->value.present = E2N_RICindication_IEs__value_PR_RICindicationMessage; - E2N_RICindicationMessage_t *ricmsg_ie = &ies_indmsg->value.choice.RICindicationMessage; + RICindication_IEs_t *ies_indmsg = &IE_array[ie_index]; + ies_indmsg->criticality = Criticality_reject; + ies_indmsg->id = ProtocolIE_ID_id_RICindicationMessage; + ies_indmsg->value.present = RICindication_IEs__value_PR_RICindicationMessage; + RICindicationMessage_t *ricmsg_ie = &ies_indmsg->value.choice.RICindicationMessage; ricmsg_ie->buf = dinput.indication_msg; ricmsg_ie->size = dinput.indication_msg_size; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); @@ -203,11 +203,11 @@ bool ric_indication::set_fields(E2N_InitiatingMessage_t *initMsg, ric_indication // optional call process id .. if (dinput.call_process_id_size > 0){ ie_index = 7; - E2N_RICindication_IEs_t *ies_ind_callprocessid = &IE_array[ie_index]; - ies_ind_callprocessid->criticality = E2N_Criticality_reject; - ies_ind_callprocessid->id = E2N_ProtocolIE_ID_id_RICcallProcessID; - ies_ind_callprocessid->value.present = E2N_RICindication_IEs__value_PR_RICcallProcessID; - E2N_RICcallProcessID_t *riccallprocessid_ie = &ies_ind_callprocessid->value.choice.RICcallProcessID; + RICindication_IEs_t *ies_ind_callprocessid = &IE_array[ie_index]; + ies_ind_callprocessid->criticality = Criticality_reject; + ies_ind_callprocessid->id = ProtocolIE_ID_id_RICcallProcessID; + ies_ind_callprocessid->value.present = RICindication_IEs__value_PR_RICcallProcessID; + RICcallProcessID_t *riccallprocessid_ie = &ies_ind_callprocessid->value.choice.RICcallProcessID; riccallprocessid_ie->buf = dinput.indication_msg; riccallprocessid_ie->size = dinput.indication_msg_size; ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); @@ -220,7 +220,7 @@ bool ric_indication::set_fields(E2N_InitiatingMessage_t *initMsg, ric_indication -bool ric_indication:: get_fields(E2N_InitiatingMessage_t * init_msg, ric_indication_helper &dout) +bool ric_indication:: get_fields(InitiatingMessage_t * init_msg, ric_indication_helper &dout) { if (init_msg == 0){ error_string = "Invalid reference for E2AP Indication message in get_fields"; @@ -229,42 +229,42 @@ bool ric_indication:: get_fields(E2N_InitiatingMessage_t * init_msg, ric_indica for(int edx = 0; edx < init_msg->value.choice.RICindication.protocolIEs.list.count; edx++) { - E2N_RICindication_IEs_t *memb_ptr = init_msg->value.choice.RICindication.protocolIEs.list.array[edx]; + RICindication_IEs_t *memb_ptr = init_msg->value.choice.RICindication.protocolIEs.list.array[edx]; switch(memb_ptr->id) { - case (E2N_ProtocolIE_ID_id_RICindicationHeader): + case (ProtocolIE_ID_id_RICindicationHeader): dout.indication_header = memb_ptr->value.choice.RICindicationHeader.buf; dout.indication_header_size = memb_ptr->value.choice.RICindicationHeader.size; break; - case (E2N_ProtocolIE_ID_id_RICindicationMessage): + case (ProtocolIE_ID_id_RICindicationMessage): dout.indication_msg = memb_ptr->value.choice.RICindicationMessage.buf; dout.indication_msg_size = memb_ptr->value.choice.RICindicationMessage.size; break; - case (E2N_ProtocolIE_ID_id_RICrequestID): + case (ProtocolIE_ID_id_RICrequestID): dout.req_id = memb_ptr->value.choice.RICrequestID.ricRequestorID; - dout.req_seq_no = memb_ptr->value.choice.RICrequestID.ricRequestSequenceNumber; + //dout.req_seq_no = memb_ptr->value.choice.RICrequestID.ricRequestSequenceNumber; break; - case (E2N_ProtocolIE_ID_id_RANfunctionID): + case (ProtocolIE_ID_id_RANfunctionID): dout.func_id = memb_ptr->value.choice.RANfunctionID; break; - case (E2N_ProtocolIE_ID_id_RICindicationSN): + case (ProtocolIE_ID_id_RICindicationSN): dout.indication_sn = memb_ptr->value.choice.RICindicationSN; break; - case (E2N_ProtocolIE_ID_id_RICindicationType): + case (ProtocolIE_ID_id_RICindicationType): dout.indication_type = memb_ptr->value.choice.RICindicationType; break; - case (E2N_ProtocolIE_ID_id_RICactionID): + case (ProtocolIE_ID_id_RICactionID): dout.action_id = memb_ptr->value.choice.RICactionID; break; - case (E2N_ProtocolIE_ID_id_RICcallProcessID): + case (ProtocolIE_ID_id_RICcallProcessID): dout.call_process_id = memb_ptr->value.choice.RICcallProcessID.buf; dout.call_process_id_size = memb_ptr->value.choice.RICcallProcessID.size; @@ -278,6 +278,7 @@ bool ric_indication:: get_fields(E2N_InitiatingMessage_t * init_msg, ric_indica } -E2N_InitiatingMessage_t * ric_indication::get_message(void) { +InitiatingMessage_t * ric_indication::get_message(void) { return initMsg; } +*/