From 3d11b8712760a58fe93de846d28a64f746c06104 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Wed, 19 May 2021 13:27:31 +0900 Subject: [PATCH] [AMF] Buffix for NON-initial NAS message (#1106) Confirmation for non-cleartext IE should only be applied to the initial NAS message. Registration requests and Service requests with UplinkNASTransport do not have to. --- src/amf/context.h | 3 - src/amf/gmm-handler.c | 10 +- src/amf/gmm-handler.h | 4 +- src/amf/gmm-sm.c | 25 +-- tests/registration/guti-test.c | 275 +++++++++++++++++++++++++++++++++ tests/registration/idle-test.c | 30 +--- 6 files changed, 304 insertions(+), 43 deletions(-) diff --git a/src/amf/context.h b/src/amf/context.h index 36643c190..df758062f 100644 --- a/src/amf/context.h +++ b/src/amf/context.h @@ -222,9 +222,6 @@ struct amf_ue_s { uint8_t message_type; /* Type of last specific NAS message received */ int access_type; /* 3GPP or Non-3GPP */ - /* InitialUEMessage or UplinkNASTrasnport */ - NGAP_ProcedureCode_t ngapProcedureCode; - struct { ED3(uint8_t tsc:1;, uint8_t ksi:3;, diff --git a/src/amf/gmm-handler.c b/src/amf/gmm-handler.c index 9214e1f8c..d9ce678b4 100644 --- a/src/amf/gmm-handler.c +++ b/src/amf/gmm-handler.c @@ -32,7 +32,7 @@ static int gmm_handle_nas_message_container(amf_ue_t *amf_ue, ogs_nas_message_container_t *nas_message_container); int gmm_handle_registration_request(amf_ue_t *amf_ue, - ogs_nas_security_header_type_t h, + ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_registration_request_t *registration_request) { int served_tai_index = 0; @@ -106,7 +106,8 @@ int gmm_handle_registration_request(amf_ue_t *amf_ue, OGS_NAS_5GS_REGISTRATION_REQUEST_EPS_NAS_MESSAGE_CONTAINER_PRESENT| \ OGS_NAS_5GS_REGISTRATION_REQUEST_NAS_MESSAGE_CONTAINER_PRESENT) - if (registration_request->presencemask & + if (ngap_code == NGAP_ProcedureCode_id_InitialUEMessage && + registration_request->presencemask & ~OGS_REGISTRATION_CLEARTEXT_PRESENT) { ogs_error("Non cleartext IEs is included [0x%llx]", (long long)registration_request->presencemask); @@ -417,7 +418,7 @@ int gmm_handle_registration_update(amf_ue_t *amf_ue, } int gmm_handle_service_request(amf_ue_t *amf_ue, - ogs_nas_security_header_type_t h, + ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_service_request_t *service_request) { int served_tai_index = 0; @@ -450,7 +451,8 @@ int gmm_handle_service_request(amf_ue_t *amf_ue, #define OGS_SERVICE_CLEARTEXT_PRESENT \ (OGS_NAS_5GS_SERVICE_REQUEST_NAS_MESSAGE_CONTAINER_PRESENT) - if (service_request->presencemask & ~OGS_SERVICE_CLEARTEXT_PRESENT) { + if (ngap_code == NGAP_ProcedureCode_id_InitialUEMessage && + service_request->presencemask & ~OGS_SERVICE_CLEARTEXT_PRESENT) { ogs_error("Non cleartext IEs is included [0x%llx]", (long long)service_request->presencemask); ogs_assert(OGS_OK == diff --git a/src/amf/gmm-handler.h b/src/amf/gmm-handler.h index dd274a398..a0b71df96 100644 --- a/src/amf/gmm-handler.h +++ b/src/amf/gmm-handler.h @@ -27,13 +27,13 @@ extern "C" { #endif int gmm_handle_registration_request(amf_ue_t *amf_ue, - ogs_nas_security_header_type_t h, + ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_registration_request_t *registration_request); int gmm_handle_registration_update(amf_ue_t *amf_ue, ogs_nas_5gs_registration_request_t *registration_request); int gmm_handle_service_request(amf_ue_t *amf_ue, - ogs_nas_security_header_type_t h, + ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_service_request_t *service_request); int gmm_handle_service_update(amf_ue_t *amf_ue, ogs_nas_5gs_service_request_t *service_request); diff --git a/src/amf/gmm-sm.c b/src/amf/gmm-sm.c index d052cd051..8beb3a8fa 100644 --- a/src/amf/gmm-sm.c +++ b/src/amf/gmm-sm.c @@ -122,7 +122,6 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) ogs_assert(ran_ue); h.type = e->nas.type; - amf_ue->nas.ngapProcedureCode = e->ngap.code; xact_count = amf_sess_xact_count(amf_ue); @@ -130,7 +129,8 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_info("Registration request"); rv = gmm_handle_registration_request( - amf_ue, h, &nas_message->gmm.registration_request); + amf_ue, h, e->ngap.code, + &nas_message->gmm.registration_request); if (rv != OGS_OK) { ogs_error("gmm_handle_registration_request() failed"); OGS_FSM_TRAN(s, gmm_state_exception); @@ -220,7 +220,7 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) ogs_info("Service request"); rv = gmm_handle_service_request( - amf_ue, h, &nas_message->gmm.service_request); + amf_ue, h, e->ngap.code, &nas_message->gmm.service_request); if (rv != OGS_OK) { ogs_error("gmm_handle_service_request() failed"); OGS_FSM_TRAN(s, gmm_state_exception); @@ -451,7 +451,6 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e) ogs_assert(nas_message); h.type = e->nas.type; - amf_ue->nas.ngapProcedureCode = e->ngap.code; switch (nas_message->gmm.h.message_type) { case OGS_NAS_5GS_AUTHENTICATION_RESPONSE: @@ -520,9 +519,11 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e) case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_warn("Registration request"); rv = gmm_handle_registration_request( - amf_ue, h, &nas_message->gmm.registration_request); + amf_ue, h, e->ngap.code, + &nas_message->gmm.registration_request); if (rv != OGS_OK) { - ogs_error("[%s] Cannot handle NAS message", amf_ue->suci); + ogs_error("[%s] gmm_handle_registration_request() failed", + amf_ue->suci); OGS_FSM_TRAN(s, gmm_state_exception); break; } @@ -679,7 +680,6 @@ void gmm_state_security_mode(ogs_fsm_t *s, amf_event_t *e) ogs_assert(nas_message); h.type = e->nas.type; - amf_ue->nas.ngapProcedureCode = e->ngap.code; switch (nas_message->gmm.h.message_type) { case OGS_NAS_5GS_SECURITY_MODE_COMPLETE: @@ -748,7 +748,8 @@ void gmm_state_security_mode(ogs_fsm_t *s, amf_event_t *e) case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_warn("Registration request"); rv = gmm_handle_registration_request( - amf_ue, h, &nas_message->gmm.registration_request); + amf_ue, h, e->ngap.code, + &nas_message->gmm.registration_request); if (rv != OGS_OK) { ogs_error("[%s] Cannot handle NAS message", amf_ue->suci); OGS_FSM_TRAN(s, gmm_state_exception); @@ -968,7 +969,6 @@ void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e) ogs_assert(nas_message); h.type = e->nas.type; - amf_ue->nas.ngapProcedureCode = e->ngap.code; switch (nas_message->gmm.h.message_type) { case OGS_NAS_5GS_REGISTRATION_COMPLETE: @@ -1018,7 +1018,8 @@ void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e) case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_warn("Registration request"); rv = gmm_handle_registration_request( - amf_ue, h, &nas_message->gmm.registration_request); + amf_ue, h, e->ngap.code, + &nas_message->gmm.registration_request); if (rv != OGS_OK) { ogs_error("[%s] Cannot handle NAS message", amf_ue->suci); OGS_FSM_TRAN(s, gmm_state_exception); @@ -1136,7 +1137,6 @@ void gmm_state_exception(ogs_fsm_t *s, amf_event_t *e) ogs_assert(ran_ue); h.type = e->nas.type; - amf_ue->nas.ngapProcedureCode = e->ngap.code; xact_count = amf_sess_xact_count(amf_ue); @@ -1144,7 +1144,8 @@ void gmm_state_exception(ogs_fsm_t *s, amf_event_t *e) case OGS_NAS_5GS_REGISTRATION_REQUEST: ogs_info("Registration request"); rv = gmm_handle_registration_request( - amf_ue, h, &nas_message->gmm.registration_request); + amf_ue, h, e->ngap.code, + &nas_message->gmm.registration_request); if (rv != OGS_OK) { ogs_error("gmm_handle_registration_request() failed"); OGS_FSM_TRAN(s, gmm_state_exception); diff --git a/tests/registration/guti-test.c b/tests/registration/guti-test.c index 4a361d324..1559d0539 100644 --- a/tests/registration/guti-test.c +++ b/tests/registration/guti-test.c @@ -960,12 +960,287 @@ static void test2_func(abts_case *tc, void *data) test_ue_remove(test_ue); } +static void test3_func(abts_case *tc, void *data) +{ + int rv; + ogs_socknode_t *ngap; + ogs_socknode_t *gtpu; + ogs_pkbuf_t *gmmbuf; + ogs_pkbuf_t *gsmbuf; + ogs_pkbuf_t *nasbuf; + ogs_pkbuf_t *sendbuf; + ogs_pkbuf_t *recvbuf; + ogs_ngap_message_t message; + int i; + + ogs_nas_5gs_mobile_identity_suci_t mobile_identity_suci; + test_ue_t *test_ue = NULL; + test_sess_t *sess = NULL; + test_bearer_t *qos_flow = NULL; + + bson_t *doc = NULL; + + /* Setup Test UE & Session Context */ + memset(&mobile_identity_suci, 0, sizeof(mobile_identity_suci)); + + mobile_identity_suci.h.supi_format = OGS_NAS_5GS_SUPI_FORMAT_IMSI; + mobile_identity_suci.h.type = OGS_NAS_5GS_MOBILE_IDENTITY_SUCI; + mobile_identity_suci.routing_indicator1 = 0; + mobile_identity_suci.routing_indicator2 = 0xf; + mobile_identity_suci.routing_indicator3 = 0xf; + mobile_identity_suci.routing_indicator4 = 0xf; + mobile_identity_suci.protection_scheme_id = OGS_NAS_5GS_NULL_SCHEME; + mobile_identity_suci.home_network_pki_value = 0; + mobile_identity_suci.scheme_output[0] = 0; + mobile_identity_suci.scheme_output[1] = 0; + mobile_identity_suci.scheme_output[2] = 0x20; + mobile_identity_suci.scheme_output[3] = 0x31; + mobile_identity_suci.scheme_output[4] = 0x90; + + test_ue = test_ue_add_by_suci(&mobile_identity_suci, 13); + ogs_assert(test_ue); + + test_ue->nr_cgi.cell_id = 0x40001; + + test_ue->nas.registration.tsc = 0; + test_ue->nas.registration.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE; + test_ue->nas.registration.follow_on_request = 1; + test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL; + + test_ue->k_string = "465b5ce8b199b49faa5f0a2ee238a6bc"; + test_ue->opc_string = "e8ed289deba952e4283b54e88e6183ca"; + + /* gNB connects to AMF */ + ngap = testngap_client(AF_INET); + ABTS_PTR_NOTNULL(tc, ngap); + + /* gNB connects to UPF */ + gtpu = test_gtpu_server(1, AF_INET); + ABTS_PTR_NOTNULL(tc, gtpu); + + /* Send NG-Setup Reqeust */ + sendbuf = testngap_build_ng_setup_request(0x4000, 22); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive NG-Setup Response */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + + /********** Insert Subscriber in Database */ + doc = test_db_new_simple(test_ue); + ABTS_PTR_NOTNULL(tc, doc); + ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); + + /* Send Registration request */ + test_ue->registration_request_param.guti = 1; + gmmbuf = testgmm_build_registration_request(test_ue, NULL); + ABTS_PTR_NOTNULL(tc, gmmbuf); + + test_ue->registration_request_param.gmm_capability = 1; + test_ue->registration_request_param.s1_ue_network_capability = 1; + test_ue->registration_request_param.requested_nssai = 1; + test_ue->registration_request_param.last_visited_registered_tai = 1; + test_ue->registration_request_param.ue_usage_setting = 1; + nasbuf = testgmm_build_registration_request(test_ue, NULL); + ABTS_PTR_NOTNULL(tc, nasbuf); + + sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive Identity request */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + + /* Send Identity response */ + gmmbuf = testgmm_build_identity_response(test_ue); + ABTS_PTR_NOTNULL(tc, gmmbuf); + sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive Authentication request */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + + /* Send Authentication response */ + gmmbuf = testgmm_build_authentication_response(test_ue); + ABTS_PTR_NOTNULL(tc, gmmbuf); + sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive Security mode command */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + + /* Send Security mode complete */ + gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf); + ABTS_PTR_NOTNULL(tc, gmmbuf); + sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive InitialContextSetupRequest + + * Registration accept */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + ABTS_INT_EQUAL(tc, + NGAP_ProcedureCode_id_InitialContextSetup, + test_ue->ngap_procedure_code); + + /* Send UERadioCapabilityInfoIndication */ + sendbuf = testngap_build_ue_radio_capability_info_indication(test_ue); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Send InitialContextSetupResponse */ + sendbuf = testngap_build_initial_context_setup_response(test_ue, false); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Send Registration complete */ + gmmbuf = testgmm_build_registration_complete(test_ue); + ABTS_PTR_NOTNULL(tc, gmmbuf); + sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive Configuration update command */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + + /* Send PDU session establishment request */ + sess = test_sess_add_by_dnn_and_psi(test_ue, "internet", 5); + ogs_assert(sess); + + sess->ul_nas_transport_param.request_type = + OGS_NAS_5GS_REQUEST_TYPE_INITIAL; + sess->ul_nas_transport_param.dnn = 1; + sess->ul_nas_transport_param.s_nssai = 1; + + sess->pdu_session_establishment_param.ssc_mode = 1; + sess->pdu_session_establishment_param.epco = 1; + + gsmbuf = testgsm_build_pdu_session_establishment_request(sess); + ABTS_PTR_NOTNULL(tc, gsmbuf); + gmmbuf = testgmm_build_ul_nas_transport(sess, + OGS_NAS_PAYLOAD_CONTAINER_N1_SM_INFORMATION, gsmbuf); + ABTS_PTR_NOTNULL(tc, gmmbuf); + sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive PDUSessionResourceSetupRequest + + * DL NAS transport + + * PDU session establishment accept */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + ABTS_INT_EQUAL(tc, + NGAP_ProcedureCode_id_PDUSessionResourceSetup, + test_ue->ngap_procedure_code); + + /* Send PDUSessionResourceSetupResponse */ + sendbuf = testngap_sess_build_pdu_session_resource_setup_response(sess); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Send Registration request + * - Update Registration request type + * - Uplink Data Status */ + test_ue->nas.registration.value = + OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING; + + test_ue->registration_request_param.integrity_protected = 1; + test_ue->registration_request_param.uplink_data_status = 1; + test_ue->registration_request_param.psimask.uplink_data_status = + 1 << sess->psi; + gmmbuf = testgmm_build_registration_request(test_ue, NULL); + ABTS_PTR_NOTNULL(tc, gmmbuf); + + sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive PDUSessionResourceSetupRequest + + * Registration accept */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + ABTS_INT_EQUAL(tc, + NGAP_ProcedureCode_id_PDUSessionResourceSetup, + test_ue->ngap_procedure_code); + ABTS_INT_EQUAL(tc, 0x0000, test_ue->pdu_session_reactivation_result); + + /* Send PDUSessionResourceSetupResponse */ + sendbuf = testngap_ue_build_pdu_session_resource_setup_response(test_ue); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Send UEContextReleaseRequest */ + sendbuf = testngap_build_ue_context_release_request(test_ue, + NGAP_Cause_PR_radioNetwork, NGAP_CauseRadioNetwork_user_inactivity, + true); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + /* Receive UEContextReleaseCommand */ + recvbuf = testgnb_ngap_read(ngap); + ABTS_PTR_NOTNULL(tc, recvbuf); + testngap_recv(test_ue, recvbuf); + ABTS_INT_EQUAL(tc, + NGAP_ProcedureCode_id_UEContextRelease, + test_ue->ngap_procedure_code); + + /* Send UEContextReleaseComplete */ + sendbuf = testngap_build_ue_context_release_complete(test_ue); + ABTS_PTR_NOTNULL(tc, sendbuf); + rv = testgnb_ngap_send(ngap, sendbuf); + ABTS_INT_EQUAL(tc, OGS_OK, rv); + + ogs_msleep(300); + + /********** Remove Subscriber in Database */ + ABTS_INT_EQUAL(tc, OGS_OK, test_db_remove_ue(test_ue)); + + /* gNB disonncect from UPF */ + testgnb_gtpu_close(gtpu); + + /* gNB disonncect from AMF */ + testgnb_ngap_close(ngap); + + /* Clear Test UE Context */ + test_ue_remove(test_ue); +} + abts_suite *test_guti(abts_suite *suite) { suite = ADD_SUITE(suite) abts_run_test(suite, test1_func, NULL); abts_run_test(suite, test2_func, NULL); + abts_run_test(suite, test3_func, NULL); return suite; } diff --git a/tests/registration/idle-test.c b/tests/registration/idle-test.c index 5eaa807ec..f8771713c 100644 --- a/tests/registration/idle-test.c +++ b/tests/registration/idle-test.c @@ -945,20 +945,13 @@ static void test3_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; - test_ue->service_request_param.ciphered = 0; - test_ue->service_request_param.uplink_data_status = 1; - test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; - nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); - ABTS_PTR_NOTNULL(tc, nasbuf); - - memset(&test_ue->service_request_param, 0, - sizeof(test_ue->service_request_param)); test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.ciphered = 1; + test_ue->service_request_param.uplink_data_status = 1; + test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1372,22 +1365,15 @@ static void test4_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; - test_ue->service_request_param.ciphered = 0; + test_ue->service_request_param.integrity_protected = 1; + test_ue->service_request_param.ciphered = 1; test_ue->service_request_param.pdu_session_status = 1; test_ue->service_request_param.psimask.pdu_session_status = 1 << sess->psi; - nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); - ABTS_PTR_NOTNULL(tc, nasbuf); - - memset(&test_ue->service_request_param, 0, - sizeof(test_ue->service_request_param)); - test_ue->service_request_param.integrity_protected = 1; - test_ue->service_request_param.ciphered = 1; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); rv = testgnb_ngap_send(ngap, sendbuf);