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

sbi: accept matching smfInfo blocks during SMF discovery

Browse source 
The discovery matcher meant to accept an SMF instance when any advertised
smfInfo satisfied the requested S-NSSAI/DNN/TAI, but the previous logic
returned false as soon as one block missed the filters. That made configs
with multiple info blocks fail with “No SMF Instance”.

Track whether the request actually carries slice/TAI filters and mark the
instance as matched when at least one smfInfo passes them. Other NF types
keep their existing behaviour, while multi-block SMF configs now work as
documented.
This commit is contained in:
Ferran Cañellas 2025-10-29 09:03:30 +01:00 • committed by Sukchan Lee
parent 4a6a7b4049
commit 22e685bcce
1 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

38
lib/sbi/context.c
View file

@ -2160,6 +2160,16 @@ bool ogs_sbi_discovery_option_is_matched(
nf_instance, discovery_option) == false)
return false;
bool need_smf_slice = false;
bool need_smf_tai = false;
bool smf_match_found = false;
if (nf_instance->nf_type == OpenAPI_nf_type_SMF) {
need_smf_slice =
discovery_option->num_of_snssais && discovery_option->dnn;
need_smf_tai = discovery_option->tai_presence;
}
ogs_list_for_each(&nf_instance->nf_info_list, nf_info) {
if (nf_instance->nf_type != nf_info->nf_type) {
ogs_error("Invalid NF-Type [%d:%d]",
@ -2176,21 +2186,31 @@ bool ogs_sbi_discovery_option_is_matched(
return false;
break;
case OpenAPI_nf_type_SMF:
if (discovery_option->num_of_snssais && discovery_option->dnn &&
ogs_sbi_check_smf_info_slice(&nf_info->smf,
&discovery_option->snssais[0],
discovery_option->dnn) == false)
return false;
if (discovery_option->tai_presence &&
ogs_sbi_check_smf_info_tai(&nf_info->smf,
&discovery_option->tai) == false)
return false;
bool match = true;
if (need_smf_slice) {
match = ogs_sbi_check_smf_info_slice(&nf_info->smf,
&discovery_option->snssais[0],
discovery_option->dnn);
}
if (match && need_smf_tai) {
match = ogs_sbi_check_smf_info_tai(&nf_info->smf,
&discovery_option->tai);
}
if (match)
smf_match_found = true;
break;
default:
break;
}
}
if (nf_instance->nf_type == OpenAPI_nf_type_SMF &&
(need_smf_slice || need_smf_tai) && smf_match_found == false)
return false;
return true;
}