From 29bc4101cc6de8ef75de2ecfffb7e697108cbcb3 Mon Sep 17 00:00:00 2001 From: Sakthivel Velumani Date: Thu, 22 Feb 2024 17:46:52 -0500 Subject: [PATCH] NGAP: Fix byte order of NSSAI SD --- openair3/NGAP/ngap_gNB_handlers.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c index b1972a6412..5a639e7305 100644 --- a/openair3/NGAP/ngap_gNB_handlers.c +++ b/openair3/NGAP/ngap_gNB_handlers.c @@ -794,7 +794,8 @@ static int ngap_gNB_handle_initial_context_request(sctp_assoc_t assoc_id, uint32 OCTET_STRING_TO_INT8(&allow_nssai_item_p->s_NSSAI.sST, msg->allowed_nssai[i].sst); if(allow_nssai_item_p->s_NSSAI.sD != NULL) { - memcpy(&msg->allowed_nssai[i].sd, allow_nssai_item_p->s_NSSAI.sD, 3); + msg->allowed_nssai[i].sd = 0; + BUFFER_TO_INT24((uint8_t *)allow_nssai_item_p->s_NSSAI.sD->buf, msg->allowed_nssai[i].sd); } else { msg->allowed_nssai[i].sd = 0xffffff; } @@ -974,10 +975,7 @@ static int ngap_gNB_handle_pdusession_setup_request(sctp_assoc_t assoc_id, uint3 // S-NSSAI OCTET_STRING_TO_INT8(&item_p->s_NSSAI.sST, msg->pdusession_setup_params[i].nssai.sst); if (item_p->s_NSSAI.sD != NULL) { - uint8_t *sd_p = (uint8_t *)&msg->pdusession_setup_params[i].nssai.sd; - sd_p[0] = item_p->s_NSSAI.sD->buf[0]; - sd_p[1] = item_p->s_NSSAI.sD->buf[1]; - sd_p[2] = item_p->s_NSSAI.sD->buf[2]; + BUFFER_TO_INT24((uint8_t *)item_p->s_NSSAI.sD->buf, msg->pdusession_setup_params[i].nssai.sd); } else { msg->pdusession_setup_params[i].nssai.sd = 0xffffff; }