Projects
osmocom:nightly
open5gs
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 69
View file
open5gs_2.4.9.47.c28f.202209030002.dsc
Deleted
@@ -1,37 +0,0 @@ -Format: 3.0 (native) -Source: open5gs -Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg -Architecture: any -Version: 2.4.9.47.c28f.202209030002 -Maintainer: Harald Welte <laforge@gnumonks.org> -Uploaders: Sukchan Lee <acetcom@gmail.com> -Homepage: https://open5gs.org -Standards-Version: 4.3.0 -Vcs-Browser: https://github.com/open5gs/open5gs -Vcs-Git: git://github.com/open5gs/open5gs -Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev -Package-List: - open5gs deb net optional arch=any - open5gs-amf deb net optional arch=any - open5gs-ausf deb net optional arch=any - open5gs-bsf deb net optional arch=any - open5gs-common deb net optional arch=any - open5gs-dbg deb net optional arch=any - open5gs-hss deb net optional arch=any - open5gs-mme deb net optional arch=any - open5gs-nrf deb net optional arch=any - open5gs-nssf deb net optional arch=any - open5gs-pcf deb net optional arch=any - open5gs-pcrf deb net optional arch=any - open5gs-sgwc deb net optional arch=any - open5gs-sgwu deb net optional arch=any - open5gs-smf deb net optional arch=any - open5gs-udm deb net optional arch=any - open5gs-udr deb net optional arch=any - open5gs-upf deb net optional arch=any -Checksums-Sha1: - 9d784ed14450cd7392b15c753fd48e470ef7d9ca 11460208 open5gs_2.4.9.47.c28f.202209030002.tar.xz -Checksums-Sha256: - ab321a7edd9c4ae5572f089c22ca825ed062d9d0f22ea79f2df8b39c6ac0f8df 11460208 open5gs_2.4.9.47.c28f.202209030002.tar.xz -Files: - a82cdf4a0340ff40a8cab7255b9fb73b 11460208 open5gs_2.4.9.47.c28f.202209030002.tar.xz
View file
open5gs_2.4.9.52.c716a.202209040002.dsc
Added
@@ -0,0 +1,37 @@ +Format: 3.0 (native) +Source: open5gs +Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg +Architecture: any +Version: 2.4.9.52.c716a.202209040002 +Maintainer: Harald Welte <laforge@gnumonks.org> +Uploaders: Sukchan Lee <acetcom@gmail.com> +Homepage: https://open5gs.org +Standards-Version: 4.3.0 +Vcs-Browser: https://github.com/open5gs/open5gs +Vcs-Git: git://github.com/open5gs/open5gs +Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev +Package-List: + open5gs deb net optional arch=any + open5gs-amf deb net optional arch=any + open5gs-ausf deb net optional arch=any + open5gs-bsf deb net optional arch=any + open5gs-common deb net optional arch=any + open5gs-dbg deb net optional arch=any + open5gs-hss deb net optional arch=any + open5gs-mme deb net optional arch=any + open5gs-nrf deb net optional arch=any + open5gs-nssf deb net optional arch=any + open5gs-pcf deb net optional arch=any + open5gs-pcrf deb net optional arch=any + open5gs-sgwc deb net optional arch=any + open5gs-sgwu deb net optional arch=any + open5gs-smf deb net optional arch=any + open5gs-udm deb net optional arch=any + open5gs-udr deb net optional arch=any + open5gs-upf deb net optional arch=any +Checksums-Sha1: + c34d34c0ec7f9211bbf22e1018ed3d23bea882b1 11460216 open5gs_2.4.9.52.c716a.202209040002.tar.xz +Checksums-Sha256: + e3127837b196f660a67aec48994b68814bf78832dde9ee429c152a058ba644cb 11460216 open5gs_2.4.9.52.c716a.202209040002.tar.xz +Files: + 7500e8203cc72a1c4e604b87956c5c25 11460216 open5gs_2.4.9.52.c716a.202209040002.tar.xz
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/.tarball-version -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -2.4.9.47-c28f.202209030002 +2.4.9.52-c716a.202209040002
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/debian/changelog -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -open5gs (2.4.9.47.c28f.202209030002) unstable; urgency=medium +open5gs (2.4.9.52.c716a.202209040002) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom nightly feed - -- Osmocom OBS scripts <info@osmocom.org> Sat, 03 Sep 2022 00:04:25 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Sun, 04 Sep 2022 00:04:33 +0000 open5gs (2.4.9) unstable; urgency=medium
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/lib/core/ogs-timer.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/lib/core/ogs-timer.c
Changed
@@ -70,6 +70,12 @@ ogs_free(manager); } +static ogs_timer_t *ogs_timer_cycle(ogs_timer_mgr_t *manager, ogs_timer_t *timer) +{ + ogs_assert(manager); + return ogs_pool_cycle(&manager->pool, timer); +} + ogs_timer_t *ogs_timer_add( ogs_timer_mgr_t *manager, void (*cb)(void *data), void *data) { @@ -77,7 +83,11 @@ ogs_assert(manager); ogs_pool_alloc(&manager->pool, &timer); - ogs_assert(timer); + if (!timer) { + ogs_fatal("ogs_pool_alloc() failed"); + return NULL; + } + ogs_expect_or_return_val(timer, NULL); memset(timer, 0, sizeof *timer); timer->cb = cb; @@ -88,19 +98,25 @@ return timer; } -void ogs_timer_delete(ogs_timer_t *timer) +void ogs_timer_delete_debug(ogs_timer_t *timer, const char *file_line) { ogs_timer_mgr_t *manager; ogs_assert(timer); manager = timer->manager; ogs_assert(manager); + timer = ogs_timer_cycle(manager, timer); + if (!timer) { + ogs_fatal("ogs_timer_delete() failed in %s", file_line); + ogs_assert_if_reached(); + } ogs_timer_stop(timer); ogs_pool_free(&manager->pool, timer); } -void ogs_timer_start(ogs_timer_t *timer, ogs_time_t duration) +void ogs_timer_start_debug( + ogs_timer_t *timer, ogs_time_t duration, const char *file_line) { ogs_timer_mgr_t *manager = NULL; ogs_assert(timer); @@ -108,6 +124,11 @@ manager = timer->manager; ogs_assert(manager); + timer = ogs_timer_cycle(manager, timer); + if (!timer) { + ogs_fatal("ogs_timer_start() failed in %s", file_line); + ogs_assert_if_reached(); + } if (timer->running == true) ogs_rbtree_delete(&manager->tree, timer); @@ -116,12 +137,18 @@ add_timer_node(&manager->tree, timer, duration); } -void ogs_timer_stop(ogs_timer_t *timer) +void ogs_timer_stop_debug(ogs_timer_t *timer, const char *file_line) { ogs_timer_mgr_t *manager = NULL; ogs_assert(timer); manager = timer->manager; ogs_assert(manager); + timer = ogs_timer_cycle(manager, timer); + ogs_assert(timer); + if (!timer) { + ogs_fatal("ogs_timer_stop() failed in %s", file_line); + ogs_assert_if_reached(); + } if (timer->running == false) return; @@ -178,4 +205,3 @@ this->cb(this->data); } } -
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/lib/core/ogs-timer.h -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/lib/core/ogs-timer.h
Changed
@@ -46,10 +46,17 @@ ogs_timer_t *ogs_timer_add( ogs_timer_mgr_t *manager, void (*cb)(void *data), void *data); -void ogs_timer_delete(ogs_timer_t *timer); +#define ogs_timer_delete(timer) \ + ogs_timer_delete_debug(timer, OGS_FILE_LINE) +void ogs_timer_delete_debug(ogs_timer_t *timer, const char *file_line); -void ogs_timer_start(ogs_timer_t *timer, ogs_time_t duration); -void ogs_timer_stop(ogs_timer_t *timer); +#define ogs_timer_start(timer, duration) \ + ogs_timer_start_debug(timer, duration, OGS_FILE_LINE) +void ogs_timer_start_debug( + ogs_timer_t *timer, ogs_time_t duration, const char *file_line); +#define ogs_timer_stop(timer) \ + ogs_timer_stop_debug(timer, OGS_FILE_LINE) +void ogs_timer_stop_debug(ogs_timer_t *timer, const char *file_line); ogs_time_t ogs_timer_mgr_next(ogs_timer_mgr_t *manager); void ogs_timer_mgr_expire(ogs_timer_mgr_t *manager);
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/lib/sbi/client.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/lib/sbi/client.c
Changed
@@ -106,10 +106,13 @@ ogs_assert(OGS_OK == ogs_copyaddrinfo(&client->node.addr, addr)); - ogs_list_init(&client->connection_list); - client->t_curl = ogs_timer_add( ogs_app()->timer_mgr, multi_timer_expired, client); + if (!client->t_curl) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&client_pool, client); + return NULL; + } multi = client->multi = curl_multi_init(); ogs_assert(multi); @@ -122,6 +125,8 @@ ogs_app()->pool.stream); #endif + ogs_list_init(&client->connection_list); + ogs_list_add(&ogs_sbi_self()->client_list, client); return client;
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/lib/sbi/message.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/lib/sbi/message.c
Changed
@@ -305,17 +305,19 @@ } if (ogs_sbi_self()->discovery_config.no_service_names == false && discovery_option->num_of_service_names) { - char *v = NULL; - cJSON *item = NULL; - item = cJSON_CreateStringArray( - (const char * const*)discovery_option->service_names, - discovery_option->num_of_service_names); - ogs_expect_or_return_val(item, NULL); + /* send array items separated by a comma */ + char *v = NULL; - v = cJSON_Print(item); + v = ogs_strdup(discovery_option->service_names0); ogs_expect_or_return_val(v, NULL); - cJSON_Delete(item); + + if (discovery_option->num_of_service_names > 1) + { + int i; + for (i = 1; i < discovery_option->num_of_service_names; i++) + v = ogs_mstrcatf(v, ",%s", discovery_option->service_namesi); + } ogs_sbi_header_set( request->http.params, OGS_SBI_PARAM_SERVICE_NAMES, v); @@ -523,23 +525,26 @@ } else if (!strcmp(ogs_hash_this_key(hi), OGS_SBI_PARAM_SERVICE_NAMES)) { char *v = NULL; - cJSON *array = NULL, *item = NULL; + char *service_names; + char *token; + char *saveptr; v = ogs_hash_this_val(hi); if (v) { - array = cJSON_Parse(v); - if (cJSON_IsArray(array)) { + service_names = ogs_strdup(v); + ogs_assert(service_names); + token = ogs_strtok_r(service_names, ",", &saveptr); + while (token != NULL) + { discovery_option_presence = true; + ogs_sbi_discovery_option_add_service_names( + discovery_option, token); - cJSON_ArrayForEach(item, array) { - char *names = cJSON_GetStringValue(item); - if (names) - ogs_sbi_discovery_option_add_service_names( - discovery_option, names); - } + token = ogs_strtok_r(NULL, ",", &saveptr); } - cJSON_Delete(array); + + ogs_free(service_names); } /* URL Query Parameter */
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/lib/sbi/mhd-server.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/lib/sbi/mhd-server.c
Changed
@@ -135,7 +135,11 @@ sbi_sess->timer = ogs_timer_add( ogs_app()->timer_mgr, session_timer_expired, sbi_sess); - ogs_assert(sbi_sess->timer); + if (!sbi_sess->timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&session_pool, sbi_sess); + return NULL; + } /* If User does not send HTTP response within deadline, * Open5GS will assert this program. */
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/amf/context.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/amf/context.c
Changed
@@ -973,6 +973,14 @@ ogs_assert(ran_ue); memset(ran_ue, 0, sizeof *ran_ue); + ran_ue->t_ng_holding = ogs_timer_add( + ogs_app()->timer_mgr, amf_timer_ng_holding_timer_expire, ran_ue); + if (!ran_ue->t_ng_holding) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&ran_ue_pool, ran_ue); + return NULL; + } + ran_ue->index = ogs_pool_index(&ran_ue_pool, ran_ue); ogs_assert(ran_ue->index > 0 && ran_ue->index <= ogs_app()->max.ue); @@ -989,10 +997,6 @@ ran_ue->gnb_ostream_id = OGS_NEXT_ID(gnb->ostream_id, 1, gnb->max_num_of_ostreams-1); - ran_ue->t_ng_holding = ogs_timer_add( - ogs_app()->timer_mgr, amf_timer_ng_holding_timer_expire, ran_ue); - ogs_assert(ran_ue->t_ng_holding); - ran_ue->gnb = gnb; ogs_list_add(&gnb->ran_ue_list, ran_ue); @@ -1163,41 +1167,71 @@ ogs_assert(amf_ue); memset(amf_ue, 0, sizeof *amf_ue); - /* SBI Type */ - amf_ue->sbi.type = OGS_SBI_OBJ_UE_TYPE; - - /* SBI Features */ - OGS_SBI_FEATURES_SET(amf_ue->am_policy_control_features, - OGS_SBI_NPCF_AM_POLICY_CONTROL_UE_AMBR_AUTHORIZATION); - - ogs_list_init(&amf_ue->sess_list); - - /* Initialization */ - amf_ue->guami = &amf_self()->served_guami0; - amf_ue->nas.access_type = OGS_ACCESS_TYPE_3GPP; - amf_ue->nas.amf.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE; - amf_ue->abba_len = 2; - /* Add All Timers */ amf_ue->t3513.timer = ogs_timer_add( ogs_app()->timer_mgr, amf_timer_t3513_expire, amf_ue); + if (!amf_ue->t3513.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&amf_ue_pool, amf_ue); + return NULL; + } amf_ue->t3513.pkbuf = NULL; amf_ue->t3522.timer = ogs_timer_add( ogs_app()->timer_mgr, amf_timer_t3522_expire, amf_ue); + if (!amf_ue->t3522.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&amf_ue_pool, amf_ue); + return NULL; + } amf_ue->t3522.pkbuf = NULL; amf_ue->t3550.timer = ogs_timer_add( ogs_app()->timer_mgr, amf_timer_t3550_expire, amf_ue); + if (!amf_ue->t3550.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&amf_ue_pool, amf_ue); + return NULL; + } amf_ue->t3550.pkbuf = NULL; amf_ue->t3555.timer = ogs_timer_add( ogs_app()->timer_mgr, amf_timer_t3555_expire, amf_ue); + if (!amf_ue->t3555.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&amf_ue_pool, amf_ue); + return NULL; + } amf_ue->t3555.pkbuf = NULL; amf_ue->t3560.timer = ogs_timer_add( ogs_app()->timer_mgr, amf_timer_t3560_expire, amf_ue); + if (!amf_ue->t3560.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&amf_ue_pool, amf_ue); + return NULL; + } amf_ue->t3560.pkbuf = NULL; amf_ue->t3570.timer = ogs_timer_add( ogs_app()->timer_mgr, amf_timer_t3570_expire, amf_ue); + if (!amf_ue->t3570.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&amf_ue_pool, amf_ue); + return NULL; + } amf_ue->t3570.pkbuf = NULL; + /* SBI Type */ + amf_ue->sbi.type = OGS_SBI_OBJ_UE_TYPE; + + /* SBI Features */ + OGS_SBI_FEATURES_SET(amf_ue->am_policy_control_features, + OGS_SBI_NPCF_AM_POLICY_CONTROL_UE_AMBR_AUTHORIZATION); + + ogs_list_init(&amf_ue->sess_list); + + /* Initialization */ + amf_ue->guami = &amf_self()->served_guami0; + amf_ue->nas.access_type = OGS_ACCESS_TYPE_3GPP; + amf_ue->nas.amf.ksi = OGS_NAS_KSI_NO_KEY_IS_AVAILABLE; + amf_ue->abba_len = 2; + amf_ue_fsm_init(amf_ue); ogs_list_add(&self.amf_ue_list, amf_ue);
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/amf/nsmf-handler.c
Changed
@@ -412,6 +412,7 @@ } } else { + SmContextUpdatedData = recvmsg->SmContextUpdatedData; if (state == AMF_UPDATE_SM_CONTEXT_ACTIVATED) { /*
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/mme/mme-context.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/mme/mme-context.c
Changed
@@ -1943,6 +1943,14 @@ ogs_assert(enb_ue); memset(enb_ue, 0, sizeof *enb_ue); + enb_ue->t_s1_holding = ogs_timer_add( + ogs_app()->timer_mgr, mme_timer_s1_holding_timer_expire, enb_ue); + if (!enb_ue->t_s1_holding) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&enb_ue_pool, enb_ue); + return NULL; + } + enb_ue->index = ogs_pool_index(&enb_ue_pool, enb_ue); ogs_assert(enb_ue->index > 0 && enb_ue->index <= ogs_app()->max.ue); @@ -1959,10 +1967,6 @@ enb_ue->enb_ostream_id = OGS_NEXT_ID(enb->ostream_id, 1, enb->max_num_of_ostreams-1); - enb_ue->t_s1_holding = ogs_timer_add( - ogs_app()->timer_mgr, mme_timer_s1_holding_timer_expire, enb_ue); - ogs_assert(enb_ue->t_s1_holding); - enb_ue->enb = enb; ogs_list_add(&enb->enb_ue_list, enb_ue); @@ -2047,7 +2051,11 @@ sgw_ue->t_s11_holding = ogs_timer_add( ogs_app()->timer_mgr, mme_timer_s11_holding_timer_expire, sgw_ue); - ogs_assert(sgw_ue->t_s11_holding); + if (!sgw_ue->t_s11_holding) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&sgw_ue_pool, sgw_ue); + return NULL; + } sgw_ue->sgw = sgw; @@ -2259,6 +2267,48 @@ ogs_assert(mme_ue); memset(mme_ue, 0, sizeof *mme_ue); + /* Add All Timers */ + mme_ue->t3413.timer = ogs_timer_add( + ogs_app()->timer_mgr, mme_timer_t3413_expire, mme_ue); + if (!mme_ue->t3413.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&mme_ue_pool, mme_ue); + return NULL; + } + mme_ue->t3413.pkbuf = NULL; + mme_ue->t3422.timer = ogs_timer_add( + ogs_app()->timer_mgr, mme_timer_t3422_expire, mme_ue); + if (!mme_ue->t3422.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&mme_ue_pool, mme_ue); + return NULL; + } + mme_ue->t3422.pkbuf = NULL; + mme_ue->t3450.timer = ogs_timer_add( + ogs_app()->timer_mgr, mme_timer_t3450_expire, mme_ue); + if (!mme_ue->t3450.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&mme_ue_pool, mme_ue); + return NULL; + } + mme_ue->t3450.pkbuf = NULL; + mme_ue->t3460.timer = ogs_timer_add( + ogs_app()->timer_mgr, mme_timer_t3460_expire, mme_ue); + if (!mme_ue->t3460.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&mme_ue_pool, mme_ue); + return NULL; + } + mme_ue->t3460.pkbuf = NULL; + mme_ue->t3470.timer = ogs_timer_add( + ogs_app()->timer_mgr, mme_timer_t3470_expire, mme_ue); + if (!mme_ue->t3470.timer) { + ogs_error("ogs_timer_add() failed"); + ogs_pool_free(&mme_ue_pool, mme_ue); + return NULL; + } + mme_ue->t3470.pkbuf = NULL; + mme_ebi_pool_init(mme_ue); ogs_list_init(&mme_ue->sess_list); @@ -2290,23 +2340,6 @@ mme_ue->csmap = NULL; mme_ue->vlr_ostream_id = 0; - /* Add All Timers */ - mme_ue->t3413.timer = ogs_timer_add( - ogs_app()->timer_mgr, mme_timer_t3413_expire, mme_ue); - mme_ue->t3413.pkbuf = NULL; - mme_ue->t3422.timer = ogs_timer_add( - ogs_app()->timer_mgr, mme_timer_t3422_expire, mme_ue); - mme_ue->t3422.pkbuf = NULL; - mme_ue->t3450.timer = ogs_timer_add( - ogs_app()->timer_mgr, mme_timer_t3450_expire, mme_ue); - mme_ue->t3450.pkbuf = NULL; - mme_ue->t3460.timer = ogs_timer_add( - ogs_app()->timer_mgr, mme_timer_t3460_expire, mme_ue); - mme_ue->t3460.pkbuf = NULL; - mme_ue->t3470.timer = ogs_timer_add( - ogs_app()->timer_mgr, mme_timer_t3470_expire, mme_ue); - mme_ue->t3470.pkbuf = NULL; - mme_ue_fsm_init(mme_ue); ogs_list_add(&self.mme_ue_list, mme_ue);
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/pcf/sbi-path.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/pcf/sbi-path.c
Changed
@@ -79,6 +79,9 @@ ogs_sbi_nf_instance_t *nf_instance = NULL; ogs_sbi_nf_service_t *service = NULL; + bool smpolicycontrol_enabled = false; + bool policyauthorization_enabled = false; + /* To be notified when NF Instances registered/deregistered in NRF * or when their profile is modified */ ogs_sbi_add_to_be_notified_nf_type(OpenAPI_nf_type_BSF); @@ -117,6 +120,8 @@ service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_SMF); ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); + + smpolicycontrol_enabled = true; } if (ogs_sbi_nf_service_is_available( @@ -128,6 +133,27 @@ service, OGS_SBI_API_V1, OGS_SBI_API_V1_0_0, NULL); ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_AF); ogs_sbi_nf_service_add_allowed_nf_type(service, OpenAPI_nf_type_NEF); + + policyauthorization_enabled = true; + } + + if ((smpolicycontrol_enabled == true && + policyauthorization_enabled == false) || + (smpolicycontrol_enabled == false && + policyauthorization_enabled == true)) { + ogs_fatal("CHECK CONFIGURATION:"); + ogs_fatal(" %s - %s", + OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL, + smpolicycontrol_enabled ? "enabled" : "disabled"); + ogs_fatal(" %s - %s", + OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION, + policyauthorization_enabled ? "enabled" : "disabled"); + ogs_fatal("Only one of %s and %s cannot be enabled.", + OGS_SBI_SERVICE_NAME_NPCF_SMPOLICYCONTROL, + OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION); + ogs_fatal("They can be enabled or disabled together."); + + return OGS_ERROR; } /* Initialize NRF NF Instance */
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/smf/context.h -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/smf/context.h
Changed
@@ -270,6 +270,8 @@ * of POST /npcf-smpolocycontrol/v1/policies */ char *policy_association_id; + OpenAPI_up_cnx_state_e up_cnx_state; + /* PLMN ID & NID */ ogs_plmn_id_t plmn_id;
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/smf/n4-handler.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/smf/n4-handler.c
Changed
@@ -400,7 +400,14 @@ } else { sess->paging.ue_requested_pdu_session_establishment_done = true; - ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); + + if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING) { + sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED; + smf_sbi_send_sm_context_updated_data_up_cnx_state( + sess, stream, OpenAPI_up_cnx_state_ACTIVATED); + } else { + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); + } } } else if (flags & OGS_PFCP_MODIFY_DEACTIVATE) {
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/smf/ngap-handler.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/smf/ngap-handler.c
Changed
@@ -151,8 +151,18 @@ sess, stream, OGS_PFCP_MODIFY_DL_ONLY|OGS_PFCP_MODIFY_ACTIVATE, 0)); } else { +#if 0 /* Modified by pull request #1729 */ /* ACTIVATED Is NOT Included in RESPONSE */ ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); +#else + if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING) { + sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED; + smf_sbi_send_sm_context_updated_data_up_cnx_state( + sess, stream, OpenAPI_up_cnx_state_ACTIVATED); + } else { + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); + } +#endif } rv = OGS_OK;
View file
open5gs_2.4.9.47.c28f.202209030002.tar.xz/src/smf/nsmf-handler.c -> open5gs_2.4.9.52.c716a.202209040002.tar.xz/src/smf/nsmf-handler.c
Changed
@@ -350,6 +350,8 @@ } else if (SmContextUpdateData->up_cnx_state) { + sess->up_cnx_state = SmContextUpdateData->up_cnx_state; + if (SmContextUpdateData->up_cnx_state == OpenAPI_up_cnx_state_DEACTIVATED) {
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.