From 4599b273fa7ebed0296da2b70a7c6b8f5aacd227 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sat, 18 May 2024 13:50:57 +0900 Subject: [PATCH] [MME] Problem keep changing PDN-Type (#3209) If the UE continuously attempts to Attach while changing PDN Type, it will cause the wrong IP to be assigned. (e.g PDU-Type : IPv4v6 -> IPv4 -> IPv4v6) This is because we use two variables at the same time, one to read and store the Static IP from the Subscriber DB and one to store the IP assigned from SMF, called session->paa. When the UE attaches with PDN-Type set to IPv4v6, MME saves the allocated IP in session->paa. However, MME thinks it has been assigned a static IP based on the information in session->paa, so changing the PDN-Type may result in the wrong IP being assigned. To solve this problem, I separated the variable(session->paa) that stores the allocated IP received from SMF and the variable(session->ue_ip) that stores the Static IP read from the Subscriber DB. Therefore, the information read from the Subscriber DB (session->session_type and session->ue_ip) should not be modified. --- lib/proto/types.h | 5 --- src/mme/esm-handler.c | 3 +- src/mme/mme-fd-path.c | 21 +++++-------- src/mme/mme-s11-build.c | 41 ++++++++++++------------ src/mme/mme-s11-handler.c | 32 +++++++++---------- src/mme/mme-s6a-handler.c | 4 +-- src/sgwc/s5c-handler.c | 14 +-------- tests/310014/epc-test.c | 3 +- tests/attach/auth-test.c | 15 ++++++--- tests/attach/crash-test.c | 3 +- tests/attach/emm-status-test.c | 3 +- tests/attach/guti-test.c | 30 ++++++++++++------ tests/attach/idle-test.c | 9 ++++-- tests/attach/issues-test.c | 33 +++++++++++++------- tests/attach/reset-test.c | 9 ++++-- tests/attach/simple-test.c | 3 +- tests/attach/ue-context-test.c | 15 ++++++--- tests/common/context.c | 5 +++ tests/common/esm-build.c | 4 +-- tests/common/esm-build.h | 2 +- tests/csfb/crash-test.c | 3 +- tests/csfb/mo-active-test.c | 3 +- tests/csfb/mo-idle-test.c | 15 ++++++--- tests/csfb/mo-sms-test.c | 3 +- tests/csfb/mt-active-test.c | 3 +- tests/csfb/mt-idle-test.c | 3 +- tests/csfb/mt-sms-test.c | 3 +- tests/handover/epc-s1-test.c | 9 ++++-- tests/handover/epc-x2-test.c | 6 ++-- tests/non3gpp/epdg-test.c | 9 ++++-- tests/volte/bearer-test.c | 6 ++-- tests/volte/cx-test.c | 6 ++-- tests/volte/rx-test.c | 57 ++++++++++++++++++++++------------ tests/volte/session-test.c | 9 ++++-- tests/volte/simple-test.c | 6 ++-- tests/volte/video-test.c | 6 ++-- 36 files changed, 234 insertions(+), 167 deletions(-) diff --git a/lib/proto/types.h b/lib/proto/types.h index 1c186d7f2..380748853 100644 --- a/lib/proto/types.h +++ b/lib/proto/types.h @@ -379,11 +379,6 @@ ED2(uint8_t spare:4;, typedef struct ogs_paa_s { ED2(uint8_t spare:5;, /* 8.34 PDN Type */ -#define OGS_PDU_SESSION_TYPE_IS_VALID(x) \ - ((x) == OGS_PDU_SESSION_TYPE_IPV4 || \ - (x) == OGS_PDU_SESSION_TYPE_IPV6 || \ - (x) == OGS_PDU_SESSION_TYPE_IPV4V6) \ - uint8_t session_type:3;) union { /* PDU_SESSION_TYPE_IPV4 */ diff --git a/src/mme/esm-handler.c b/src/mme/esm-handler.c index 752f760c8..100b33ec5 100644 --- a/src/mme/esm-handler.c +++ b/src/mme/esm-handler.c @@ -231,8 +231,7 @@ int esm_handle_information_response(mme_sess_t *sess, ogs_assert_if_reached(); } - if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue) && - OGS_PDU_SESSION_TYPE_IS_VALID(sess->session->paa.session_type)) { + if (SESSION_CONTEXT_IS_AVAILABLE(mme_ue)) { mme_csmap_t *csmap = mme_csmap_find_by_tai(&mme_ue->tai); mme_ue->csmap = csmap; diff --git a/src/mme/mme-fd-path.c b/src/mme/mme-fd-path.c index ba9fb0c0d..394621a4e 100644 --- a/src/mme/mme-fd-path.c +++ b/src/mme/mme-fd-path.c @@ -379,34 +379,27 @@ static int mme_s6a_subscription_data_from_avp(struct avp *avp, ogs_assert(ret == 0); if (addr.ogs_sa_family == AF_INET) { + session->ue_ip.addr = addr.sin.sin_addr.s_addr; if (session->session_type == OGS_PDU_SESSION_TYPE_IPV4) { - session->paa.addr = - addr.sin.sin_addr.s_addr; } else if (session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) { - session->paa.both.addr = - addr.sin.sin_addr.s_addr; } else { ogs_error("Warning: Received a static IPv4 " - "address but PDN-Type does not include " - "IPv4. Ignoring..."); + "address but PDN-Type[%d] does not include " + "IPv4. Ignoring...", session->session_type); } } else if (addr.ogs_sa_family == AF_INET6) { + memcpy(session->ue_ip.addr6, + addr.sin6.sin6_addr.s6_addr, OGS_IPV6_LEN); if (session->session_type == OGS_PDU_SESSION_TYPE_IPV6) { - memcpy(session->paa.addr6, - addr.sin6.sin6_addr.s6_addr, - OGS_IPV6_LEN); } else if (session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) { - memcpy(session->paa.both.addr6, - addr.sin6.sin6_addr.s6_addr, - OGS_IPV6_LEN); } else { ogs_error("Warning: Received a static IPv6 " - "address but PDN-Type does not include " - "IPv6. Ignoring..."); + "address but PDN-Type[%d] does not include " + "IPv6. Ignoring...", session->session_type); } } else { ogs_error("Invalid family[%d]", diff --git a/src/mme/mme-s11-build.c b/src/mme/mme-s11-build.c index 2101130ad..9b5b29fdf 100644 --- a/src/mme/mme-s11-build.c +++ b/src/mme/mme-s11-build.c @@ -171,10 +171,14 @@ ogs_pkbuf_t *mme_s11_build_create_session_request( req->selection_mode.u8 = OGS_GTP2_SELECTION_MODE_MS_OR_NETWORK_PROVIDED_APN; + ogs_debug("sess->request_type.type = %d", sess->request_type.type); + ogs_assert(sess->request_type.type == OGS_NAS_EPS_PDN_TYPE_IPV4 || sess->request_type.type == OGS_NAS_EPS_PDN_TYPE_IPV6 || sess->request_type.type == OGS_NAS_EPS_PDN_TYPE_IPV4V6); + ogs_debug("session->session_type = %d", session->session_type); + if (session->session_type == OGS_PDU_SESSION_TYPE_IPV4 || session->session_type == OGS_PDU_SESSION_TYPE_IPV6 || session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) { @@ -185,25 +189,12 @@ ogs_pkbuf_t *mme_s11_build_create_session_request( ogs_assert_if_reached(); } } else { - ogs_fatal("Invalid PDN_TYPE[%d]", session->session_type); - ogs_assert_if_reached(); + ogs_error("Invalid PDN-TYPE[%d]", session->session_type); + return NULL; } req->pdn_type.presence = 1; - /* If we started with both addrs (IPV4V6) but the above code - * (pdn_type & sess->request_type) truncates us down to just one, - * we need to change position of addresses in struct. */ - if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV4 && - session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) { - uint32_t addr = session->paa.both.addr; - session->paa.addr = addr; - } - if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV6 && - session->session_type == OGS_PDU_SESSION_TYPE_IPV4V6) { - uint8_t addr[16]; - memcpy(&addr, session->paa.both.addr6, OGS_IPV6_LEN); - memcpy(session->paa.addr6, &addr, OGS_IPV6_LEN); - } + ogs_debug("req->pdn_type.u8 = %d", req->pdn_type.u8); memset(&indication, 0, sizeof(ogs_gtp2_indication_t)); req->indication_flags.presence = 1; @@ -224,15 +215,23 @@ ogs_pkbuf_t *mme_s11_build_create_session_request( indication.operation_indication = 1; session->paa.session_type = req->pdn_type.u8; + ogs_debug("session->paa.session_type = %d", session->paa.session_type); req->pdn_address_allocation.data = &session->paa; - if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV4) + if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV4) { req->pdn_address_allocation.len = OGS_PAA_IPV4_LEN; - else if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV6) + session->paa.addr = session->ue_ip.addr; + } else if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV6) { req->pdn_address_allocation.len = OGS_PAA_IPV6_LEN; - else if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV4V6) + memcpy(session->paa.addr6, session->ue_ip.addr6, OGS_IPV6_LEN); + } else if (req->pdn_type.u8 == OGS_PDU_SESSION_TYPE_IPV4V6) { req->pdn_address_allocation.len = OGS_PAA_IPV4V6_LEN; - else - ogs_assert_if_reached(); + session->paa.both.addr = session->ue_ip.addr; + memcpy(session->paa.both.addr6, session->ue_ip.addr6, OGS_IPV6_LEN); + } else { + ogs_error("Invalid PDN-TYPE[%d:%d:%d]", req->pdn_type.u8, + session->session_type, sess->request_type.type); + return NULL; + } req->pdn_address_allocation.presence = 1; req->maximum_apn_restriction.presence = 1; diff --git a/src/mme/mme-s11-handler.c b/src/mme/mme-s11-handler.c index 16d94bcca..547915c0a 100644 --- a/src/mme/mme-s11-handler.c +++ b/src/mme/mme-s11-handler.c @@ -195,18 +195,7 @@ void mme_s11_handle_create_session_response( cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING; } - if (rsp->pdn_address_allocation.presence) { - ogs_paa_t paa; - - memcpy(&paa, rsp->pdn_address_allocation.data, - rsp->pdn_address_allocation.len); - - if (!OGS_PDU_SESSION_TYPE_IS_VALID(paa.session_type)) { - ogs_error("[%s] Unknown PDN Type [Session:%u, Cause:%d]", - mme_ue->imsi_bcd, paa.session_type, session_cause); - cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT; - } - } else { + if (rsp->pdn_address_allocation.presence == 0) { ogs_error("[%s] No PDN Address Allocation [Cause:%d]", mme_ue->imsi_bcd, session_cause); cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING; @@ -380,9 +369,23 @@ void mme_s11_handle_create_session_response( if (rsp->pdn_address_allocation.presence) { memcpy(&session->paa, rsp->pdn_address_allocation.data, rsp->pdn_address_allocation.len); + /* + * Issue #3209 + * + * The Session-Type in the Subscriber DB should not be changed + * in case the UE can change the PDN-Type for the APN. + * (e.g IPv4v6 -> IPv4 -> IPv4v6) + * + * For resolving this problem, + * session->session_type and session->ue_ip should not be modified. + * + * Therefore, the code below will be deleted. + */ +#if 0 /* WILL BE DELETED */ session->session_type = session->paa.session_type; ogs_assert(OGS_OK == ogs_paa_to_ip(&session->paa, &session->ue_ip)); +#endif } /* ePCO */ @@ -426,14 +429,10 @@ void mme_s11_handle_create_session_response( OGS_NETWORK_ACCESS_MODE_ONLY_PACKET || mme_ue->nas_eps.attach.value == OGS_NAS_ATTACH_TYPE_EPS_ATTACH) { - ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID( - session->paa.session_type)); r = nas_eps_send_attach_accept(mme_ue); ogs_expect(r == OGS_OK); ogs_assert(r != OGS_ERROR); } else { - ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID( - session->paa.session_type)); ogs_assert(OGS_OK == sgsap_send_location_update_request(mme_ue)); } @@ -441,7 +440,6 @@ void mme_s11_handle_create_session_response( /* 3GPP TS 23.401 D.3.6 step 13, 14: */ mme_s6a_send_ulr(mme_ue->enb_ue, mme_ue); } else if (create_action == OGS_GTP_CREATE_IN_UPLINK_NAS_TRANSPORT) { - ogs_assert(OGS_PDU_SESSION_TYPE_IS_VALID(session->paa.session_type)); r = nas_eps_send_activate_default_bearer_context_request( bearer, create_action); ogs_expect(r == OGS_OK); diff --git a/src/mme/mme-s6a-handler.c b/src/mme/mme-s6a-handler.c index 069900418..ffc9a9958 100644 --- a/src/mme/mme-s6a-handler.c +++ b/src/mme/mme-s6a-handler.c @@ -355,8 +355,8 @@ static uint8_t mme_ue_session_from_slice_data(mme_ue_t *mme_ue, ogs_free(mme_ue->session[i].name); break; } - memcpy(&mme_ue->session[i].paa, &slice_data->session[i].paa, - sizeof(mme_ue->session[i].paa)); + memcpy(&mme_ue->session[i].ue_ip, &slice_data->session[i].ue_ip, + sizeof(mme_ue->session[i].ue_ip)); memcpy(&mme_ue->session[i].qos, &slice_data->session[i].qos, sizeof(mme_ue->session[i].qos)); diff --git a/src/sgwc/s5c-handler.c b/src/sgwc/s5c-handler.c index 377a7d5e2..23f77d985 100644 --- a/src/sgwc/s5c-handler.c +++ b/src/sgwc/s5c-handler.c @@ -137,19 +137,7 @@ void sgwc_s5c_handle_create_session_response( ogs_error("No GTP TEID [Cause:%d]", session_cause); cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING; } - if (rsp->pdn_address_allocation.presence) { - ogs_paa_t paa; - - memcpy(&paa, rsp->pdn_address_allocation.data, - ogs_min(sizeof(paa), rsp->pdn_address_allocation.len)); - - if (!OGS_PDU_SESSION_TYPE_IS_VALID(paa.session_type)) { - ogs_error("Unknown PDN Type %u, Cause:%d", - paa.session_type, session_cause); - cause_value = OGS_GTP2_CAUSE_MANDATORY_IE_INCORRECT; - } - - } else { + if (rsp->pdn_address_allocation.presence == 0) { ogs_error("No PDN Address Allocation [Cause:%d]", session_cause); cause_value = OGS_GTP2_CAUSE_CONDITIONAL_IE_MISSING; } diff --git a/tests/310014/epc-test.c b/tests/310014/epc-test.c index 18db2c524..1789e36aa 100644 --- a/tests/310014/epc-test.c +++ b/tests/310014/epc-test.c @@ -95,7 +95,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); test_ue->attach_request_param.ms_network_feature_support = 1; diff --git a/tests/attach/auth-test.c b/tests/attach/auth-test.c index abbc9ca31..622750b46 100644 --- a/tests/attach/auth-test.c +++ b/tests/attach/auth-test.c @@ -97,7 +97,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -202,7 +203,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -277,7 +279,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -352,7 +355,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -445,7 +449,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/attach/crash-test.c b/tests/attach/crash-test.c index a6654657b..f51f9cc57 100644 --- a/tests/attach/crash-test.c +++ b/tests/attach/crash-test.c @@ -180,7 +180,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/attach/emm-status-test.c b/tests/attach/emm-status-test.c index 51b6b80e0..2d95ebbbd 100644 --- a/tests/attach/emm-status-test.c +++ b/tests/attach/emm-status-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/attach/guti-test.c b/tests/attach/guti-test.c index 00cd87561..1b4aeb685 100644 --- a/tests/attach/guti-test.c +++ b/tests/attach/guti-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -233,7 +234,8 @@ static void test1_func(abts_case *tc, void *data) sess->pdn_connectivity_param.epco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -374,7 +376,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -522,7 +525,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -627,7 +631,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -764,7 +769,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -959,7 +965,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1309,7 +1316,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1392,7 +1400,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1522,7 +1531,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/attach/idle-test.c b/tests/attach/idle-test.c index e56566201..b54835f6d 100644 --- a/tests/attach/idle-test.c +++ b/tests/attach/idle-test.c @@ -97,7 +97,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -426,7 +427,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -711,7 +713,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/attach/issues-test.c b/tests/attach/issues-test.c index 316737a17..f8f4943b3 100644 --- a/tests/attach/issues-test.c +++ b/tests/attach/issues-test.c @@ -99,7 +99,8 @@ static void issues_1431_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -215,7 +216,8 @@ static void issues_1431_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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -245,7 +247,8 @@ static void issues_1431_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -648,7 +651,8 @@ static void issues_2287_v263_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[0]->attach_request_param, @@ -786,7 +790,8 @@ static void issues_2287_v263_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[1]->attach_request_param, @@ -928,7 +933,8 @@ static void issues_2287_v263_func(abts_case *tc, void *data) sess->pdn_connectivity_param.epco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[0]->attach_request_param, @@ -994,7 +1000,8 @@ static void issues_2287_v263_func(abts_case *tc, void *data) sess->pdn_connectivity_param.epco = 1; sess->pdn_connectivity_param.request_type = OGS_NAS_EPS_REQUEST_TYPE_INITIAL; - esmbuf = testesm_build_pdn_connectivity_request(sess, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[1]->attach_request_param, @@ -1080,7 +1087,8 @@ static void issues_2287_v263_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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue[1], esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1450,7 +1458,8 @@ static void issues_2287_v264_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[1]->attach_request_param, @@ -1588,7 +1597,8 @@ static void issues_2287_v264_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[0]->attach_request_param, @@ -1724,7 +1734,8 @@ static void issues_2287_v264_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[1]->attach_request_param, diff --git a/tests/attach/reset-test.c b/tests/attach/reset-test.c index 044e32982..3b8e3a97a 100644 --- a/tests/attach/reset-test.c +++ b/tests/attach/reset-test.c @@ -121,7 +121,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -369,7 +370,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[i]->attach_request_param, @@ -605,7 +607,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue[i]->attach_request_param, diff --git a/tests/attach/simple-test.c b/tests/attach/simple-test.c index 655fab113..355f3a04a 100644 --- a/tests/attach/simple-test.c +++ b/tests/attach/simple-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/attach/ue-context-test.c b/tests/attach/ue-context-test.c index 5826b0685..688d1344d 100644 --- a/tests/attach/ue-context-test.c +++ b/tests/attach/ue-context-test.c @@ -93,7 +93,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -257,7 +258,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -340,7 +342,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -556,7 +559,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -639,7 +643,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/common/context.c b/tests/common/context.c index afe083899..cf1a9cbc6 100644 --- a/tests/common/context.c +++ b/tests/common/context.c @@ -1551,6 +1551,11 @@ bson_t *test_db_new_simple(test_ue_t *test_ue) "unit", BCON_INT32(3), "}", "}", +#if 0 /* For static-IP test */ + "ue", "{", "ipv4", "1.1.1.1", "ipv6", "::1", "}", + "ue", "{", "ipv4", "1.1.1.1", "}", + "ue", "{", "ipv6", "::1", "}", +#endif "qos", "{", "index", BCON_INT32(9), "arp", "{", diff --git a/tests/common/esm-build.c b/tests/common/esm-build.c index e8ec4f760..0da34ac9b 100644 --- a/tests/common/esm-build.c +++ b/tests/common/esm-build.c @@ -20,7 +20,7 @@ #include "test-common.h" ogs_pkbuf_t *testesm_build_pdn_connectivity_request( - test_sess_t *sess, bool integrity_protected) + test_sess_t *sess, bool integrity_protected, uint8_t pdn_type) { ogs_nas_eps_message_t message; ogs_nas_eps_pdn_connectivity_request_t *pdn_connectivity_request = @@ -72,7 +72,7 @@ ogs_pkbuf_t *testesm_build_pdn_connectivity_request( message.esm.h.message_type = OGS_NAS_EPS_PDN_CONNECTIVITY_REQUEST; - request_type->type = OGS_NAS_EPS_PDN_TYPE_IPV4V6; + request_type->type = pdn_type; request_type->value = sess->pdn_connectivity_param.request_type; ogs_assert(request_type->value); diff --git a/tests/common/esm-build.h b/tests/common/esm-build.h index 518ecbbc9..d7a00ba14 100644 --- a/tests/common/esm-build.h +++ b/tests/common/esm-build.h @@ -25,7 +25,7 @@ extern "C" { #endif ogs_pkbuf_t *testesm_build_pdn_connectivity_request( - test_sess_t *sess, bool integrity_protected); + test_sess_t *sess, bool integrity_protected, uint8_t pdn_type); 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/csfb/crash-test.c b/tests/csfb/crash-test.c index c7649f69e..7399f11ac 100644 --- a/tests/csfb/crash-test.c +++ b/tests/csfb/crash-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/csfb/mo-active-test.c b/tests/csfb/mo-active-test.c index 98d4947aa..4955ab2ed 100644 --- a/tests/csfb/mo-active-test.c +++ b/tests/csfb/mo-active-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/csfb/mo-idle-test.c b/tests/csfb/mo-idle-test.c index dadc7d9eb..cbd02b959 100644 --- a/tests/csfb/mo-idle-test.c +++ b/tests/csfb/mo-idle-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -380,7 +381,8 @@ static void test_issues3072_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -647,7 +649,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -915,7 +918,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1196,7 +1200,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/csfb/mo-sms-test.c b/tests/csfb/mo-sms-test.c index 8dfeb920f..91dbf173c 100644 --- a/tests/csfb/mo-sms-test.c +++ b/tests/csfb/mo-sms-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/csfb/mt-active-test.c b/tests/csfb/mt-active-test.c index 7a10a384a..fea54af98 100644 --- a/tests/csfb/mt-active-test.c +++ b/tests/csfb/mt-active-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/csfb/mt-idle-test.c b/tests/csfb/mt-idle-test.c index 326445af8..224dbdd76 100644 --- a/tests/csfb/mt-idle-test.c +++ b/tests/csfb/mt-idle-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/csfb/mt-sms-test.c b/tests/csfb/mt-sms-test.c index a254eb181..7e254bfa9 100644 --- a/tests/csfb/mt-sms-test.c +++ b/tests/csfb/mt-sms-test.c @@ -96,7 +96,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/handover/epc-s1-test.c b/tests/handover/epc-s1-test.c index 5f0130ee3..ca2d205e4 100644 --- a/tests/handover/epc-s1-test.c +++ b/tests/handover/epc-s1-test.c @@ -114,7 +114,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -708,7 +709,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1030,7 +1032,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/handover/epc-x2-test.c b/tests/handover/epc-x2-test.c index 24811c103..8181ef3f8 100644 --- a/tests/handover/epc-x2-test.c +++ b/tests/handover/epc-x2-test.c @@ -110,7 +110,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -461,7 +462,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/non3gpp/epdg-test.c b/tests/non3gpp/epdg-test.c index 6dda4d876..acf3415df 100644 --- a/tests/non3gpp/epdg-test.c +++ b/tests/non3gpp/epdg-test.c @@ -433,7 +433,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -557,7 +558,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -657,7 +659,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); 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/bearer-test.c b/tests/volte/bearer-test.c index 8cbbdc688..7cf94584d 100644 --- a/tests/volte/bearer-test.c +++ b/tests/volte/bearer-test.c @@ -93,7 +93,8 @@ static void uni_directional_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -336,7 +337,8 @@ static void bi_directional_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, diff --git a/tests/volte/cx-test.c b/tests/volte/cx-test.c index 1f5d72933..828f6ef6a 100644 --- a/tests/volte/cx-test.c +++ b/tests/volte/cx-test.c @@ -104,7 +104,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -221,7 +222,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); 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 62df3558a..29896dc21 100644 --- a/tests/volte/rx-test.c +++ b/tests/volte/rx-test.c @@ -99,7 +99,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -216,7 +217,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -609,7 +611,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -717,7 +720,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -958,7 +962,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1075,7 +1080,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1160,7 +1166,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1303,7 +1310,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1420,7 +1428,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1503,7 +1512,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -1639,7 +1649,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1827,7 +1838,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -1944,7 +1956,8 @@ static void test5_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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2328,7 +2341,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -2445,7 +2459,8 @@ static void test6_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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -2748,7 +2763,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -2865,7 +2881,8 @@ static void test7_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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -3148,7 +3165,8 @@ static void test_issues3109_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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -3265,7 +3283,8 @@ static void test_issues3109_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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); 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/session-test.c b/tests/volte/session-test.c index c7e089798..51df557b2 100644 --- a/tests/volte/session-test.c +++ b/tests/volte/session-test.c @@ -93,7 +93,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -201,7 +202,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf); @@ -317,7 +319,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); 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/simple-test.c b/tests/volte/simple-test.c index 9e7fd9ce7..4e834b515 100644 --- a/tests/volte/simple-test.c +++ b/tests/volte/simple-test.c @@ -99,7 +99,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -216,7 +217,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); 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 4ae7be6ee..6a8163376 100644 --- a/tests/volte/video-test.c +++ b/tests/volte/video-test.c @@ -97,7 +97,8 @@ 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, false); + esmbuf = testesm_build_pdn_connectivity_request( + sess, false, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); memset(&test_ue->attach_request_param, @@ -214,7 +215,8 @@ 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, true); + esmbuf = testesm_build_pdn_connectivity_request( + sess, true, OGS_NAS_EPS_PDN_TYPE_IPV4V6); ABTS_PTR_NOTNULL(tc, esmbuf); sendbuf = test_s1ap_build_uplink_nas_transport(test_ue, esmbuf); ABTS_PTR_NOTNULL(tc, sendbuf);