X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2sim%2Fsrc%2Fencoding%2Fencode_e2apv1.cpp;h=e467d801d63d18aef7c811b340609b890e0e5050;hb=72359530324f1cc77adebf2491c512ce84eb3bfc;hp=47da01a2cd93aa249aa8cb786ef849dcb6cf6947;hpb=f86662b5b6481f27e18313a36355871f3a947193;p=sim%2Fe2-interface.git diff --git a/e2sim/src/encoding/encode_e2apv1.cpp b/e2sim/src/encoding/encode_e2apv1.cpp index 47da01a..e467d80 100755 --- a/e2sim/src/encoding/encode_e2apv1.cpp +++ b/e2sim/src/encoding/encode_e2apv1.cpp @@ -159,9 +159,6 @@ void encoding::generate_e2apv1_service_update(E2AP_PDU_t *e2ap_pdu, std::vector< } void encoding::generate_e2apv1_setup_request_parameterized(E2AP_PDU_t *e2ap_pdu, std::vector all_funcs) { - // long ranFunctionId, uint8_t *ranFuncDescEncoded, int ranFuncLength) { - - // uint8_t *buf = (uint8_t *)"gnb1" BIT_STRING_t *gnb_bstring = (BIT_STRING_t*)calloc(1, sizeof(BIT_STRING_t));; gnb_bstring->buf = (uint8_t*)calloc(1,4); @@ -211,15 +208,13 @@ void encoding::generate_e2apv1_setup_request_parameterized(E2AP_PDU_t *e2ap_pdu, if(globale2nodeid) free(globale2nodeid); - printf("seting up the tx id"); + //seting tx id auto *e2txid = (E2setupRequestIEs_t *)calloc(1, sizeof(E2setupRequestIEs_t)); e2txid->id = ProtocolIE_ID_id_TransactionID; e2txid-> criticality = 0; e2txid->value.present = E2setupRequestIEs__value_PR_TransactionID; e2txid->value.choice.TransactionID = 1; - printf("seting done the tx id"); - auto *ranFlistIEs = (E2setupRequestIEs_t *)calloc(1, sizeof(E2setupRequestIEs_t)); ASN_STRUCT_RESET(asn_DEF_E2setupRequestIEs, ranFlistIEs); ranFlistIEs->criticality = 0; @@ -263,7 +258,6 @@ e2configAdditionItem->value.present = E2nodeComponentConfigAddition_ItemIEs__val e2configAdditionItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentInterfaceType = E2nodeComponentInterfaceType_ng; e2configAdditionItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.present = E2nodeComponentID_PR_e2nodeComponentInterfaceTypeNG; -// E2nodeComponentInterfaceNG_t intfNG; auto *intfNG = (E2nodeComponentInterfaceNG_t *) calloc(1, sizeof(E2nodeComponentInterfaceNG_t)); OCTET_STRING_t nginterf; @@ -378,9 +372,13 @@ ASN_SEQUENCE_ADD(&e2configIE->value.choice.RANfunctions_List.list, e2configAddit } void encoding::generate_e2apv2_config_update(E2AP_PDU_t *e2ap_pdu){ - + // txid + auto *e2txidIE = (E2nodeConfigurationUpdate_IEs_t *)calloc(1, sizeof(E2nodeConfigurationUpdate_IEs_t)); + e2txidIE->id = ProtocolIE_ID_id_TransactionID; + e2txidIE-> criticality = Criticality_reject; + e2txidIE->value.present = E2nodeConfigurationUpdate_IEs__value_PR_TransactionID; + e2txidIE->value.choice.TransactionID = 1; - /// config update id for addtion list auto *e2configIE = (E2nodeConfigurationUpdate_IEs_t *)calloc(1, sizeof(E2nodeConfigurationUpdate_IEs_t)); e2configIE->id = ProtocolIE_ID_id_E2nodeComponentConfigAddition; @@ -420,16 +418,13 @@ memcpy(resPart.buf, (uint8_t *)"respart", 7); resPart.size = 7; e2configAdditionItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentConfiguration.e2nodeComponentResponsePart = resPart; - - - - ASN_SEQUENCE_ADD(&e2configIE->value.choice.E2nodeComponentConfigAddition_List, e2configAdditionItem); InitiatingMessage *inititingMsg = (InitiatingMessage *) calloc(1, sizeof(InitiatingMessage)); - inititingMsg->procedureCode = InitiatingMessage__value_PR_E2nodeConfigurationUpdate; + inititingMsg->procedureCode = ProcedureCode_id_E2nodeConfigurationUpdate; inititingMsg->criticality = Criticality_reject; inititingMsg->value.present = InitiatingMessage__value_PR_E2nodeConfigurationUpdate; + ASN_SEQUENCE_ADD(&inititingMsg->value.choice.E2nodeConfigurationUpdate.protocolIEs.list, e2txidIE); ASN_SEQUENCE_ADD(&inititingMsg->value.choice.E2nodeConfigurationUpdate.protocolIEs.list, e2configIE); e2ap_pdu->present = E2AP_PDU_PR_initiatingMessage; e2ap_pdu->choice.initiatingMessage = inititingMsg;