X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fe2-interface.git;a=blobdiff_plain;f=e2sim%2Fe2apv1sim%2Fsrc%2FE2AP%2Fe2ap_message_handler.cpp;fp=e2sim%2Fe2apv1sim%2Fsrc%2FE2AP%2Fe2ap_message_handler.cpp;h=44f028d163a712ae7793142395d1df0822e0b27e;hp=efdf1750cac8ff7332f61c1155a8ce67a2e49e7e;hb=b57063d875ff4f1f554c2f00122f2a4c21824b6f;hpb=5c3fd8f88224475176792cfeb82d533cc81c2586 diff --git a/e2sim/e2apv1sim/src/E2AP/e2ap_message_handler.cpp b/e2sim/e2apv1sim/src/E2AP/e2ap_message_handler.cpp index efdf175..44f028d 100644 --- a/e2sim/e2apv1sim/src/E2AP/e2ap_message_handler.cpp +++ b/e2sim/e2apv1sim/src/E2AP/e2ap_message_handler.cpp @@ -19,12 +19,13 @@ # * ******************************************************************************/ #include "e2ap_message_handler.hpp" -#include + //#include //#include #include "encode_e2apv1.hpp" +#include "kpm_callbacks.hpp" - +#include void e2ap_handle_sctp_data(int &socket_fd, sctp_buffer_t &data, bool xmlenc) { @@ -37,11 +38,11 @@ void e2ap_handle_sctp_data(int &socket_fd, sctp_buffer_t &data, bool xmlenc) asn_transfer_syntax syntax; - if (!xmlenc) - syntax = ATS_ALIGNED_BASIC_PER; - else - syntax = ATS_BASIC_XER; + syntax = ATS_ALIGNED_BASIC_PER; + + + fprintf(stderr, "full buffer\n%s\n", data.buffer); // e2ap_asn1c_decode_pdu(pdu, data.buffer, data.len); auto rval = asn_decode(nullptr, syntax, &asn_DEF_E2AP_PDU, (void **) &pdu, @@ -70,7 +71,7 @@ void e2ap_handle_sctp_data(int &socket_fd, sctp_buffer_t &data, bool xmlenc) switch(index) { case E2AP_PDU_PR_initiatingMessage: - e2ap_handle_E2SetupRequest(pdu, socket_fd); + e2ap_handle_E2SetupRequest(pdu, socket_fd); LOG_I("[E2AP] Received SETUP-REQUEST"); break; @@ -112,7 +113,8 @@ void e2ap_handle_sctp_data(int &socket_fd, sctp_buffer_t &data, bool xmlenc) { case E2AP_PDU_PR_initiatingMessage: //initiatingMessage LOG_I("[E2AP] Received RIC-SUBSCRIPTION-REQUEST"); - e2ap_handle_RICSubscriptionRequest(pdu, socket_fd); + // e2ap_handle_RICSubscriptionRequest(pdu, socket_fd); + callback_kpm_subscription_request(pdu, socket_fd); // e2ap_handle_RICSubscriptionRequest_securityDemo(pdu, socket_fd); break;