X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2FE2AP-c%2Fe2ap_indication.cc;h=237c80cfde720c1d02202da32b74cfda0afc528b;hb=69a830676cee9b8a37bea3b2e59261514551be23;hp=75abd13567e9c8f75cddaa2dc16d660fdee92b4a;hpb=b9d7e9c232a4371ddfed51c58e5a57f87b057229;p=ric-app%2Fadmin.git diff --git a/src/E2AP-c/e2ap_indication.cc b/src/E2AP-c/e2ap_indication.cc index 75abd13..237c80c 100644 --- a/src/E2AP-c/e2ap_indication.cc +++ b/src/E2AP-c/e2ap_indication.cc @@ -33,25 +33,21 @@ ric_indication::ric_indication(void){ e2ap_pdu_obj = 0; - 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 = 0; - initMsg = (InitiatingMessage_t * )calloc(1, sizeof(InitiatingMessage_t)); + initMsg = (E2N_InitiatingMessage_t * )calloc(1, sizeof(E2N_InitiatingMessage_t)); assert(initMsg != 0); IE_array = 0; - IE_array = (RICindication_IEs_t *)calloc(NUM_INDICATION_IES, sizeof(RICindication_IEs_t)); + IE_array = (E2N_RICindication_IEs_t *)calloc(NUM_INDICATION_IES, sizeof(E2N_RICindication_IEs_t)); assert(IE_array != 0); - e2ap_pdu_obj->present = E2AP_PDU_PR_initiatingMessage; + e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_initiatingMessage; e2ap_pdu_obj->choice.initiatingMessage = initMsg; - RICindication_t * ric_indication = &(initMsg->value.choice.RICindication); - for(int i = 0; i < NUM_INDICATION_IES; i++){ - ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[i])); - } - + }; @@ -61,8 +57,8 @@ ric_indication::ric_indication(void){ // Clear assigned protocolIE list from RIC indication IE container ric_indication::~ric_indication(void){ - mdclog_write(MDCLOG_INFO, "Freeing E2AP Indication object memory"); - RICindication_t *ricIndication = &(initMsg->value.choice.RICindication); + mdclog_write(MDCLOG_DEBUG, "Freeing E2AP Indication object memory"); + E2N_RICindication_t *ricIndication = &(initMsg->value.choice.RICindication); for(int i = 0; i < ricIndication->protocolIEs.list.size; i++){ ricIndication->protocolIEs.list.array[i] = 0; } @@ -74,34 +70,36 @@ ric_indication::~ric_indication(void){ } free(IE_array); - ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj); - mdclog_write(MDCLOG_INFO, "Freed E2AP Indication object mempory"); + ASN_STRUCT_FREE(asn_DEF_E2N_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, E2APRicIndication & dinput){ +bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, ric_indication_helper & dinput){ - initMsg->procedureCode = ProcedureCode_id_ricIndication; - initMsg->criticality = Criticality_ignore; - initMsg->value.present = InitiatingMessage__value_PR_RICindication; + initMsg->procedureCode = E2N_ProcedureCode_id_ricIndication; + initMsg->criticality = E2N_Criticality_ignore; + initMsg->value.present = E2N_InitiatingMessage__value_PR_RICindication; bool res; + asn_enc_rval_t retval; + res = set_fields(initMsg, dinput); if (!res){ return false; } - int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, e2ap_pdu_obj, errbuf, &errbuf_len); + int ret_constr = asn_check_constraints(&asn_DEF_E2N_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; return false; } - //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_E2AP_PDU, e2ap_pdu_obj, buf, *size); + // 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); if(retval.encoded == -1){ error_string.assign(strerror(errno)); return false; @@ -110,7 +108,7 @@ bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, E2 else { if(*size < retval.encoded){ std::stringstream ss; - ss <<"Error encoding event trigger definition. Reason = encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl; + ss <<"Error encoding E2AP Indication . Reason = encoded pdu size " << retval.encoded << " exceeds buffer size " << *size << std::endl; error_string = ss.str(); return false; } @@ -121,79 +119,85 @@ bool ric_indication::encode_e2ap_indication(unsigned char *buf, size_t *size, E2 } -bool ric_indication::set_fields(InitiatingMessage_t *initMsg, E2APRicIndication &dinput){ - unsigned int i; +bool ric_indication::set_fields(E2N_InitiatingMessage_t *initMsg, ric_indication_helper &dinput){ + unsigned int ie_index; if (initMsg == 0){ error_string = "Invalid reference for E2AP Indication message in set_fields"; return false; } - for(i = 0; i < NUM_INDICATION_IES;i++){ - memset(&(IE_array[i]), 0, sizeof(RICindication_IEs_t)); - } - - - i = 0; - RICindication_IEs_t *ies_ricreq = &IE_array[i]; - 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; + E2N_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; ricrequest_ie->ricRequestorID = dinput.req_id; ricrequest_ie->ricRequestSequenceNumber = dinput.req_seq_no; - - i = 1; - RICindication_IEs_t *ies_ranfunc = &IE_array[i]; - 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; + 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; *ranfunction_ie = dinput.func_id; - - i = 2; - RICindication_IEs_t *ies_actid = &IE_array[i]; - 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; + 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; *ricaction_ie = dinput.action_id; - - i = 3; - RICindication_IEs_t *ies_ricsn = &IE_array[i]; - 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; + 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; *ricsn_ie = dinput.indication_sn; + ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); - i = 4; - RICindication_IEs_t *ies_indtyp = &IE_array[i]; - 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; + 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; *rictype_ie = dinput.indication_type; - - i = 5; - RICindication_IEs_t *ies_richead = &IE_array[i]; - 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; + 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; richeader_ie->buf = dinput.indication_header; richeader_ie->size = dinput.indication_header_size; + ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); - i = 6; - RICindication_IEs_t *ies_indmsg = &IE_array[i]; - 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; + 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; ricmsg_ie->buf = dinput.indication_msg; ricmsg_ie->size = dinput.indication_msg_size; + ASN_SEQUENCE_ADD(&(ric_indication->protocolIEs), &(IE_array[ie_index])); return true; @@ -202,7 +206,7 @@ bool ric_indication::set_fields(InitiatingMessage_t *initMsg, E2APRicIndication -bool ric_indication:: get_fields(InitiatingMessage_t * init_msg, E2APRicIndication &dout) +bool ric_indication:: get_fields(E2N_InitiatingMessage_t * init_msg, ric_indication_helper &dout) { if (init_msg == 0){ error_string = "Invalid reference for E2AP Indication message in get_fields"; @@ -211,38 +215,38 @@ bool ric_indication:: get_fields(InitiatingMessage_t * init_msg, E2APRicIndicat for(int edx = 0; edx < init_msg->value.choice.RICindication.protocolIEs.list.count; edx++) { - RICindication_IEs_t *memb_ptr = init_msg->value.choice.RICindication.protocolIEs.list.array[edx]; + E2N_RICindication_IEs_t *memb_ptr = init_msg->value.choice.RICindication.protocolIEs.list.array[edx]; switch(memb_ptr->id) { - case (ProtocolIE_ID_id_RICindicationHeader): + case (E2N_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 (ProtocolIE_ID_id_RICindicationMessage): + case (E2N_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 (ProtocolIE_ID_id_RICrequestID): + case (E2N_ProtocolIE_ID_id_RICrequestID): dout.req_id = memb_ptr->value.choice.RICrequestID.ricRequestorID; dout.req_seq_no = memb_ptr->value.choice.RICrequestID.ricRequestSequenceNumber; break; - case (ProtocolIE_ID_id_RANfunctionID): + case (E2N_ProtocolIE_ID_id_RANfunctionID): dout.func_id = memb_ptr->value.choice.RANfunctionID; break; - case (ProtocolIE_ID_id_RICindicationSN): + case (E2N_ProtocolIE_ID_id_RICindicationSN): dout.indication_sn = memb_ptr->value.choice.RICindicationSN; break; - case (ProtocolIE_ID_id_RICindicationType): + case (E2N_ProtocolIE_ID_id_RICindicationType): dout.indication_type = memb_ptr->value.choice.RICindicationType; break; - case (ProtocolIE_ID_id_RICactionID): + case (E2N_ProtocolIE_ID_id_RICactionID): dout.action_id = memb_ptr->value.choice.RICactionID; break; @@ -256,6 +260,6 @@ bool ric_indication:: get_fields(InitiatingMessage_t * init_msg, E2APRicIndicat } -InitiatingMessage_t * ric_indication::get_message(void) { +E2N_InitiatingMessage_t * ric_indication::get_message(void) { return initMsg; }