mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-05 15:24:14 +00:00
Merge branch 'main' into home-routed
This commit is contained in:
commit
3f38d66790
136 changed files with 5635 additions and 1877 deletions
|
|
@ -247,6 +247,12 @@ int ogs_app_parse_global_conf(ogs_yaml_iter_t *parent)
|
|||
} else if (!strcmp(parameter_key, "use_openair")) {
|
||||
global_conf.parameter.use_openair =
|
||||
ogs_yaml_iter_bool(¶meter_iter);
|
||||
} else if (!strcmp(parameter_key, "use_upg_vpp")) {
|
||||
global_conf.parameter.use_upg_vpp =
|
||||
ogs_yaml_iter_bool(¶meter_iter);
|
||||
} else if (!strcmp(parameter_key, "fake_csfb")) {
|
||||
global_conf.parameter.fake_csfb =
|
||||
ogs_yaml_iter_bool(¶meter_iter);
|
||||
} else if (!strcmp(parameter_key,
|
||||
"no_ipv4v6_local_addr_in_packet_filter")) {
|
||||
global_conf.parameter.
|
||||
|
|
@ -1252,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) {
|
||||
|
|
@ -1283,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 &&
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue