X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2sim%2Fsrc%2Fbase%2Fe2sim.cpp;h=3e17b76ed05c8fb4a28afd2ceb08039fe7be5c5e;hb=eef7c499d4674e016842c0691b46c6c6d15f48de;hp=372cc9d9fd6b9f18556a23a7e1237c237aeecf42;hpb=81cb68102f12ca9ebc9bce56f6e08b02744e66df;p=sim%2Fe2-interface.git diff --git a/e2sim/src/base/e2sim.cpp b/e2sim/src/base/e2sim.cpp old mode 100644 new mode 100755 index 372cc9d..3e17b76 --- a/e2sim/src/base/e2sim.cpp +++ b/e2sim/src/base/e2sim.cpp @@ -29,6 +29,7 @@ #include "e2sim_sctp.hpp" #include "e2ap_message_handler.hpp" #include "encode_e2apv1.hpp" +#include "RANfunctionOID.h" using namespace std; @@ -76,6 +77,7 @@ void E2Sim::encode_and_send_sctp_data(E2AP_PDU_t* pdu) data.len = e2ap_asn1c_encode_pdu(pdu, &buf); memcpy(data.buffer, buf, min(data.len, MAX_SCTP_BUFFER)); + if (buf) free(buf); sctp_send_data(client_fd, data); } @@ -137,6 +139,11 @@ int E2Sim::run_loop(int argc, char* argv[]){ printf("client_fd value is %d\n", client_fd); std::vector all_funcs; + RANfunctionOID_t *ranFunctionOIDe = (RANfunctionOID_t*)calloc(1,sizeof(RANfunctionOID_t)); + uint8_t *buf = (uint8_t*)"OID123"; + ranFunctionOIDe->buf = (uint8_t*)calloc(1,strlen((char*)buf)+1); + memcpy(ranFunctionOIDe->buf, buf, strlen((char*)buf)+1); + ranFunctionOIDe->size = strlen((char*)buf); //Loop through RAN function definitions that are registered @@ -147,11 +154,12 @@ int E2Sim::run_loop(int argc, char* argv[]){ next_func.ranFunctionId = elem.first; next_func.ranFunctionDesc = elem.second; next_func.ranFunctionRev = (long)2; + next_func.ranFunctionOId = ranFunctionOIDe; + all_funcs.push_back(next_func); } printf("about to call setup request encode\n"); - generate_e2apv1_setup_request_parameterized(pdu_setup, all_funcs); printf("After generating e2setup req\n"); @@ -165,8 +173,8 @@ int E2Sim::run_loop(int argc, char* argv[]){ sctp_buffer_t data; - char *error_buf = (char*)calloc(300, sizeof(char)); - size_t errlen; + char error_buf[300] = {0, }; + size_t errlen = 0; asn_check_constraints(&asn_DEF_E2AP_PDU, pdu_setup, error_buf, &errlen); printf("error length %d\n", errlen);