paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-10-23 07:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into home-routed

Browse Source
This commit is contained in:
Sukchan Lee
2025-01-19 17:11:20 +09:00
parent b47bad8b84 df11b05a1e
commit 3f38d66790
136 changed files with 5635 additions and 1877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/af/npcf-build.c
View File

@@ -115,11 +115,9 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create(
AscReqData.ev_subsc = &evSubsc;
memset(&sNssai, 0, sizeof(sNssai));
if (sess->s_nssai.sst) {
sNssai.sst = sess->s_nssai.sst;
sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
AscReqData.slice_info = &sNssai;
}
sNssai.sst = sess->s_nssai.sst;
sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
AscReqData.slice_info = &sNssai;
AscReqData.spon_status = OpenAPI_sponsoring_status_SPONSOR_DISABLED;
@@ -709,11 +707,10 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create_video(
AscReqData.ev_subsc = &evSubsc;
memset(&sNssai, 0, sizeof(sNssai));
if (sess->s_nssai.sst) {
sNssai.sst = sess->s_nssai.sst;
sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
AscReqData.slice_info = &sNssai;
}
sNssai.sst = sess->s_nssai.sst;
sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
AscReqData.slice_info = &sNssai;
AscReqData.spon_status = OpenAPI_sponsoring_status_SPONSOR_DISABLED;

1
tests/common/context.c
View File

@@ -1174,6 +1174,7 @@ test_ue_t *test_ue_add_by_suci(
s_nssai->sst = 0;
s_nssai->sd.v = OGS_S_NSSAI_NO_SD_VALUE;
s_nssai->mapped_hplmn_sst_presence = false;
s_nssai->mapped_hplmn_sst = 0;
s_nssai->mapped_hplmn_sd.v = OGS_S_NSSAI_NO_SD_VALUE;

6
tests/common/sctp.c
View File

@@ -54,7 +54,7 @@ ogs_socknode_t *testsctp_client(const char *ipstr, int port)
node = ogs_socknode_new(addr);
ogs_assert(node);
sock = ogs_sctp_client(SOCK_STREAM, node->addr, NULL);
sock = ogs_sctp_client(SOCK_STREAM, node->addr, NULL, NULL);
ogs_assert(sock);
node->sock = sock;
@@ -82,7 +82,7 @@ ogs_socknode_t *tests1ap_client(int family)
node = ogs_socknode_new(addr);
ogs_assert(node);
sock = ogs_sctp_client(SOCK_STREAM, node->addr, NULL);
sock = ogs_sctp_client(SOCK_STREAM, node->addr, NULL, NULL);
ogs_assert(sock);
node->sock = sock;
@@ -121,7 +121,7 @@ ogs_socknode_t *testngap_client(int index, int family)
node = ogs_socknode_new(addr);
ogs_assert(node);
sock = ogs_sctp_client(SOCK_STREAM, node->addr, NULL);
sock = ogs_sctp_client(SOCK_STREAM, node->addr, NULL, NULL);
ogs_assert(sock);
node->sock = sock;

8
tests/handover/5gc-n2-test.c
View File

@@ -515,7 +515,7 @@ static void direct_complete_func(abts_case *tc, void *data)
ABTS_PTR_NOTNULL(tc, gtpu2);
/* NG-Setup Reqeust/Response for Source gNB */
sendbuf = testngap_build_ng_setup_request(0x4000, 28);
sendbuf = testngap_build_ng_setup_request(0, 28);
ABTS_PTR_NOTNULL(tc, sendbuf);
rv = testgnb_ngap_send(ngap1, sendbuf);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
@@ -769,7 +769,7 @@ static void direct_complete_func(abts_case *tc, void *data)
/* Send UplinkRANConfigurationTransfer */
sendbuf = testngap_build_uplink_ran_configuration_transfer(
0x4000, 28, 0x4001, 28);
0, 28, 0x4001, 28);
ABTS_PTR_NOTNULL(tc, sendbuf);
rv = testgnb_ngap_send(ngap1, sendbuf);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
@@ -781,7 +781,7 @@ static void direct_complete_func(abts_case *tc, void *data)
/* Send UplinkRANConfigurationTransfer */
sendbuf = testngap_build_uplink_ran_configuration_transfer(
0x4001, 28, 0x4000, 28);
0x4001, 28, 0, 28);
ABTS_PTR_NOTNULL(tc, sendbuf);
rv = testgnb_ngap_send(ngap2, sendbuf);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
@@ -911,7 +911,7 @@ static void direct_complete_func(abts_case *tc, void *data)
/* Send HandoverRequired */
sendbuf = testngap_build_handover_required(
test_ue, NGAP_HandoverType_intra5gs,
0x4000, 28,
0, 28,
NGAP_Cause_PR_radioNetwork,
NGAP_CauseRadioNetwork_handover_desirable_for_radio_reason,
true);

6
tests/sctp/sctp-test.c
View File

@@ -53,7 +53,7 @@ static void test1_func(abts_case *tc, void *data)
rv = ogs_freeaddrinfo(addr);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
rv = ogs_getaddrinfo(&addr, AF_UNSPEC, NULL, TEST1_PORT2, AI_PASSIVE);
rv = ogs_getaddrinfo(&addr, AF_INET6, NULL, TEST1_PORT2, AI_PASSIVE);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
sctp = ogs_sctp_server(SOCK_SEQPACKET, addr, NULL);
ABTS_PTR_NOTNULL(tc, sctp);
@@ -77,7 +77,7 @@ static void test2_main(void *data)
rv = ogs_getaddrinfo(&addr, AF_UNSPEC, NULL, TEST2_PORT, 0);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
sctp = ogs_sctp_client(SOCK_SEQPACKET, addr, NULL);
sctp = ogs_sctp_client(SOCK_SEQPACKET, addr, NULL, NULL);
ABTS_PTR_NOTNULL(tc, sctp);
size = ogs_sctp_recvdata(sctp, str, STRLEN, &from, &sinfo);
@@ -192,7 +192,7 @@ static void test4_main(void *data)
rv = ogs_getaddrinfo(&addr, AF_UNSPEC, NULL, TEST4_PORT, 0);
ABTS_INT_EQUAL(tc, OGS_OK, rv);
sctp = ogs_sctp_client(SOCK_STREAM, addr, NULL);
sctp = ogs_sctp_client(SOCK_STREAM, addr, NULL, NULL);
ABTS_PTR_NOTNULL(tc, sctp);
size = ogs_sctp_sendmsg(sctp, DATASTR, strlen(DATASTR), NULL, PPID, 0);

4
tests/slice/same-dnn-test.c
View File

@@ -426,6 +426,8 @@ static void test2_func(abts_case *tc, void *data)
sst = 2;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
sd.v = OGS_S_NSSAI_NO_SD_VALUE;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
mapped_hplmn_sst_presence = false;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
mapped_hplmn_sst = 0;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
@@ -436,6 +438,8 @@ static void test2_func(abts_case *tc, void *data)
sst = 3;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
sd.v = 0x000080;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
mapped_hplmn_sst_presence = false;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].
mapped_hplmn_sst = 0;
test_ue->requested_nssai.s_nssai[test_ue->requested_nssai.num_of_s_nssai].