vrr/open5gs
2
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2026-04-28 03:19:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[all] allow value of 0 for S-NSSAI SST

Browse source 
3GPP TS 23.003: 28.4.2 Format of the S-NSSAI

The SST field may have standardized and non-standardized values. Values
0 to 127 belong to the standardized SST range and they are defined in
3GPP TS 23.501 [119]. Values 128 to 255 belong to the Operator-specific
range.
This commit is contained in:
Bostjan Meglic 2024-11-26 12:51:01 +01:00 • committed by Sukchan Lee
parent 34a9816c7b
commit c331207233
12 changed files with 19 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/app/ogs-config.c
View file

@ -1258,7 +1258,6 @@ ogs_app_slice_conf_t *ogs_app_slice_conf_add(
ogs_assert(policy_conf);
ogs_assert(s_nssai);
ogs_assert(s_nssai->sst);
ogs_pool_alloc(&slice_conf_pool, &slice_conf);
if (!slice_conf) {
@ -1289,7 +1288,6 @@ ogs_app_slice_conf_t *ogs_app_slice_conf_find_by_s_nssai(
ogs_assert(policy_conf);
ogs_assert(s_nssai);
ogs_assert(s_nssai->sst);
ogs_list_for_each(&policy_conf->slice_list, slice_conf) {
if (slice_conf->data.s_nssai.sst == s_nssai->sst &&

5
lib/dbi/session.c
View file

@ -109,11 +109,6 @@ int ogs_dbi_session_data(char *supi, ogs_s_nssai_t *s_nssai, char *dnn,
}
}
if (!sst) {
ogs_error("No SST");
continue;
}
if (s_nssai && s_nssai->sst != sst) continue;
if (s_nssai &&

7
lib/nas/5gs/types.c
View file

@ -128,8 +128,7 @@ void ogs_nas_build_s_nssai(
pos = 0;
if (nas_s_nssai_ie->sst)
nas_s_nssai->buffer[pos++] = nas_s_nssai_ie->sst;
nas_s_nssai->buffer[pos++] = nas_s_nssai_ie->sst;
if (nas_s_nssai_ie->sd.v != OGS_S_NSSAI_NO_SD_VALUE ||
@ -141,7 +140,6 @@ void ogs_nas_build_s_nssai(
* "no SD value associated with the SST".
*/
(nas_s_nssai_ie->sd.v == OGS_S_NSSAI_NO_SD_VALUE &&
nas_s_nssai_ie->mapped_hplmn_sst &&
nas_s_nssai_ie->mapped_hplmn_sd.v != OGS_S_NSSAI_NO_SD_VALUE)) {
v = ogs_htobe24(nas_s_nssai_ie->sd);
@ -149,8 +147,7 @@ void ogs_nas_build_s_nssai(
pos += 3;
}
if (nas_s_nssai_ie->mapped_hplmn_sst)
nas_s_nssai->buffer[pos++] = nas_s_nssai_ie->mapped_hplmn_sst;
nas_s_nssai->buffer[pos++] = nas_s_nssai_ie->mapped_hplmn_sst;
if (nas_s_nssai_ie->mapped_hplmn_sd.v != OGS_S_NSSAI_NO_SD_VALUE) {
v = ogs_htobe24(nas_s_nssai_ie->mapped_hplmn_sd);

5
lib/sbi/message.c
View file

@ -612,11 +612,6 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message)
char *v = NULL;
cJSON *item = NULL;
if (!message->param.s_nssai.sst) {
ogs_error("No S-NSSAI SST");
ogs_sbi_request_free(request);
return NULL;
}
if (!message->param.roaming_indication) {
ogs_error("No Roaming Indication");
ogs_sbi_request_free(request);

8
src/amf/nsmf-build.c
View file

@ -133,11 +133,9 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context(
sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd);
SmContextCreateData.s_nssai = &sNssai;
if (sess->mapped_hplmn.sst) {
hplmnSnssai.sst = sess->mapped_hplmn.sst;
hplmnSnssai.sd = ogs_s_nssai_sd_to_string(sess->mapped_hplmn.sd);
SmContextCreateData.hplmn_snssai = &hplmnSnssai;
}
hplmnSnssai.sst = sess->mapped_hplmn.sst;
hplmnSnssai.sd = ogs_s_nssai_sd_to_string(sess->mapped_hplmn.sd);
SmContextCreateData.hplmn_snssai = &hplmnSnssai;
SmContextCreateData.guami = ogs_sbi_build_guami(amf_ue->guami);
if (!SmContextCreateData.guami) {

1
src/nssf/context.c
View file

@ -285,7 +285,6 @@ nssf_nsi_t *nssf_nsi_add(char *nrf_id, uint8_t sst, ogs_uint24_t sd)
nssf_nsi_t *nsi = NULL;
ogs_assert(nrf_id);
ogs_assert(sst);
ogs_pool_alloc(&nssf_nsi_pool, &nsi);
ogs_assert(nsi);

21
src/pcf/context.c
View file

@ -132,12 +132,6 @@ static int parse_slice_conf(
const char *v = ogs_yaml_iter_value(&slice_iter);
if (v) {
s_nssai.sst = atoi(v);
if (s_nssai.sst == 1 || s_nssai.sst == 2 ||
s_nssai.sst == 3 || s_nssai.sst == 4) {
} else {
ogs_error("Unknown SST [%d]", s_nssai.sst);
return OGS_ERROR;
}
}
} else if (!strcmp(slice_key, OGS_SD_STRING)) {
const char *v = ogs_yaml_iter_value(&slice_iter);
@ -147,18 +141,13 @@ static int parse_slice_conf(
}
}
if (s_nssai.sst) {
slice_conf = ogs_app_slice_conf_add(policy_conf, &s_nssai);
if (!slice_conf) {
ogs_error("ogs_app_slice_conf_add() failed [SST:%d,SD:0x%x]",
s_nssai.sst, s_nssai.sd.v);
return OGS_ERROR;
}
slice_conf->data.default_indicator = default_indicator;
} else {
ogs_error("No SST");
slice_conf = ogs_app_slice_conf_add(policy_conf, &s_nssai);
if (!slice_conf) {
ogs_error("ogs_app_slice_conf_add() failed [SST:%d,SD:0x%x]",
s_nssai.sst, s_nssai.sd.v);
return OGS_ERROR;
}
slice_conf->data.default_indicator = default_indicator;
OGS_YAML_ARRAY_RECURSE(&slice_array, &slice_iter);
while (ogs_yaml_iter_next(&slice_iter)) {

4
src/pcf/nbsf-build.c
View file

@ -133,10 +133,6 @@ ogs_sbi_request_t *pcf_nbsf_management_build_register(
}
}
if (!sess->s_nssai.sst) {
ogs_error("No SST");
goto end;
}
if (PcfIpEndPointList->count)
PcfBinding.pcf_ip_end_points = PcfIpEndPointList;
else

7
src/pcf/npcf-handler.c
View file

@ -299,13 +299,6 @@ bool pcf_npcf_smpolicycontrol_handle_create(pcf_sess_t *sess,
goto cleanup;
}
if (!sliceInfo->sst) {
strerror = ogs_msprintf("[%s:%d] No sliceInfo->sst",
pcf_ue->supi, sess->psi);
status = OGS_SBI_HTTP_STATUS_BAD_REQUEST;
goto cleanup;
}
servingNetwork = SmPolicyContextData->serving_network;
if (servingNetwork) {
if (!servingNetwork->mcc) {

2
src/udm/nudm-handler.c
View file

@ -558,7 +558,7 @@ bool udm_nudm_uecm_handle_smf_registration(
return false;
}
if (!SmfRegistration->single_nssai || !SmfRegistration->single_nssai->sst) {
if (!SmfRegistration->single_nssai) {
ogs_error("[%s:%d] No singleNssai", udm_ue->supi, sess->psi);
ogs_assert(true ==
ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST,

3
src/udm/nudr-handler.c
View file

@ -808,8 +808,7 @@ bool udm_nudr_dr_handle_smf_registration(
return false;
}
if (!SmfRegistration->single_nssai ||
!SmfRegistration->single_nssai->sst) {
if (!SmfRegistration->single_nssai) {
ogs_error("[%s:%d] No singleNssai", udm_ue->supi, sess->psi);
ogs_assert(true ==
ogs_sbi_server_send_error(

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;