From 2ed35f245da201652489e051387fe6c66b79f9a3 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 8 Jan 2022 12:26:23 +0900 Subject: [PATCH] Fix the ciphered test program --- tests/310014/epc-test.c | 4 +- tests/attach/auth-test.c | 17 ++--- tests/attach/emm-status-test.c | 4 +- tests/attach/guti-test.c | 55 ++++++-------- tests/attach/idle-test.c | 26 +++---- tests/attach/reset-test.c | 12 +-- tests/attach/ue-context-test.c | 22 +++--- tests/common/context.h | 30 +++----- tests/common/emm-build.c | 71 +++++++++++------- tests/common/emm-build.h | 13 +++- tests/common/esm-build.c | 8 +- tests/common/esm-build.h | 3 +- tests/common/gmm-build.c | 43 +++++++---- tests/common/gmm-build.h | 10 ++- tests/common/nas-security.c | 5 +- tests/common/ngap-path.c | 4 +- tests/common/s1ap-path.c | 4 +- tests/csfb/crash-test.c | 11 +-- tests/csfb/mo-active-test.c | 7 +- tests/csfb/mo-idle-test.c | 24 +++--- tests/csfb/mo-sms-test.c | 5 +- tests/csfb/mt-active-test.c | 7 +- tests/csfb/mt-idle-test.c | 7 +- tests/csfb/mt-sms-test.c | 5 +- tests/handover/5gc-n2-test.c | 20 ++--- tests/handover/5gc-xn-test.c | 4 +- tests/handover/epc-s1-test.c | 20 ++--- tests/handover/epc-x2-test.c | 4 +- tests/non3gpp/epdg-test.c | 10 +-- tests/registration/auth-test.c | 4 +- tests/registration/crash-test.c | 12 +-- tests/registration/dereg-test.c | 34 ++++----- tests/registration/gmm-status-test.c | 4 +- tests/registration/guti-test.c | 34 ++++----- tests/registration/identity-test.c | 14 ++-- tests/registration/idle-test.c | 90 +++++++++-------------- tests/registration/paging-test.c | 106 ++++++++++++--------------- tests/registration/reset-test.c | 14 ++-- tests/registration/ue-context-test.c | 56 ++++++-------- tests/slice/nssai-test.c | 14 ++-- tests/volte/bearer-test.c | 4 +- tests/volte/cx-test.c | 8 +- tests/volte/rx-test.c | 75 ++++++++----------- tests/volte/session-test.c | 11 +-- tests/volte/video-test.c | 8 +- tests/vonr/af-test.c | 68 ++++++++--------- tests/vonr/qos-flow-test.c | 12 ++- tests/vonr/session-test.c | 44 +++++------ tests/vonr/video-test.c | 6 +- 49 files changed, 485 insertions(+), 588 deletions(-) diff --git a/tests/310014/epc-test.c b/tests/310014/epc-test.c index c41f47fd6..e0c526719 100644 --- a/tests/310014/epc-test.c +++ b/tests/310014/epc-test.c @@ -100,12 +100,12 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); test_ue->attach_request_param.ms_network_feature_support = 1; test_ue->attach_request_param.ue_additional_security_capability = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( diff --git a/tests/attach/auth-test.c b/tests/attach/auth-test.c index 5152cea4f..4e01691cf 100644 --- a/tests/attach/auth-test.c +++ b/tests/attach/auth-test.c @@ -102,7 +102,7 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -112,7 +112,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -205,14 +205,13 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( @@ -279,13 +278,13 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( @@ -352,13 +351,13 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( diff --git a/tests/attach/emm-status-test.c b/tests/attach/emm-status-test.c index c4de71d01..f8f50dba2 100644 --- a/tests/attach/emm-status-test.c +++ b/tests/attach/emm-status-test.c @@ -96,7 +96,7 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -106,7 +106,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( diff --git a/tests/attach/guti-test.c b/tests/attach/guti-test.c index 0651c5695..7fa22ff7b 100644 --- a/tests/attach/guti-test.c +++ b/tests/attach/guti-test.c @@ -101,18 +101,17 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -237,12 +236,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -253,7 +251,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.supported_codecs = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -335,7 +333,7 @@ static void test1_func(abts_case *tc, void *data) tests1ap_recv(test_ue, recvbuf); /* Send Detach Request */ - emmbuf = testemm_build_detach_request(test_ue, 1); + emmbuf = testemm_build_detach_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -378,12 +376,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -394,7 +391,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.supported_codecs = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -532,7 +529,7 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -542,7 +539,7 @@ static void test2_func(abts_case *tc, void *data) test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -635,15 +632,14 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 0; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( @@ -752,12 +748,11 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -768,7 +763,7 @@ static void test2_func(abts_case *tc, void *data) test_ue->attach_request_param.supported_codecs = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -952,13 +947,13 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1058,7 +1053,7 @@ static void test3_func(abts_case *tc, void *data) test_ue->tau_request_param.ue_usage_setting = 1; test_ue->tau_request_param.device_properties = 1; emmbuf = testemm_build_tau_request( - test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING); + test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -1129,8 +1124,6 @@ static void test3_func(abts_case *tc, void *data) /* Send TAU Request */ memset(&test_ue->tau_request_param, 0, sizeof(test_ue->tau_request_param)); - test_ue->tau_request_param.integrity_protected = 1; - test_ue->tau_request_param.ciphered = 1; test_ue->tau_request_param.ue_network_capability = 1; test_ue->tau_request_param.last_visited_registered_tai = 1; test_ue->tau_request_param.drx_parameter = 1; @@ -1141,7 +1134,7 @@ static void test3_func(abts_case *tc, void *data) test_ue->tau_request_param.ue_usage_setting = 1; test_ue->tau_request_param.device_properties = 1; emmbuf = testemm_build_tau_request( - test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING); + test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING, true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -1290,16 +1283,15 @@ static void test4_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1374,14 +1366,14 @@ static void test4_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1483,12 +1475,11 @@ static void test4_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -1499,7 +1490,7 @@ static void test4_func(abts_case *tc, void *data) test_ue->attach_request_param.supported_codecs = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/attach/idle-test.c b/tests/attach/idle-test.c index 88c6c7330..01d47f37c 100644 --- a/tests/attach/idle-test.c +++ b/tests/attach/idle-test.c @@ -102,13 +102,13 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -242,8 +242,6 @@ static void test1_func(abts_case *tc, void *data) /* Send TAU Request */ memset(&test_ue->tau_request_param, 0, sizeof(test_ue->tau_request_param)); - test_ue->tau_request_param.integrity_protected = 1; - test_ue->tau_request_param.ciphered = 1; test_ue->tau_request_param.ue_network_capability = 1; test_ue->tau_request_param.last_visited_registered_tai = 1; test_ue->tau_request_param.drx_parameter = 1; @@ -254,7 +252,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->tau_request_param.ue_usage_setting = 1; test_ue->tau_request_param.device_properties = 1; emmbuf = testemm_build_tau_request( - test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING); + test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_TA_UPDATING, true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -290,8 +288,6 @@ static void test1_func(abts_case *tc, void *data) /* Send TAU Request */ memset(&test_ue->tau_request_param, 0, sizeof(test_ue->tau_request_param)); - test_ue->tau_request_param.integrity_protected = 1; - test_ue->tau_request_param.ciphered = 1; test_ue->tau_request_param.ue_network_capability = 1; test_ue->tau_request_param.last_visited_registered_tai = 1; test_ue->tau_request_param.drx_parameter = 1; @@ -303,7 +299,8 @@ static void test1_func(abts_case *tc, void *data) test_ue->tau_request_param.device_properties = 1; emmbuf = testemm_build_tau_request( test_ue, false, - OGS_NAS_EPS_UPDATE_TYPE_COMBINED_TA_LA_UPDATING_WITH_IMSI_ATTACH); + OGS_NAS_EPS_UPDATE_TYPE_COMBINED_TA_LA_UPDATING_WITH_IMSI_ATTACH, + true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -439,13 +436,13 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -535,8 +532,6 @@ static void test2_func(abts_case *tc, void *data) /* Send TAU Request */ memset(&test_ue->tau_request_param, 0, sizeof(test_ue->tau_request_param)); - test_ue->tau_request_param.integrity_protected = 1; - test_ue->tau_request_param.ciphered = 1; test_ue->tau_request_param.ue_network_capability = 1; test_ue->tau_request_param.last_visited_registered_tai = 1; test_ue->tau_request_param.drx_parameter = 1; @@ -550,7 +545,8 @@ static void test2_func(abts_case *tc, void *data) test_ue->tau_request_param.old_guti_type = 1; test_ue->tau_request_param.ms_network_feature_support = 1; emmbuf = testemm_build_tau_request( - test_ue, false, OGS_NAS_EPS_UPDATE_TYPE_PERIODIC_UPDATING); + test_ue, false, OGS_NAS_EPS_UPDATE_TYPE_PERIODIC_UPDATING, + true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -730,13 +726,13 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/attach/reset-test.c b/tests/attach/reset-test.c index d02e141a4..7ecec23e2 100644 --- a/tests/attach/reset-test.c +++ b/tests/attach/reset-test.c @@ -126,7 +126,7 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -138,7 +138,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.supported_codecs = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -368,7 +368,7 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[i]->attach_request_param, @@ -380,7 +380,7 @@ static void test2_func(abts_case *tc, void *data) test_ue[i]->attach_request_param.supported_codecs = 1; test_ue[i]->attach_request_param.ue_usage_setting = 1; test_ue[i]->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue[i], esmbuf); + emmbuf = testemm_build_attach_request(test_ue[i], esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue[i]->initial_ue_param, 0, @@ -595,7 +595,7 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[i]->attach_request_param, @@ -607,7 +607,7 @@ static void test3_func(abts_case *tc, void *data) test_ue[i]->attach_request_param.supported_codecs = 1; test_ue[i]->attach_request_param.ue_usage_setting = 1; test_ue[i]->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue[i], esmbuf); + emmbuf = testemm_build_attach_request(test_ue[i], esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue[i]->initial_ue_param, 0, diff --git a/tests/attach/ue-context-test.c b/tests/attach/ue-context-test.c index 17848408c..b39822615 100644 --- a/tests/attach/ue-context-test.c +++ b/tests/attach/ue-context-test.c @@ -98,7 +98,7 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -108,7 +108,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -267,16 +267,15 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -351,14 +350,14 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -553,16 +552,15 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -637,14 +635,14 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/common/context.h b/tests/common/context.h index 589df9e8d..faf8a691b 100644 --- a/tests/common/context.h +++ b/tests/common/context.h @@ -118,8 +118,7 @@ typedef struct test_initial_ue_param_s { typedef struct test_registration_request_param_s { struct { - ED8(uint8_t integrity_protected:1;, - uint8_t ciphered:1;, + ED7(uint8_t spare1:1;, uint8_t guti:1;, uint8_t gmm_capability:1;, uint8_t requested_nssai:1;, @@ -143,8 +142,7 @@ typedef struct test_registration_request_param_s { typedef struct test_attach_request_param_s { struct { - ED8(uint8_t integrity_protected:1;, - uint8_t ciphered:1;, + ED7(uint8_t spare1:1;, uint8_t guti:1;, uint8_t last_visited_registered_tai:1;, uint8_t drx_parameter:1;, @@ -196,26 +194,19 @@ typedef struct test_tau_request_param_s { uint8_t supported_codecs:1;) }; struct { - ED8(uint8_t additional_update_type:1;, + ED3(uint8_t additional_update_type:1;, uint8_t device_properties:1;, - uint8_t integrity_protected:1;, - uint8_t ciphered:1;, - uint8_t spare5:1;, - uint8_t spare6:1;, - uint8_t spare7:1;, - uint8_t spare8:1;) + uint8_t spare2:6;) }; } __attribute__ ((packed)) test_tau_request_param_t; typedef struct test_service_request_param_s { union { struct { - ED6(uint8_t integrity_protected:1;, - uint8_t ciphered:1;, - uint8_t pdu_session_status:1;, + ED4(uint8_t pdu_session_status:1;, uint8_t uplink_data_status:1;, uint8_t allowed_pdu_session_status:1;, - uint8_t reserved:3;) + uint8_t reserved:5;) }; uint8_t value; }; @@ -229,12 +220,9 @@ typedef struct test_service_request_param_s { typedef struct test_extended_service_request_param_s { union { struct { - ED6(uint8_t ciphered:1;, - uint8_t csfb_response:1;, + ED3(uint8_t csfb_response:1;, uint8_t eps_bearer_context_status:1;, - uint8_t spare1:1;, - uint8_t spare2:1;, - uint8_t spare3:3;) + uint8_t spare:6;) }; uint8_t value; }; @@ -273,7 +261,7 @@ typedef struct test_pdn_connectivity_param_s { uint8_t eit_no_required:1;, uint8_t apn:1;, uint8_t pco:1;, - uint8_t integrity_protected:1;, + uint8_t spare:1;, uint8_t request_type:3;) }; uint8_t value; diff --git a/tests/common/emm-build.c b/tests/common/emm-build.c index ed0deb05e..7183a187e 100644 --- a/tests/common/emm-build.c +++ b/tests/common/emm-build.c @@ -20,7 +20,8 @@ #include "test-common.h" ogs_pkbuf_t *testemm_build_attach_request( - test_ue_t *test_ue, ogs_pkbuf_t *esmbuf) + test_ue_t *test_ue, ogs_pkbuf_t *esmbuf, + bool integrity_protected, bool ciphered) { int i; uint16_t psimask = 0; @@ -71,8 +72,8 @@ ogs_pkbuf_t *testemm_build_attach_request( ogs_assert(esmbuf); memset(&message, 0, sizeof(message)); - if (test_ue->attach_request_param.integrity_protected) { - if (test_ue->attach_request_param.ciphered) + if (integrity_protected) { + if (ciphered) message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; else @@ -80,8 +81,7 @@ ogs_pkbuf_t *testemm_build_attach_request( OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; } - message.emm.h.protocol_discriminator = - OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; + message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; message.emm.h.message_type = OGS_NAS_EPS_ATTACH_REQUEST; esm_message_container->length = esmbuf->len; @@ -237,7 +237,7 @@ ogs_pkbuf_t *testemm_build_attach_request( ue_additional_security_capability->nia = 0xf0; } - if (test_ue->attach_request_param.integrity_protected) + if (integrity_protected) return test_nas_eps_security_encode(test_ue, &message); else return ogs_nas_eps_plain_encode(&message); @@ -375,7 +375,7 @@ ogs_pkbuf_t *testemm_build_security_mode_complete(test_ue_t *test_ue) memset(&message, 0, sizeof(message)); message.h.security_header_type = - OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHTERD_WITH_NEW_INTEGRITY_CONTEXT; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -439,7 +439,9 @@ ogs_pkbuf_t *testemm_build_tau_complete(test_ue_t *test_ue) return test_nas_eps_security_encode(test_ue, &message); } -ogs_pkbuf_t *testemm_build_detach_request(test_ue_t *test_ue, bool switch_off) +ogs_pkbuf_t *testemm_build_detach_request( + test_ue_t *test_ue, bool switch_off, + bool integrity_protected, bool ciphered) { ogs_nas_eps_message_t message; ogs_nas_eps_detach_request_from_ue_t *detach_request = @@ -452,10 +454,15 @@ ogs_pkbuf_t *testemm_build_detach_request(test_ue_t *test_ue, bool switch_off) ogs_assert(test_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = - OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; - message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; - + if (integrity_protected) { + if (ciphered) + message.h.security_header_type = + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; + else + message.h.security_header_type = + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED; + message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; + } message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; message.emm.h.message_type = OGS_NAS_EPS_DETACH_REQUEST; @@ -480,7 +487,10 @@ ogs_pkbuf_t *testemm_build_detach_request(test_ue_t *test_ue, bool switch_off) &test_ue->mobile_identity_imsi, eps_mobile_identity->length); } - return test_nas_eps_security_encode(test_ue, &message); + if (integrity_protected) + return test_nas_eps_security_encode(test_ue, &message); + else + return ogs_nas_eps_plain_encode(&message); } ogs_pkbuf_t *testemm_build_service_request(test_ue_t *test_ue) @@ -527,7 +537,8 @@ ogs_pkbuf_t *testemm_build_service_request(test_ue_t *test_ue) } ogs_pkbuf_t *testemm_build_tau_request( - test_ue_t *test_ue, bool active_flag, uint8_t update_type) + test_ue_t *test_ue, bool active_flag, uint8_t update_type, + bool integrity_protected, bool ciphered) { ogs_nas_eps_message_t message; ogs_nas_eps_tracking_area_update_request_t *tau_request = @@ -573,8 +584,8 @@ ogs_pkbuf_t *testemm_build_tau_request( ogs_assert(test_ue); memset(&message, 0, sizeof(message)); - if (test_ue->tau_request_param.integrity_protected) { - if (test_ue->tau_request_param.ciphered) { + if (integrity_protected) { + if (ciphered) { message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; } else { @@ -755,7 +766,7 @@ ogs_pkbuf_t *testemm_build_tau_request( OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST_DEVICE_PROPERTIES_PRESENT; } - if (test_ue->tau_request_param.integrity_protected) + if (integrity_protected) return test_nas_eps_security_encode(test_ue, &message); else return ogs_nas_eps_plain_encode(&message); @@ -783,7 +794,8 @@ ogs_pkbuf_t *testemm_build_emm_status( } ogs_pkbuf_t *testemm_build_extended_service_request( - test_ue_t *test_ue, uint8_t type) + test_ue_t *test_ue, uint8_t type, + bool integrity_protected, bool ciphered) { ogs_nas_eps_message_t message; ogs_nas_eps_extended_service_request_t *extended_service_request = @@ -801,15 +813,15 @@ ogs_pkbuf_t *testemm_build_extended_service_request( ogs_assert(test_ue); memset(&message, 0, sizeof(message)); - if (test_ue->extended_service_request_param.ciphered) - message.h.security_header_type = - OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; - else - message.h.security_header_type = - OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED; - - message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; - + if (integrity_protected) { + if (ciphered) + message.h.security_header_type = + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; + else + message.h.security_header_type = + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED; + message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; + } message.emm.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; message.emm.h.message_type = OGS_NAS_EPS_EXTENDED_SERVICE_REQUEST; @@ -842,7 +854,10 @@ ogs_pkbuf_t *testemm_build_extended_service_request( } } - return test_nas_eps_security_encode(test_ue, &message); + if (integrity_protected) + return test_nas_eps_security_encode(test_ue, &message); + else + return ogs_nas_eps_plain_encode(&message); } ogs_pkbuf_t *testemm_build_uplink_nas_transport(test_ue_t *test_ue) diff --git a/tests/common/emm-build.h b/tests/common/emm-build.h index 198570881..c4c4dd12e 100644 --- a/tests/common/emm-build.h +++ b/tests/common/emm-build.h @@ -25,7 +25,8 @@ extern "C" { #endif ogs_pkbuf_t *testemm_build_attach_request( - test_ue_t *test_ue, ogs_pkbuf_t *esmbuf); + test_ue_t *test_ue, ogs_pkbuf_t *esmbuf, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testemm_build_identity_response(test_ue_t *test_ue); ogs_pkbuf_t *testemm_build_authentication_response(test_ue_t *test_ue); ogs_pkbuf_t *testemm_build_authentication_failure( @@ -35,16 +36,20 @@ ogs_pkbuf_t *testemm_build_attach_complete( test_ue_t *test_ue, ogs_pkbuf_t *esmbuf); ogs_pkbuf_t *testemm_build_tau_complete(test_ue_t *test_ue); -ogs_pkbuf_t *testemm_build_detach_request(test_ue_t *test_ue, bool switch_off); +ogs_pkbuf_t *testemm_build_detach_request( + test_ue_t *test_ue, bool switch_off, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testemm_build_service_request(test_ue_t *test_ue); ogs_pkbuf_t *testemm_build_tau_request( - test_ue_t *test_ue, bool active_flag, uint8_t update_type); + test_ue_t *test_ue, bool active_flag, uint8_t update_type, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testemm_build_emm_status( test_ue_t *test_ue, ogs_nas_emm_cause_t emm_cause); ogs_pkbuf_t *testemm_build_extended_service_request( - test_ue_t *test_ue, uint8_t type); + test_ue_t *test_ue, uint8_t type, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testemm_build_uplink_nas_transport(test_ue_t *test_ue); diff --git a/tests/common/esm-build.c b/tests/common/esm-build.c index 26ffb3951..a69987275 100644 --- a/tests/common/esm-build.c +++ b/tests/common/esm-build.c @@ -19,7 +19,8 @@ #include "test-common.h" -ogs_pkbuf_t *testesm_build_pdn_connectivity_request(test_sess_t *sess) +ogs_pkbuf_t *testesm_build_pdn_connectivity_request( + test_sess_t *sess, bool integrity_protected) { ogs_nas_eps_message_t message; ogs_nas_eps_pdn_connectivity_request_t *pdn_connectivity_request = @@ -53,8 +54,7 @@ ogs_pkbuf_t *testesm_build_pdn_connectivity_request(test_sess_t *sess) ogs_assert(test_ue); memset(&message, 0, sizeof(message)); - - if (sess->pdn_connectivity_param.integrity_protected) { + if (integrity_protected) { message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED; message.h.protocol_discriminator = OGS_NAS_PROTOCOL_DISCRIMINATOR_EMM; @@ -89,7 +89,7 @@ ogs_pkbuf_t *testesm_build_pdn_connectivity_request(test_sess_t *sess) memcpy(protocol_configuration_options->buffer, ue_pco, sizeof(ue_pco)); } - if (sess->pdn_connectivity_param.integrity_protected) + if (integrity_protected) return test_nas_eps_security_encode(test_ue, &message); else return ogs_nas_eps_plain_encode(&message); diff --git a/tests/common/esm-build.h b/tests/common/esm-build.h index eecd35946..518ecbbc9 100644 --- a/tests/common/esm-build.h +++ b/tests/common/esm-build.h @@ -24,7 +24,8 @@ extern "C" { #endif -ogs_pkbuf_t *testesm_build_pdn_connectivity_request(test_sess_t *sess); +ogs_pkbuf_t *testesm_build_pdn_connectivity_request( + test_sess_t *sess, bool integrity_protected); ogs_pkbuf_t *testesm_build_pdn_disconnect_request(test_sess_t *sess); ogs_pkbuf_t *testesm_build_esm_information_response(test_sess_t *sess); ogs_pkbuf_t *testesm_build_activate_default_eps_bearer_context_accept( diff --git a/tests/common/gmm-build.c b/tests/common/gmm-build.c index 261a3506f..aeff47f77 100644 --- a/tests/common/gmm-build.c +++ b/tests/common/gmm-build.c @@ -20,7 +20,8 @@ #include "test-common.h" ogs_pkbuf_t *testgmm_build_registration_request( - test_ue_t *test_ue, ogs_pkbuf_t *nasbuf) + test_ue_t *test_ue, ogs_pkbuf_t *nasbuf, + bool integrity_protected, bool ciphered) { int i; uint16_t psimask = 0; @@ -60,8 +61,8 @@ ogs_pkbuf_t *testgmm_build_registration_request( ogs_assert(test_ue); memset(&message, 0, sizeof(message)); - if (test_ue->registration_request_param.integrity_protected) { - if (test_ue->registration_request_param.ciphered) + if (integrity_protected) { + if (ciphered) message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; else @@ -216,7 +217,7 @@ ogs_pkbuf_t *testgmm_build_registration_request( ogs_pkbuf_free(nasbuf); } - if (test_ue->registration_request_param.integrity_protected) + if (integrity_protected) return test_nas_5gs_security_encode(test_ue, &message); else return ogs_nas_5gs_plain_encode(&message); @@ -245,7 +246,8 @@ ogs_pkbuf_t *testgmm_build_registration_complete(test_ue_t *test_ue) } ogs_pkbuf_t *testgmm_build_service_request( - test_ue_t *test_ue, uint8_t service_type, ogs_pkbuf_t *nasbuf) + test_ue_t *test_ue, uint8_t service_type, ogs_pkbuf_t *nasbuf, + bool integrity_protected, bool ciphered) { ogs_nas_5gs_message_t message; ogs_pkbuf_t *pkbuf = NULL; @@ -266,11 +268,11 @@ ogs_pkbuf_t *testgmm_build_service_request( uplink_data_status = &service_request->uplink_data_status; memset(&message, 0, sizeof(message)); - if (test_ue->service_request_param.integrity_protected) { + if (integrity_protected) { message.h.extended_protocol_discriminator = OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM; - if (test_ue->service_request_param.ciphered) + if (ciphered) message.h.security_header_type = OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; else @@ -364,14 +366,15 @@ ogs_pkbuf_t *testgmm_build_service_request( service_request_param.psimask.allowed_pdu_session_status >> 8; } - if (test_ue->service_request_param.integrity_protected) + if (integrity_protected) return test_nas_5gs_security_encode(test_ue, &message); else return ogs_nas_5gs_plain_encode(&message); } ogs_pkbuf_t *testgmm_build_de_registration_request( - test_ue_t *test_ue, bool switch_off) + test_ue_t *test_ue, bool switch_off, + bool integrity_protected, bool ciphered) { ogs_nas_5gs_message_t message; ogs_pkbuf_t *pkbuf = NULL; @@ -385,13 +388,18 @@ ogs_pkbuf_t *testgmm_build_de_registration_request( ogs_assert(test_ue); memset(&message, 0, sizeof(message)); - message.h.security_header_type = - OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; - message.h.extended_protocol_discriminator = - OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM; - + if (integrity_protected) { + if (ciphered) + message.h.security_header_type = + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_CIPHERED; + else + message.h.security_header_type = + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED; + message.h.extended_protocol_discriminator = + OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM; + } message.gmm.h.extended_protocol_discriminator = - OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM; + OGS_NAS_EXTENDED_PROTOCOL_DISCRIMINATOR_5GMM; message.gmm.h.message_type = OGS_NAS_5GS_DEREGISTRATION_REQUEST; de_registration_type->ksi = test_ue->nas.ksi; @@ -412,7 +420,10 @@ ogs_pkbuf_t *testgmm_build_de_registration_request( &test_ue->mobile_identity_suci; } - return test_nas_5gs_security_encode(test_ue, &message); + if (integrity_protected) + return test_nas_5gs_security_encode(test_ue, &message); + else + return ogs_nas_5gs_plain_encode(&message); } ogs_pkbuf_t *testgmm_build_identity_response(test_ue_t *test_ue) diff --git a/tests/common/gmm-build.h b/tests/common/gmm-build.h index 8f1da2263..8dd7f789c 100644 --- a/tests/common/gmm-build.h +++ b/tests/common/gmm-build.h @@ -25,14 +25,16 @@ extern "C" { #endif ogs_pkbuf_t *testgmm_build_registration_request( - test_ue_t *test_ue, ogs_pkbuf_t *nasbuf); + test_ue_t *test_ue, ogs_pkbuf_t *nasbuf, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testgmm_build_registration_complete(test_ue_t *test_ue); ogs_pkbuf_t *testgmm_build_service_request( - test_ue_t *test_ue, uint8_t service_type, ogs_pkbuf_t *nasbuf); - + test_ue_t *test_ue, uint8_t service_type, ogs_pkbuf_t *nasbuf, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testgmm_build_de_registration_request( - test_ue_t *test_ue, bool switch_off); + test_ue_t *test_ue, bool switch_off, + bool integrity_protected, bool ciphered); ogs_pkbuf_t *testgmm_build_identity_response(test_ue_t *test_ue); ogs_pkbuf_t *testgmm_build_authentication_response(test_ue_t *test_ue); diff --git a/tests/common/nas-security.c b/tests/common/nas-security.c index db779dfe1..b7c7b8eee 100644 --- a/tests/common/nas-security.c +++ b/tests/common/nas-security.c @@ -255,8 +255,7 @@ ogs_pkbuf_t *test_nas_eps_security_encode( /* encrypt NAS message */ ogs_nas_encrypt(test_ue->selected_enc_algorithm, test_ue->knas_enc, test_ue->ul_count, - test_ue->nas.access_type, - OGS_NAS_SECURITY_UPLINK_DIRECTION, new); + NAS_SECURITY_BEARER, OGS_NAS_SECURITY_UPLINK_DIRECTION, new); } /* encode sequence number */ @@ -348,7 +347,7 @@ int test_nas_eps_security_decode(test_ue_t *test_ue, /* decrypt NAS message */ ogs_nas_encrypt(test_ue->selected_enc_algorithm, test_ue->knas_enc, test_ue->dl_count.i32, - test_ue->nas.access_type, + NAS_SECURITY_BEARER, OGS_NAS_SECURITY_DOWNLINK_DIRECTION, pkbuf); } } diff --git a/tests/common/ngap-path.c b/tests/common/ngap-path.c index b55a8feda..96d0bfacf 100644 --- a/tests/common/ngap-path.c +++ b/tests/common/ngap-path.c @@ -192,7 +192,9 @@ void testngap_send_to_nas(test_ue_t *test_ue, NGAP_NAS_PDU_t *nasPdu) h = (ogs_nas_5gmm_header_t *)nasbuf->data; ogs_assert(h); - if (h->message_type == OGS_NAS_5GS_SECURITY_MODE_COMMAND) { + if (sh->security_header_type == + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_NEW_SECURITY_CONTEXT && + h->message_type == OGS_NAS_5GS_SECURITY_MODE_COMMAND) { ogs_nas_5gs_message_t message; int rv; diff --git a/tests/common/s1ap-path.c b/tests/common/s1ap-path.c index c85a34435..79e788f4d 100644 --- a/tests/common/s1ap-path.c +++ b/tests/common/s1ap-path.c @@ -195,7 +195,9 @@ void tests1ap_send_to_nas(test_ue_t *test_ue, S1AP_NAS_PDU_t *nasPdu) h = (ogs_nas_emm_header_t *)nasbuf->data; ogs_assert(h); - if (h->message_type == OGS_NAS_EPS_SECURITY_MODE_COMMAND) { + if (sh->security_header_type == + OGS_NAS_SECURITY_HEADER_INTEGRITY_PROTECTED_AND_NEW_SECURITY_CONTEXT && + h->message_type == OGS_NAS_EPS_SECURITY_MODE_COMMAND) { ogs_nas_eps_message_t message; int rv; diff --git a/tests/csfb/crash-test.c b/tests/csfb/crash-test.c index df79965f1..e949564b8 100644 --- a/tests/csfb/crash-test.c +++ b/tests/csfb/crash-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -249,12 +248,11 @@ static void test1_func(abts_case *tc, void *data) /* Send Extended Service Request */ memset(&test_ue->extended_service_request_param, 0, sizeof(test_ue->extended_service_request_param)); - test_ue->extended_service_request_param.ciphered = 1; test_ue->extended_service_request_param.csfb_response = 1; test_ue->extended_service_request_param.csfb.response = OGS_NAS_CS_FALLBACK_RESPONSE_ACCEPTED_BY_THE_UE; test_ue->extended_service_request_param.eps_bearer_context_status = 1; - emmbuf = testemm_build_extended_service_request(test_ue, 1); + emmbuf = testemm_build_extended_service_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -309,12 +307,11 @@ static void test1_func(abts_case *tc, void *data) /* Send Extended Service Request */ memset(&test_ue->extended_service_request_param, 0, sizeof(test_ue->extended_service_request_param)); - test_ue->extended_service_request_param.ciphered = 1; test_ue->extended_service_request_param.csfb_response = 1; test_ue->extended_service_request_param.csfb.response = OGS_NAS_CS_FALLBACK_RESPONSE_ACCEPTED_BY_THE_UE; test_ue->extended_service_request_param.eps_bearer_context_status = 1; - emmbuf = testemm_build_extended_service_request(test_ue, 1); + emmbuf = testemm_build_extended_service_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/csfb/mo-active-test.c b/tests/csfb/mo-active-test.c index 6d64478ed..cfed64868 100644 --- a/tests/csfb/mo-active-test.c +++ b/tests/csfb/mo-active-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -232,7 +231,7 @@ static void test1_func(abts_case *tc, void *data) /* Send Extended Service Request */ memset(&test_ue->extended_service_request_param, 0, sizeof(test_ue->extended_service_request_param)); - emmbuf = testemm_build_extended_service_request(test_ue, 0); + emmbuf = testemm_build_extended_service_request(test_ue, 0, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/csfb/mo-idle-test.c b/tests/csfb/mo-idle-test.c index 9afb6a895..67e926308 100644 --- a/tests/csfb/mo-idle-test.c +++ b/tests/csfb/mo-idle-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -268,7 +267,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send Detach Request */ - emmbuf = testemm_build_detach_request(test_ue, 1); + emmbuf = testemm_build_detach_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -391,12 +390,11 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -408,7 +406,7 @@ static void test2_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -592,12 +590,11 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -609,7 +606,7 @@ static void test3_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -741,7 +738,7 @@ static void test3_func(abts_case *tc, void *data) /* Send Extended Service Request */ memset(&test_ue->extended_service_request_param, 0, sizeof(test_ue->extended_service_request_param)); - emmbuf = testemm_build_extended_service_request(test_ue, 0); + emmbuf = testemm_build_extended_service_request(test_ue, 0, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -879,12 +876,11 @@ static void test4_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -896,7 +892,7 @@ static void test4_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/csfb/mo-sms-test.c b/tests/csfb/mo-sms-test.c index 9c7ce42eb..521743e25 100644 --- a/tests/csfb/mo-sms-test.c +++ b/tests/csfb/mo-sms-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/csfb/mt-active-test.c b/tests/csfb/mt-active-test.c index b259c289f..91f3cf42d 100644 --- a/tests/csfb/mt-active-test.c +++ b/tests/csfb/mt-active-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -243,7 +242,7 @@ static void test1_func(abts_case *tc, void *data) /* Send Extended Service Request */ memset(&test_ue->extended_service_request_param, 0, sizeof(test_ue->extended_service_request_param)); - emmbuf = testemm_build_extended_service_request(test_ue, 1); + emmbuf = testemm_build_extended_service_request(test_ue, 1, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/csfb/mt-idle-test.c b/tests/csfb/mt-idle-test.c index 761dd11e1..09ee9a8fb 100644 --- a/tests/csfb/mt-idle-test.c +++ b/tests/csfb/mt-idle-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -272,7 +271,7 @@ static void test1_func(abts_case *tc, void *data) /* Send Extended Service Request */ memset(&test_ue->extended_service_request_param, 0, sizeof(test_ue->extended_service_request_param)); - emmbuf = testemm_build_extended_service_request(test_ue, 1); + emmbuf = testemm_build_extended_service_request(test_ue, 1, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/csfb/mt-sms-test.c b/tests/csfb/mt-sms-test.c index 2e9c5b503..8a8dcb3a9 100644 --- a/tests/csfb/mt-sms-test.c +++ b/tests/csfb/mt-sms-test.c @@ -101,12 +101,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -118,7 +117,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/handover/5gc-n2-test.c b/tests/handover/5gc-n2-test.c index 6637b77f7..4b87e637b 100644 --- a/tests/handover/5gc-n2-test.c +++ b/tests/handover/5gc-n2-test.c @@ -115,7 +115,7 @@ static void failure_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -123,7 +123,7 @@ static void failure_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -517,7 +517,7 @@ static void direct_complete_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -525,7 +525,7 @@ static void direct_complete_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1135,7 +1135,7 @@ static void direct_cancel_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1143,7 +1143,7 @@ static void direct_cancel_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1553,7 +1553,7 @@ static void indirect_complete_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1561,7 +1561,7 @@ static void indirect_complete_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -2207,7 +2207,7 @@ static void indirect_cancel_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -2215,7 +2215,7 @@ static void indirect_cancel_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/handover/5gc-xn-test.c b/tests/handover/5gc-xn-test.c index ea6b10c6b..4a2a31404 100644 --- a/tests/handover/5gc-xn-test.c +++ b/tests/handover/5gc-xn-test.c @@ -115,7 +115,7 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -123,7 +123,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/handover/epc-s1-test.c b/tests/handover/epc-s1-test.c index a0ff90288..ed42461ef 100644 --- a/tests/handover/epc-s1-test.c +++ b/tests/handover/epc-s1-test.c @@ -118,12 +118,11 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -132,7 +131,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -365,8 +364,6 @@ static void test1_func(abts_case *tc, void *data) /* Send TAU Request */ memset(&test_ue->tau_request_param, 0, sizeof(test_ue->tau_request_param)); - test_ue->tau_request_param.integrity_protected = 1; - test_ue->tau_request_param.ciphered = 1; test_ue->tau_request_param.ue_network_capability = 1; test_ue->tau_request_param.last_visited_registered_tai = 1; test_ue->tau_request_param.drx_parameter = 1; @@ -376,7 +373,8 @@ static void test1_func(abts_case *tc, void *data) test_ue->tau_request_param.mobile_station_classmark_2 = 1; test_ue->tau_request_param.ue_usage_setting = 1; emmbuf = testemm_build_tau_request( - test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_COMBINED_TA_LA_UPDATING); + test_ue, true, OGS_NAS_EPS_UPDATE_TYPE_COMBINED_TA_LA_UPDATING, + true, true); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, emmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -690,12 +688,11 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -704,7 +701,7 @@ static void test2_func(abts_case *tc, void *data) test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1018,12 +1015,11 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -1032,7 +1028,7 @@ static void test3_func(abts_case *tc, void *data) test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/handover/epc-x2-test.c b/tests/handover/epc-x2-test.c index d517c810c..e3508a811 100644 --- a/tests/handover/epc-x2-test.c +++ b/tests/handover/epc-x2-test.c @@ -115,7 +115,7 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -125,7 +125,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/non3gpp/epdg-test.c b/tests/non3gpp/epdg-test.c index 698e87de6..3e479aaf9 100644 --- a/tests/non3gpp/epdg-test.c +++ b/tests/non3gpp/epdg-test.c @@ -448,7 +448,7 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_HANDOVER; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -458,7 +458,7 @@ static void test3_func(abts_case *tc, void *data) test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.additional_update_type = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -568,12 +568,11 @@ static void test3_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -669,12 +668,11 @@ static void test3_func(abts_case *tc, void *data) sess = test_sess_add_by_apn(test_ue, "wlan", OGS_GTP_RAT_TYPE_EUTRAN); ogs_assert(sess); - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_HANDOVER; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/registration/auth-test.c b/tests/registration/auth-test.c index 91057c8f3..3464de77c 100644 --- a/tests/registration/auth-test.c +++ b/tests/registration/auth-test.c @@ -93,7 +93,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -142,7 +142,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->ngap_procedure_code); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/registration/crash-test.c b/tests/registration/crash-test.c index 97731a1fb..4daba6f05 100644 --- a/tests/registration/crash-test.c +++ b/tests/registration/crash-test.c @@ -95,7 +95,7 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -103,7 +103,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -455,7 +455,7 @@ static void test2_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -463,7 +463,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -820,7 +820,7 @@ static void test3_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -828,7 +828,7 @@ static void test3_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/registration/dereg-test.c b/tests/registration/dereg-test.c index b174b0701..d1a550eb6 100644 --- a/tests/registration/dereg-test.c +++ b/tests/registration/dereg-test.c @@ -94,7 +94,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -102,7 +102,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -229,7 +229,7 @@ static void test1_func(abts_case *tc, void *data) ogs_pkbuf_free(recvbuf); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -339,7 +339,7 @@ static void test2_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -347,7 +347,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -438,7 +438,7 @@ static void test2_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -549,7 +549,7 @@ static void test3_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -557,7 +557,7 @@ static void test3_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -735,7 +735,7 @@ static void test3_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -757,21 +757,19 @@ static void test3_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send Registration request : Uplink Data Status */ - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.guti = 1; test_ue->registration_request_param.gmm_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; test_ue->registration_request_param.update_type = 1; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -886,7 +884,7 @@ static void test3_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, false); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1004,7 +1002,8 @@ static void test4_func(abts_case *tc, void *data) sizeof(test_ue->registration_request_param)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request( + test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1012,7 +1011,8 @@ static void test4_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request( + test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message( @@ -1179,7 +1179,7 @@ static void test4_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/registration/gmm-status-test.c b/tests/registration/gmm-status-test.c index a9a61c5c8..fa2ef9a79 100644 --- a/tests/registration/gmm-status-test.c +++ b/tests/registration/gmm-status-test.c @@ -94,7 +94,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -102,7 +102,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/registration/guti-test.c b/tests/registration/guti-test.c index 1559d0539..3761e52ce 100644 --- a/tests/registration/guti-test.c +++ b/tests/registration/guti-test.c @@ -95,7 +95,7 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -103,7 +103,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -268,18 +268,16 @@ static void test1_func(abts_case *tc, void *data) test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING; - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.uplink_data_status = 1; test_ue->registration_request_param.psimask.uplink_data_status = 1 << sess->psi; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -333,12 +331,11 @@ static void test1_func(abts_case *tc, void *data) OGS_NAS_5GS_REGISTRATION_TYPE_PERIODIC_UPDATING; /* Send Registration request without Registration complete */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.uplink_data_status = 0; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -575,7 +572,7 @@ static void test2_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -583,7 +580,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -748,18 +745,16 @@ static void test2_func(abts_case *tc, void *data) test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING; - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.uplink_data_status = 1; test_ue->registration_request_param.psimask.uplink_data_status = 1 << sess->psi; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -826,7 +821,7 @@ static void test2_func(abts_case *tc, void *data) OGS_NAS_5GS_REGISTRATION_TYPE_PERIODIC_UPDATING; /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1036,7 +1031,7 @@ static void test3_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1044,7 +1039,7 @@ static void test3_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1169,11 +1164,10 @@ static void test3_func(abts_case *tc, void *data) 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); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); diff --git a/tests/registration/identity-test.c b/tests/registration/identity-test.c index 46fb797ee..ae110bcba 100644 --- a/tests/registration/identity-test.c +++ b/tests/registration/identity-test.c @@ -94,7 +94,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -102,7 +102,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -213,17 +213,15 @@ static void test1_func(abts_case *tc, void *data) OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING; /* Send Registration request */ - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.guti = 1; test_ue->registration_request_param.uplink_data_status = 1; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -264,7 +262,7 @@ static void test1_func(abts_case *tc, void *data) ogs_msleep(100); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -290,7 +288,7 @@ static void test1_func(abts_case *tc, void *data) OGS_NAS_5GS_REGISTRATION_TYPE_PERIODIC_UPDATING; /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); diff --git a/tests/registration/idle-test.c b/tests/registration/idle-test.c index f8771713c..3a9a76ea5 100644 --- a/tests/registration/idle-test.c +++ b/tests/registration/idle-test.c @@ -94,7 +94,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -102,7 +102,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -255,17 +255,15 @@ static void test1_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; 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); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -330,19 +328,17 @@ static void test1_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -491,7 +487,7 @@ static void test2_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -499,7 +495,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -594,16 +590,14 @@ static void test2_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -739,7 +733,7 @@ static void test3_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -747,7 +741,7 @@ static void test3_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -879,20 +873,18 @@ static void test3_func(abts_case *tc, void *data) * - Uplink Data Status * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; 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_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -945,12 +937,10 @@ static void test3_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - 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, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); @@ -1100,7 +1090,7 @@ static void test4_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1108,7 +1098,7 @@ static void test4_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1216,16 +1206,14 @@ static void test4_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -1298,20 +1286,18 @@ static void test4_func(abts_case *tc, void *data) * - Uplink Data Status * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; 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_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1365,13 +1351,11 @@ static void test4_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - 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; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, true, true); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); @@ -1416,21 +1400,17 @@ 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.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); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); 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, nasbuf, true, true); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1448,7 +1428,7 @@ static void test4_func(abts_case *tc, void *data) } /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1562,7 +1542,7 @@ static void test5_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1570,7 +1550,7 @@ static void test5_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1720,16 +1700,14 @@ static void test5_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1926,7 +1904,7 @@ static void test6_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1934,7 +1912,7 @@ static void test6_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -2111,19 +2089,17 @@ static void test6_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); diff --git a/tests/registration/paging-test.c b/tests/registration/paging-test.c index a30e33371..70fc70cc4 100644 --- a/tests/registration/paging-test.c +++ b/tests/registration/paging-test.c @@ -94,7 +94,7 @@ static void cm_idle_paging_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -102,7 +102,7 @@ static void cm_idle_paging_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -269,17 +269,17 @@ static void cm_idle_paging_func(abts_case *tc, void *data) * - Type: Mobile terminated services(2) * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; 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_MOBILE_TERMINATED_SERVICES, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -394,18 +394,16 @@ static void cm_idle_paging_func(abts_case *tc, void *data) * - Type: Signalling * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -484,19 +482,17 @@ static void cm_idle_paging_func(abts_case *tc, void *data) * - Type: Data * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -660,7 +656,7 @@ static void cm_connected_paging_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -668,7 +664,7 @@ static void cm_connected_paging_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -822,20 +818,20 @@ static void cm_connected_paging_func(abts_case *tc, void *data) * - Uplink Data Status * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; 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_HIGH_PRIORITY_ACCESS, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_HIGH_PRIORITY_ACCESS, + NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_HIGH_PRIORITY_ACCESS, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_HIGH_PRIORITY_ACCESS, + nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1003,7 +999,7 @@ static void cm_idle_error_indication_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1011,7 +1007,7 @@ static void cm_idle_error_indication_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1178,16 +1174,16 @@ static void cm_idle_error_indication_func(abts_case *tc, void *data) * - Type: Mobile terminated services(2) * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1348,7 +1344,7 @@ static void cm_connected_error_indication_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1356,7 +1352,7 @@ static void cm_connected_error_indication_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1631,7 +1627,7 @@ static void vonr_qos_flow_test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1639,7 +1635,7 @@ static void vonr_qos_flow_test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1841,19 +1837,17 @@ static void vonr_qos_flow_test1_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1914,7 +1908,7 @@ static void vonr_qos_flow_test1_func(abts_case *tc, void *data) ogs_msleep(100); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2031,7 +2025,7 @@ static void vonr_session_test2_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -2039,7 +2033,7 @@ static void vonr_session_test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -2282,20 +2276,18 @@ static void vonr_session_test2_func(abts_case *tc, void *data) * Send Service request Using InitialUEMessage * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param. psimask.uplink_data_status = (1 << 5 | 1 << 6); test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -2519,7 +2511,7 @@ static void registration_ue_context_test4_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -2527,7 +2519,7 @@ static void registration_ue_context_test4_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, false); @@ -2678,17 +2670,15 @@ static void registration_ue_context_test4_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; 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); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -2733,19 +2723,17 @@ static void registration_ue_context_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.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -2913,7 +2901,7 @@ static void registration_idle_test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -2921,7 +2909,7 @@ static void registration_idle_test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -3074,17 +3062,15 @@ static void registration_idle_test1_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; 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); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -3168,19 +3154,17 @@ static void registration_idle_test1_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); diff --git a/tests/registration/reset-test.c b/tests/registration/reset-test.c index e768121c2..0770f93c7 100644 --- a/tests/registration/reset-test.c +++ b/tests/registration/reset-test.c @@ -98,7 +98,6 @@ static void test1_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; test_ue->service_request_param.psimask.pdu_session_status = 1 << 5; @@ -106,13 +105,12 @@ static void test1_func(abts_case *tc, void *data) test_ue->nas_5gs_guti.m_tmsi = 0x1234; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -140,7 +138,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -148,7 +146,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -406,7 +404,7 @@ static void test2_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -414,7 +412,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/registration/ue-context-test.c b/tests/registration/ue-context-test.c index 8476571be..9f7fd3efe 100644 --- a/tests/registration/ue-context-test.c +++ b/tests/registration/ue-context-test.c @@ -94,7 +94,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -102,7 +102,7 @@ static void test1_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -254,7 +254,7 @@ static void test2_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -262,7 +262,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -308,7 +308,7 @@ static void test2_func(abts_case *tc, void *data) /* Send Registration request */ memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -316,7 +316,7 @@ static void test2_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -553,7 +553,7 @@ static void test3_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -561,7 +561,7 @@ static void test3_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, false); @@ -691,18 +691,16 @@ static void test3_func(abts_case *tc, void *data) test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING; - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.uplink_data_status = 1; test_ue->registration_request_param.psimask.uplink_data_status = 1 << sess->psi; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -843,18 +841,16 @@ static void test3_func(abts_case *tc, void *data) test_ue->nas.registration.value = OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING; - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.uplink_data_status = 1; test_ue->registration_request_param.psimask.uplink_data_status = 1 << sess->psi; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -887,7 +883,7 @@ static void test3_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, 0x0000, test_ue->pdu_session_reactivation_result); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -999,7 +995,7 @@ static void test4_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1007,7 +1003,7 @@ static void test4_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, false); @@ -1158,17 +1154,15 @@ static void test4_func(abts_case *tc, void *data) * Service request * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; 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); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -1213,19 +1207,17 @@ 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.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, false); @@ -1375,7 +1367,7 @@ static void test5_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_capability = 1; @@ -1383,7 +1375,7 @@ static void test5_func(abts_case *tc, void *data) 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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, false); @@ -1562,21 +1554,19 @@ static void test5_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send Registration request */ - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.guti = 1; test_ue->registration_request_param.gmm_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.s1_ue_network_capability = 0; test_ue->registration_request_param.ue_usage_setting = 1; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/slice/nssai-test.c b/tests/slice/nssai-test.c index 144c45152..9620cbd16 100644 --- a/tests/slice/nssai-test.c +++ b/tests/slice/nssai-test.c @@ -93,7 +93,7 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -119,7 +119,7 @@ static void test1_func(abts_case *tc, void *data) testngap_recv(test_ue, recvbuf); /* Send Security mode complete */ - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf); ABTS_PTR_NOTNULL(tc, gmmbuf); @@ -246,7 +246,6 @@ static void test1_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send Registration request : Uplink Data Status */ - test_ue->registration_request_param.integrity_protected = 0; test_ue->registration_request_param.guti = 1; test_ue->registration_request_param.gmm_capability = 1; @@ -256,14 +255,13 @@ static void test1_func(abts_case *tc, void *data) test_ue->registration_request_param.last_visited_registered_tai = 1; test_ue->registration_request_param.ue_usage_setting = 1; test_ue->registration_request_param.update_type = 1; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); - test_ue->registration_request_param.integrity_protected = 1; test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, nasbuf); + gmmbuf = testgmm_build_registration_request(test_ue, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -398,7 +396,7 @@ static void test2_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, test_db_insert_ue(test_ue, doc)); /* Send Registration request */ - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -449,7 +447,7 @@ static void test2_func(abts_case *tc, void *data) mapped_hplmn_sd.v = OGS_S_NSSAI_NO_SD_VALUE; test_ue->requested_nssai.num_of_s_nssai++; - nasbuf = testgmm_build_registration_request(test_ue, NULL); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); gmmbuf = testgmm_build_security_mode_complete(test_ue, nasbuf); ABTS_PTR_NOTNULL(tc, gmmbuf); diff --git a/tests/volte/bearer-test.c b/tests/volte/bearer-test.c index 34df4c5a8..d67bb31aa 100644 --- a/tests/volte/bearer-test.c +++ b/tests/volte/bearer-test.c @@ -98,7 +98,7 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -108,7 +108,7 @@ static void test1_func(abts_case *tc, void *data) test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, false, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); diff --git a/tests/volte/cx-test.c b/tests/volte/cx-test.c index 3a149db9b..67f6c871f 100644 --- a/tests/volte/cx-test.c +++ b/tests/volte/cx-test.c @@ -109,18 +109,17 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -223,12 +222,11 @@ static void test1_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/volte/rx-test.c b/tests/volte/rx-test.c index b5a097b6e..bcabbdc71 100644 --- a/tests/volte/rx-test.c +++ b/tests/volte/rx-test.c @@ -104,18 +104,17 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -218,12 +217,11 @@ static void test1_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -492,7 +490,7 @@ static void test1_func(abts_case *tc, void *data) test_bearer_remove(bearer); /* Send Detach Request */ - emmbuf = testemm_build_detach_request(test_ue, 1); + emmbuf = testemm_build_detach_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -621,18 +619,17 @@ static void test2_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -726,12 +723,11 @@ static void test2_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -974,18 +970,17 @@ static void test3_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1088,12 +1083,11 @@ static void test3_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 37; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1174,12 +1168,11 @@ static void test3_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 39; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1222,7 +1215,7 @@ static void test3_func(abts_case *tc, void *data) ogs_pkbuf_free(recvbuf); /* Send Detach Request */ - emmbuf = testemm_build_detach_request(test_ue, 1); + emmbuf = testemm_build_detach_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -1354,18 +1347,17 @@ static void test4_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1468,12 +1460,11 @@ static void test4_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 7; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1552,12 +1543,11 @@ static void test4_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 9; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1693,12 +1683,11 @@ static void test4_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.guti = 1; test_ue->attach_request_param.last_visited_registered_tai = 1; test_ue->attach_request_param.drx_parameter = 1; @@ -1710,7 +1699,7 @@ static void test4_func(abts_case *tc, void *data) test_ue->attach_request_param.ue_usage_setting = 1; test_ue->attach_request_param.old_guti_type = 1; test_ue->attach_request_param.ms_network_feature_support = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -1887,18 +1876,17 @@ static void test5_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -2001,12 +1989,11 @@ static void test5_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 7; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2395,18 +2382,17 @@ static void test6_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -2509,12 +2495,11 @@ static void test6_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2689,7 +2674,7 @@ static void test6_func(abts_case *tc, void *data) test_bearer_remove(bearer); /* Send Detach Request */ - emmbuf = testemm_build_detach_request(test_ue, 1); + emmbuf = testemm_build_detach_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); @@ -2822,18 +2807,17 @@ static void test7_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -2936,12 +2920,11 @@ static void test7_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -3096,7 +3079,7 @@ static void test7_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send Detach Request */ - emmbuf = testemm_build_detach_request(test_ue, 1); + emmbuf = testemm_build_detach_request(test_ue, 1, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); sendbuf = test_s1ap_build_initial_ue_message( test_ue, emmbuf, S1AP_RRC_Establishment_Cause_mo_Signalling, true); diff --git a/tests/volte/session-test.c b/tests/volte/session-test.c index 4dd1f86d4..f81f2bd62 100644 --- a/tests/volte/session-test.c +++ b/tests/volte/session-test.c @@ -98,18 +98,17 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -203,12 +202,11 @@ static void test1_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -320,12 +318,11 @@ static void test1_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 9; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/volte/video-test.c b/tests/volte/video-test.c index 67abe5c3a..c3a6ec696 100644 --- a/tests/volte/video-test.c +++ b/tests/volte/video-test.c @@ -102,18 +102,17 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.eit = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, false); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, 0, sizeof(test_ue->attach_request_param)); - test_ue->attach_request_param.integrity_protected = 1; test_ue->attach_request_param.drx_parameter = 1; test_ue->attach_request_param.ms_network_capability = 1; test_ue->attach_request_param.tmsi_status = 1; test_ue->attach_request_param.mobile_station_classmark_2 = 1; test_ue->attach_request_param.ue_usage_setting = 1; - emmbuf = testemm_build_attach_request(test_ue, esmbuf); + emmbuf = testemm_build_attach_request(test_ue, esmbuf, true, false); ABTS_PTR_NOTNULL(tc, emmbuf); memset(&test_ue->initial_ue_param, 0, sizeof(test_ue->initial_ue_param)); @@ -216,12 +215,11 @@ static void test1_func(abts_case *tc, void *data) ogs_assert(sess); sess->pti = 5; - sess->pdn_connectivity_param.integrity_protected = 1; sess->pdn_connectivity_param.apn = 1; sess->pdn_connectivity_param.pco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess); + esmbuf = testesm_build_pdn_connectivity_request(sess, true); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/vonr/af-test.c b/tests/vonr/af-test.c index b48333631..35ec3c9f3 100644 --- a/tests/vonr/af-test.c +++ b/tests/vonr/af-test.c @@ -104,14 +104,14 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -666,7 +666,7 @@ static void test1_func(abts_case *tc, void *data) test_bearer_remove(qos_flow); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -786,14 +786,14 @@ static void test2_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1260,14 +1260,14 @@ static void test3_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1594,7 +1594,7 @@ static void test3_func(abts_case *tc, void *data) ogs_msleep(100); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1714,14 +1714,14 @@ static void test4_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -2103,14 +2103,14 @@ static void test4_func(abts_case *tc, void *data) memset(&test_ue->registration_request_param, 0, sizeof(test_ue->registration_request_param)); test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -2219,7 +2219,7 @@ static void test4_func(abts_case *tc, void *data) /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2339,14 +2339,14 @@ static void test5_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -2588,18 +2588,18 @@ static void test5_func(abts_case *tc, void *data) * - Type: Mobile terminated services(2) * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; test_ue->service_request_param. psimask.pdu_session_status = (1 << 5 | 1 << 6); nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -2719,18 +2719,18 @@ static void test5_func(abts_case *tc, void *data) * - Type: Mobile terminated services(2) * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; test_ue->service_request_param. psimask.pdu_session_status = (1 << 5 | 1 << 6); nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -2845,18 +2845,18 @@ static void test5_func(abts_case *tc, void *data) * - Type: Mobile terminated services(2) * - PDU Session Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.pdu_session_status = 1; test_ue->service_request_param. psimask.pdu_session_status = (1 << 5 | 1 << 6); nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES, + nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -2935,7 +2935,7 @@ static void test5_func(abts_case *tc, void *data) ABTS_INT_EQUAL(tc, OGS_OK, rv); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -3055,14 +3055,14 @@ static void test6_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -3472,7 +3472,7 @@ static void test6_func(abts_case *tc, void *data) test_bearer_remove(qos_flow); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -3592,14 +3592,14 @@ static void test7_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -3930,7 +3930,7 @@ static void test7_func(abts_case *tc, void *data) ogs_msleep(100); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/vonr/qos-flow-test.c b/tests/vonr/qos-flow-test.c index e92051898..2946b7002 100644 --- a/tests/vonr/qos-flow-test.c +++ b/tests/vonr/qos-flow-test.c @@ -100,14 +100,14 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -326,19 +326,17 @@ static void test1_func(abts_case *tc, void *data) * Service request * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -380,7 +378,7 @@ static void test1_func(abts_case *tc, void *data) ogs_pkbuf_free(recvbuf); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); diff --git a/tests/vonr/session-test.c b/tests/vonr/session-test.c index 15e67131c..e280086a9 100644 --- a/tests/vonr/session-test.c +++ b/tests/vonr/session-test.c @@ -100,14 +100,14 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -355,20 +355,18 @@ static void test1_func(abts_case *tc, void *data) * Send Service request Using InitialUEMessage * - Uplink Data Status */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param. psimask.uplink_data_status = (1 << 5 | 1 << 6); test_ue->service_request_param.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -578,14 +576,14 @@ static void test2_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -838,20 +836,18 @@ static void test2_func(abts_case *tc, void *data) * Not PDU SESSION INACTIVE * uplink data are pending */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 1; test_ue->service_request_param.psimask.uplink_data_status = 1 << sess->psi; 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_DATA, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_DATA, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1012,14 +1008,14 @@ static void test3_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1270,19 +1266,17 @@ static void test3_func(abts_case *tc, void *data) * - PSI(6) * Not PDU SESSION INACTIVE */ - test_ue->service_request_param.integrity_protected = 0; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 1; test_ue->service_request_param.psimask.pdu_session_status = 0; nasbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); - test_ue->service_request_param.integrity_protected = 1; test_ue->service_request_param.uplink_data_status = 0; test_ue->service_request_param.pdu_session_status = 0; gmmbuf = testgmm_build_service_request( - test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf); + test_ue, OGS_NAS_SERVICE_TYPE_SIGNALLING, nasbuf, true, false); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, true, true); @@ -1432,14 +1426,14 @@ static void test4_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1779,14 +1773,14 @@ static void test5_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -1935,7 +1929,7 @@ static void test5_func(abts_case *tc, void *data) testngap_recv(test_ue, recvbuf); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2052,14 +2046,14 @@ static void test6_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); diff --git a/tests/vonr/video-test.c b/tests/vonr/video-test.c index 6f5b2869f..70b183418 100644 --- a/tests/vonr/video-test.c +++ b/tests/vonr/video-test.c @@ -104,14 +104,14 @@ static void test1_func(abts_case *tc, void *data) /* Send Registration request */ test_ue->registration_request_param.guti = 1; - gmmbuf = testgmm_build_registration_request(test_ue, NULL); + gmmbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, gmmbuf); test_ue->registration_request_param.gmm_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); + nasbuf = testgmm_build_registration_request(test_ue, NULL, false, false); ABTS_PTR_NOTNULL(tc, nasbuf); sendbuf = testngap_build_initial_ue_message(test_ue, gmmbuf, false, true); @@ -515,7 +515,7 @@ static void test1_func(abts_case *tc, void *data) test_bearer_remove(qos_flow); /* Send De-registration request */ - gmmbuf = testgmm_build_de_registration_request(test_ue, 1); + gmmbuf = testgmm_build_de_registration_request(test_ue, 1, true, true); ABTS_PTR_NOTNULL(tc, gmmbuf); sendbuf = testngap_build_uplink_nas_transport(test_ue, gmmbuf); ABTS_PTR_NOTNULL(tc, sendbuf);