Projects
osmocom:latest
open5gs
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 15
View file
open5gs_2.6.1.dsc -> open5gs_2.6.2.dsc
Changed
@@ -2,7 +2,7 @@ Source: open5gs Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg Architecture: any -Version: 2.6.1 +Version: 2.6.2 Maintainer: Harald Welte <laforge@gnumonks.org> Uploaders: Sukchan Lee <acetcom@gmail.com> Homepage: https://open5gs.org @@ -31,8 +31,8 @@ open5gs-udr deb net optional arch=any open5gs-upf deb net optional arch=any Checksums-Sha1: - 81c8bc6bf290ab3a41239497139e5d5adf97cba3 14098660 open5gs_2.6.1.tar.xz + a370923fa23cc91f422b84f2ea46d7f52442979c 14113060 open5gs_2.6.2.tar.xz Checksums-Sha256: - 7b4cd7b379e39027e1af89f3b1c216fd90d9eed88d94244477b313f5b43bf9e2 14098660 open5gs_2.6.1.tar.xz + 139b4785625ff07b6713ec57713438c288655c848b5285734f90088eec0bc769 14113060 open5gs_2.6.2.tar.xz Files: - fadc543dfc51765d6ae1884052b2ed84 14098660 open5gs_2.6.1.tar.xz + f83b2666ecb6f0c8261292c4084904ad 14113060 open5gs_2.6.2.tar.xz
View file
open5gs_2.6.2.tar.xz/.github/workflows/stale.yml
Added
@@ -0,0 +1,45 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: '30 22 * * *' + +jobs: + stale: + + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + + steps: + - uses: actions/stale@v5 + with: + debug-only: false + operations-per-run: 500 + enable-statistics: true + remove-stale-when-updated: true + exempt-issue-labels: 'status:accepted,status:blocked,status:more-info-needed,status:milestone-required,Help Wanted' + exempt-all-milestones: true + stale-issue-label: 'Housekeeping:ToClose' + + days-before-stale: 60 + stale-issue-message: > + This issue has been marked as stale because there has been no recent activity on it. If there is + no further activity, it will be closed. The Open5GS team is a small but dedicated team with limited + resources and may not be able to address every issue directly. **Do not** attempt to circumvent this + by 'bumping' the issue; doing so will result in it's immediate closure and possibly your exclusion + from participating in any future discussions. + stale-pr-message: > + As there has been no recent activity on this PR, it has been marked as stale. It will be automatically + closed if no further action is taken. + + + days-before-close: 30 + days-before-pr-close: -1 + close-issue-message: > + This issue has been closed automatically due to lack of activity. This has been done to try + and reduce the amount of noise. Please do not comment any further. The Open5GS Team may choose to + re-open this issue if necessary. + close-pr-message: > + This PR has been closed due to an absence of activity.
View file
open5gs_2.6.1.tar.xz/.tarball-version -> open5gs_2.6.2.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -2.6.1 +2.6.2
View file
open5gs_2.6.1.tar.xz/configs/open5gs/amf.yaml.in -> open5gs_2.6.2.tar.xz/configs/open5gs/amf.yaml.in
Changed
@@ -348,34 +348,57 @@ # <TAI> # # o Multiple TAI +# +# When multiple TAIs are configured as shown below, +# the Served TAI is determined by comparing UserLocationInformation +# of UplinkNASTransport sent from gNB. +# +# For example, if the gNB sends TAC with 30 to the AMF, +# the fourth TAI (TAC: 20, 28, 29-32, 36-38, 40-42, 50, 60, 70, 70) +# is determined as the Served TAI. The result is transmitted to the gNB +# as a Tracking Area identity List in Registration Accept. +# # amf: # tai: # - plmn_id: # mcc: 001 # mnc: 01 -# tac: 1, 2, 3 +# tac: 1, 3, 5 # tai: # - plmn_id: # mcc: 002 # mnc: 02 -# tac: 4 +# tac: 6-10, 15-18 +# tai: # - plmn_id: # mcc: 003 # mnc: 03 -# tac: 5 -# tai: +# tac: 20 # - plmn_id: # mcc: 004 # mnc: 04 -# tac: 6, 7 +# tac: 21 +# tai: # - plmn_id: # mcc: 005 # mnc: 05 -# tac: 8 +# tac: 22, 28 # - plmn_id: # mcc: 006 # mnc: 06 -# tac: 9, 10 +# tac: 30-32, 34, 36-38, 40-42, 44, 46, 48 +# - plmn_id: +# mcc: 007 +# mnc: 07 +# tac: 50 +# - plmn_id: +# mcc: 008 +# mnc: 08 +# tac: 60 +# - plmn_id: +# mcc: 009 +# mnc: 09 +# tac: 70, 80 # # <PLMN Support> # @@ -394,6 +417,41 @@ # s_nssai: # - sst: 1 # +# +# <Access Control> +# +# If access_control is not specified, then all networks are allowed +# If access_control is defined, +# no other networks are allowed other than matching plmn_id. +# +# default_reject_cause may be used to overwrite the default error cause #11 +# for non matching plmn_id +# +# for matching plmn_id with reject_cause defined, +# the AMF rejects access with the reject_cause error cause +# +# for matching plmn_id without reject_cause defined, +# the AMF accepts the PLMN traffic +# +# o The example below only accepts 002/02 and 999/70 PLMNs. +# 001/01 is rejected with cause 15, +# and the rest of the PLMNs are rejected with default cause 13. +# +# amf: +# access_control: +# - default_reject_cause: 13 +# - plmn_id: +# reject_cause: 15 +# mcc: 001 +# mnc: 01 +# - plmn_id: +# mcc: 002 +# mnc: 02 +# - plmn_id: +# mcc: 999 +# mnc: 70 +# +# # <Network Name> # # amf:
View file
open5gs_2.6.1.tar.xz/configs/open5gs/bsf.yaml.in -> open5gs_2.6.2.tar.xz/configs/open5gs/bsf.yaml.in
Changed
@@ -1,5 +1,3 @@ -db_uri: mongodb://localhost/open5gs - # # o Set OGS_LOG_INFO to all domain level # - If `level` is omitted, the default level is OGS_LOG_INFO)
View file
open5gs_2.6.1.tar.xz/configs/open5gs/mme.yaml.in -> open5gs_2.6.2.tar.xz/configs/open5gs/mme.yaml.in
Changed
@@ -217,34 +217,91 @@ # <TAI> # # o Multiple TAI +# +# When multiple TAIs are configured as shown below, +# the Served TAI is determined by comparing UserLocationInformation +# of UplinkNASTransport sent from eNB. +# +# For example, if the eNB sends TAC with 30 to the MME, +# the fourth TAI (TAC: 20, 28, 29-32, 36-38, 40-42, 50, 60, 70, 70) +# is determined as the Served TAI. The result is transmitted to the eNB +# as a Tracking Area identity List in Registration Accept. +# # mme: # tai: # - plmn_id: # mcc: 001 # mnc: 01 -# tac: 1, 2, 3 +# tac: 1, 3, 5 # tai: # - plmn_id: # mcc: 002 # mnc: 02 -# tac: 4 +# tac: 6-10, 15-18 +# tai: # - plmn_id: # mcc: 003 # mnc: 03 -# tac: 5 -# tai: +# tac: 20 # - plmn_id: # mcc: 004 # mnc: 04 -# tac: 6, 7 +# tac: 21 +# tai: # - plmn_id: # mcc: 005 # mnc: 05 -# tac: 8 +# tac: 22, 28 # - plmn_id: # mcc: 006 # mnc: 06 -# tac: 9, 10 +# tac: 30-32, 34, 36-38, 40-42, 44, 46, 48 +# - plmn_id: +# mcc: 007 +# mnc: 07 +# tac: 50 +# - plmn_id: +# mcc: 008 +# mnc: 08 +# tac: 60 +# - plmn_id: +# mcc: 009 +# mnc: 09 +# tac: 70, 80 +# +# +# <Access Control> +# +# If access_control is not specified, then all networks are allowed +# If access_control is defined, +# no other networks are allowed other than matching plmn_id. +# +# default_reject_cause may be used to overwrite the default error cause #11 +# for non matching plmn_id +# +# for matching plmn_id with reject_cause defined, +# the MME rejects access with the reject_cause error cause +# +# for matching plmn_id without reject_cause defined, +# the MME accepts the PLMN traffic +# +# o The example below only accepts 002/02 and 999/70 PLMNs. +# 001/01 is rejected with cause 15, +# and the rest of the PLMNs are rejected with default cause 13. +# +# mme: +# access_control: +# - default_reject_cause: 13 +# - plmn_id: +# reject_cause: 15 +# mcc: 001 +# mnc: 01 +# - plmn_id: +# mcc: 002 +# mnc: 02 +# - plmn_id: +# mcc: 999 +# mnc: 70 # # # <Network Name>
View file
open5gs_2.6.1.tar.xz/configs/open5gs/smf.yaml.in -> open5gs_2.6.2.tar.xz/configs/open5gs/smf.yaml.in
Changed
@@ -501,7 +501,7 @@ # - plmn_id: # mcc: 999 # mnc: 70 -# range: +# tac: # - 1-9 # - s_nssai: # - sst: 2 @@ -517,7 +517,7 @@ # - plmn_id: # mcc: 999 # mnc: 70 -# range: +# tac: # - 10-20 # - 30-40 # @@ -562,13 +562,13 @@ # - plmn_id: # mcc: 999 # mnc: 70 -# range: +# tac: # - 100-200 # - 300-400 # - plmn_id: # mcc: 999 # mnc: 70 -# range: +# tac: # - 500-600 # - 700-800 # - 900-1000 @@ -771,15 +771,10 @@ # # <UPF Selection> # -# o Round-Robin -# (note that round robin can be disabled for a particular node -# by setting flag 'rr' to 0) -# # upf: # pfcp: # - addr: 127.0.0.7 # - addr: 127.0.0.12 -# rr: 0 # - addr: 127.0.0.19 # # o UPF selection by eNodeB TAC
View file
open5gs_2.6.1.tar.xz/configs/sample.yaml.in -> open5gs_2.6.2.tar.xz/configs/sample.yaml.in
Changed
@@ -125,30 +125,6 @@ - identity: pcrf.localdomain addr: 127.0.0.9 -# -# <For Indirect Communication with Delegated Discovery> -# -# o (Default) If you do not set Delegated Discovery as shown below, -# -# sbi: -# - addr: 127.0.0.5 -# port: 7777 -# -# - Use SCP if SCP avaiable. Otherwise NRF is used. -# => App fails if both NRF and SCP are unavailable. -# -# sbi: -# - addr: 127.0.0.5 -# port: 7777 -# discovery: -# delegated: auto -# -# o To use SCP always => App fails if no SCP available. -# delegated: yes -# -# o Don't use SCP server => App fails if no NRF available. -# delegated: no -# amf: sbi: - addr: 127.0.0.5
View file
open5gs_2.6.1.tar.xz/debian/changelog -> open5gs_2.6.2.tar.xz/debian/changelog
Changed
@@ -1,3 +1,33 @@ +open5gs (2.6.2) unstable; urgency=medium + + * Bug Fixed + + -- Sukchan Lee <acetcom@gmail.com> Tue, 04 Apr 2023 22:02:19 +0900 + +open5gs (2.6.2~kinetic) kinetic; urgency=medium + + * Bug Fixed + + -- Sukchan Lee <acetcom@gmail.com> Tue, 04 Apr 2023 22:00:46 +0900 + +open5gs (2.6.2~jammy) jammy; urgency=medium + + * Bug Fixed + + -- Sukchan Lee <acetcom@gmail.com> Tue, 04 Apr 2023 21:59:16 +0900 + +open5gs (2.6.2~focal) focal; urgency=medium + + * Bug Fixed + + -- Sukchan Lee <acetcom@gmail.com> Tue, 04 Apr 2023 21:57:26 +0900 + +open5gs (2.6.2~bionic) bionic; urgency=medium + + * Bug Fixed + + -- Sukchan Lee <acetcom@gmail.com> Tue, 04 Apr 2023 21:54:48 +0900 + open5gs (2.6.1) unstable; urgency=medium * Upgrade to Release-17
View file
open5gs_2.6.1.tar.xz/docs/_docs/hardware/01-genodebs.md -> open5gs_2.6.2.tar.xz/docs/_docs/hardware/01-genodebs.md
Changed
@@ -9,6 +9,7 @@ ### Commercial 5G --- + * Airfill S5G AFBU-SL14CN (DU + CU) + AFRU-352-I Indoor Radio (n77 and n78) * Airspan 5G OpenRange vCU + Airspan 5G OpenRange vDU + Airspan 5G OpenRANGE06 AirVelocity 2700 RU * Airspan AirSpeed 2900 * Airspan AirStrand 2200
View file
open5gs_2.6.1.tar.xz/docs/_posts/2023-03-08-release-v2.6.1.md -> open5gs_2.6.2.tar.xz/docs/_posts/2023-03-08-release-v2.6.1.md
Changed
@@ -11,11 +11,11 @@ #### What's New? - Release 17 -- HTTP/2 over TLS (#754, #1865, #2058) -- Metrics Support using Prometheus (#1559) -- Frame Routing (#2009, #2022) -- UPF High Availability (#2048) -- 5G SUCI Profile A/B Scheme (#1443) +- HTTP/2 over TLS (#754(https://github.com/open5gs/open5gs/issues/743), #1865(https://github.com/open5gs/open5gs/issues/1865), #2058(https://github.com/open5gs/open5gs/issues/2058)) +- Metrics Support using Prometheus (#1559(https://github.com/open5gs/open5gs/issues/1559)) +- Frame Routing (#2009(https://github.com/open5gs/open5gs/pull/2009), #2022(https://github.com/open5gs/open5gs/pull/2022)) +- UPF High Availability (#2048(https://github.com/open5gs/open5gs/pull/2048)) +- 5G SUCI Profile A/B Scheme (#1143(https://github.com/open5gs/open5gs/pull/1143)) See also Release Note(https://github.com/open5gs/open5gs/releases/tag/v2.6.1)
View file
open5gs_2.6.1.tar.xz/lib/app/ogs-context.c -> open5gs_2.6.2.tar.xz/lib/app/ogs-context.c
Changed
@@ -57,7 +57,7 @@ initialized = 0; } -ogs_app_context_t *ogs_app() +ogs_app_context_t *ogs_app(void) { return &self; }
View file
open5gs_2.6.1.tar.xz/lib/core/ogs-hash.c -> open5gs_2.6.2.tar.xz/lib/core/ogs-hash.c
Changed
@@ -66,7 +66,7 @@ return ptr; } -ogs_hash_t *ogs_hash_make() +ogs_hash_t *ogs_hash_make(void) { ogs_hash_t *ht; ogs_time_t now = ogs_get_monotonic_time();
View file
open5gs_2.6.1.tar.xz/lib/dbi/ogs-mongoc.c -> open5gs_2.6.2.tar.xz/lib/dbi/ogs-mongoc.c
Changed
@@ -176,7 +176,7 @@ return OGS_OK; } -void ogs_dbi_final() +void ogs_dbi_final(void) { if (self.collection.subscriber) { mongoc_collection_destroy(self.collection.subscriber);
View file
open5gs_2.6.1.tar.xz/lib/gtp/v2/types.h -> open5gs_2.6.2.tar.xz/lib/gtp/v2/types.h
Changed
@@ -236,14 +236,19 @@ uint8_t _5g_srvcc_ho_indication:1;, uint8_t ethernet_pdn_support_indication:1;) -ED8(uint8_t spare1:1;, - uint8_t spare2:1;, - uint8_t spare3:1;, - uint8_t spare4:1;, +ED8(uint8_t notify_start_pause_of_charging_via_user_plane_support_indication:1;, + uint8_t pgw_redirection_due_to_mismatch_with_network_slice_subscribed_by_ue_support_indication:1;, + uint8_t restoration_of_pdn_connections_after_an_pgw_c_smf_change_support_indication:1;, + uint8_t pgw_change_indication:1;, uint8_t same_iwk_scef_selected_for_monitoring_event_indication:1;, uint8_t notify_source_enodeb_indication:1;, uint8_t indirect_data_forwarding_with_upf_indication:1;, uint8_t emergency_pdu_session_indication:1;) + +ED4(uint8_t spare1:5;, + uint8_t lte_m_satellite_access_indication:1;, + uint8_t satellite_rat_type_reporting_to_pgw_indication:1;, + uint8_t user_plane_integrity_protection_support_indication:1;) } __attribute__ ((packed)) ogs_gtp2_indication_t; /* 8.13 Protocol Configuration Options (PCO)
View file
open5gs_2.6.1.tar.xz/lib/ipfw/ipfw2.c -> open5gs_2.6.2.tar.xz/lib/ipfw/ipfw2.c
Changed
@@ -4944,7 +4944,7 @@ * Returns 0 on success. */ static void -ipfw_list_tifaces() +ipfw_list_tifaces(void) { ipfw_obj_lheader *olh = NULL; ipfw_iface_info *info;
View file
open5gs_2.6.1.tar.xz/lib/metrics/context.h -> open5gs_2.6.2.tar.xz/lib/metrics/context.h
Changed
@@ -33,6 +33,7 @@ typedef enum ogs_metrics_metric_type_s { OGS_METRICS_METRIC_TYPE_COUNTER, OGS_METRICS_METRIC_TYPE_GAUGE, + OGS_METRICS_METRIC_TYPE_HISTOGRAM, } ogs_metrics_metric_type_t; typedef struct ogs_metrics_context_s { @@ -42,6 +43,31 @@ uint16_t metrics_port; } ogs_metrics_context_t; +typedef enum ogs_metrics_histogram_bucket_type_s { + OGS_METRICS_HISTOGRAM_BUCKET_TYPE_VARIABLE, + OGS_METRICS_HISTOGRAM_BUCKET_TYPE_LINEAR, + OGS_METRICS_HISTOGRAM_BUCKET_TYPE_EXPONENTIAL, +} ogs_metrics_histogram_bucket_type_t; + +typedef struct ogs_metrics_histogram_bucket_params_s { + ogs_metrics_histogram_bucket_type_t type; + unsigned int count; +#define OGS_METRICS_HIST_VAR_BUCKETS_MAX 10 + union { + struct { + float start; + float width; + } lin; + struct { + float start; + float factor; + } exp; + struct { + float bucketsOGS_METRICS_HIST_VAR_BUCKETS_MAX; + } var; + }; +} ogs_metrics_histogram_params_t; + typedef struct ogs_metrics_context_s ogs_metrics_context_t; void ogs_metrics_context_init(void); void ogs_metrics_context_open(ogs_metrics_context_t *ctx); @@ -65,7 +91,8 @@ ogs_metrics_spec_t *ogs_metrics_spec_new( ogs_metrics_context_t *ctx, ogs_metrics_metric_type_t type, const char *name, const char *description, - int initial_val, unsigned int num_labels, const char **labels); + int initial_val, unsigned int num_labels, const char ** labels, + ogs_metrics_histogram_params_t *histogram_params); void ogs_metrics_spec_free(ogs_metrics_spec_t *spec); typedef struct ogs_metrics_inst_s ogs_metrics_inst_t;
View file
open5gs_2.6.1.tar.xz/lib/metrics/prometheus/context.c -> open5gs_2.6.2.tar.xz/lib/metrics/prometheus/context.c
Changed
@@ -339,11 +339,15 @@ ogs_metrics_spec_t *ogs_metrics_spec_new( ogs_metrics_context_t *ctx, ogs_metrics_metric_type_t type, const char *name, const char *description, - int initial_val, unsigned int num_labels, const char ** labels) + int initial_val, unsigned int num_labels, const char ** labels, + ogs_metrics_histogram_params_t *histogram_params) { ogs_metrics_spec_t *spec; unsigned int i; + prom_histogram_buckets_t *buckets; + double *upper_bounds; + ogs_assert(name); ogs_assert(description); ogs_assert(num_labels <= MAX_LABELS); @@ -372,6 +376,44 @@ spec->prom = prom_gauge_new(spec->name, spec->description, spec->num_labels, (const char **)spec->labels); break; + case OGS_METRICS_METRIC_TYPE_HISTOGRAM: + ogs_assert(histogram_params); + switch (histogram_params->type) { + case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_EXPONENTIAL: + buckets = prom_histogram_buckets_exponential(histogram_params->exp.start, + histogram_params->exp.factor, histogram_params->count); + ogs_assert(buckets); + break; + case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_LINEAR: + buckets = prom_histogram_buckets_linear(histogram_params->lin.start, + histogram_params->lin.width, histogram_params->count); + ogs_assert(buckets); + break; + case OGS_METRICS_HISTOGRAM_BUCKET_TYPE_VARIABLE: + buckets = (prom_histogram_buckets_t *)prom_malloc(sizeof(prom_histogram_buckets_t)); + ogs_assert(buckets); + + ogs_assert(histogram_params->count <= OGS_METRICS_HIST_VAR_BUCKETS_MAX); + buckets->count = histogram_params->count; + + upper_bounds = (double *)prom_malloc( + sizeof(double) * histogram_params->count); + ogs_assert(upper_bounds); + for (i = 0; i < histogram_params->count; i++) { + upper_boundsi = histogram_params->var.bucketsi; + if (i > 0) + ogs_assert(upper_boundsi > upper_boundsi - 1); + } + buckets->upper_bounds = upper_bounds; + break; + default: + ogs_assert_if_reached(); + break; + } + spec->prom = prom_histogram_new(spec->name, spec->description, + buckets, spec->num_labels, (const char **)spec->labels); + ogs_assert(spec->prom); + break; default: ogs_assert_if_reached(); break; @@ -477,6 +519,10 @@ else prom_gauge_sub(inst->spec->prom, (double)-1.0*(double)val, (const char **)inst->label_values); break; + case OGS_METRICS_METRIC_TYPE_HISTOGRAM: + ogs_assert(val >= 0); + prom_histogram_observe(inst->spec->prom, (double)val, (const char **)inst->label_values); + break; default: ogs_assert_if_reached(); break;
View file
open5gs_2.6.1.tar.xz/lib/metrics/void/context.c -> open5gs_2.6.2.tar.xz/lib/metrics/void/context.c
Changed
@@ -70,7 +70,8 @@ ogs_metrics_spec_t *ogs_metrics_spec_new( ogs_metrics_context_t *ctx, ogs_metrics_metric_type_t type, const char *name, const char *description, - int initial_val, unsigned int num_labels, const char ** labels) + int initial_val, unsigned int num_labels, const char ** labels, + ogs_metrics_histogram_params_t *histogram_params) { return (ogs_metrics_spec_t *)1; }
View file
open5gs_2.6.1.tar.xz/lib/nas/5gs/types.c -> open5gs_2.6.2.tar.xz/lib/nas/5gs/types.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -21,28 +21,30 @@ int ogs_nas_5gs_tai_list_build( ogs_nas_5gs_tracking_area_identity_list_t *target, - ogs_5gs_tai0_list_t *source0, ogs_5gs_tai2_list_t *source2) + ogs_5gs_tai0_list_t *source0, + ogs_5gs_tai1_list_t *source1, + ogs_5gs_tai2_list_t *source2) { int i = 0, j = 0, size = 0; ogs_5gs_tai0_list_t target0; + ogs_5gs_tai1_list_t target1; ogs_5gs_tai2_list_t target2; ogs_nas_plmn_id_t ogs_nas_plmn_id; ogs_assert(target); - ogs_assert(source0); - ogs_assert(source2); memset(target, 0, sizeof(ogs_nas_5gs_tracking_area_identity_list_t)); memset(&target0, 0, sizeof(ogs_5gs_tai0_list_t)); + memset(&target1, 0, sizeof(ogs_5gs_tai1_list_t)); memset(&target2, 0, sizeof(ogs_5gs_tai2_list_t)); - for (i = 0; source0->taii.num; i++) { + for (i = 0; source0 && source0->taii.num; i++) { ogs_assert(source0->taii.type == OGS_TAI0_TYPE); target0.taii.type = source0->taii.type; /* <Spec> target->num = source->num - 1 */ - ogs_assert(source0->taii.num < OGS_MAX_NUM_OF_TAI); + ogs_assert(source0->taii.num <= OGS_MAX_NUM_OF_TAI); target0.taii.num = source0->taii.num - 1; memcpy(&target0.taii.plmn_id, ogs_nas_from_plmn_id(&ogs_nas_plmn_id, &source0->taii.plmn_id), @@ -62,15 +64,37 @@ target->length += size; } - if (source2->num) { + for (i = 0; source1 && source1->taii.num; i++) { + ogs_assert(source1->taii.type == OGS_TAI1_TYPE); + target1.taii.type = source1->taii.type; + + /* <Spec> target->num = source->num - 1 */ + ogs_assert(source1->taii.num <= OGS_MAX_NUM_OF_TAI); + target1.taii.num = source1->taii.num - 1; + memcpy(&target1.taii.plmn_id, + ogs_nas_from_plmn_id(&ogs_nas_plmn_id, &source1->taii.plmn_id), + OGS_PLMN_ID_LEN); + + target1.taii.tac = ogs_htobe24(source1->taii.tac); + + size = (1 + 3 + 3); + if ((target->length + size) > OGS_NAS_5GS_MAX_TAI_LIST_LEN) { + ogs_error("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", + target->length, size); + return OGS_ERROR; + } + memcpy(target->buffer + target->length, &target1.taii, size); + target->length += size; + } + + if (source2 && source2->num) { memset(&target2, 0, sizeof(target2)); - ogs_assert(source2->type == OGS_TAI1_TYPE || - source2->type == OGS_TAI2_TYPE); + ogs_assert(source2->type == OGS_TAI2_TYPE); target2.type = source2->type; /* <Spec> target->num = source->num - 1 */ - ogs_assert(source2->num < OGS_MAX_NUM_OF_TAI); + ogs_assert(source2->num <= OGS_MAX_NUM_OF_TAI); target2.num = source2->num - 1; size = (1 + (3 + 3) * source2->num);
View file
open5gs_2.6.1.tar.xz/lib/nas/5gs/types.h -> open5gs_2.6.2.tar.xz/lib/nas/5gs/types.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -104,12 +104,30 @@ uint8_t v2x_capability:1;, uint8_t up_ciot_5gs_optimization:1;, uint8_t srvcc_5g_capability:1;) -ED5(uint8_t spare4:4;, +ED8(uint8_t fiveg_prose_layer_2_ue_to_network_relay:1;, + uint8_t fiveg_prose_direct_communication:1;, + uint8_t fiveg_prose_direct_discovery:1;, + uint8_t extended_rejected_nssai_support:1;, uint8_t ethernet_header_compression_cp_ciot_5gs_optimization:1;, uint8_t multiple_user_plane_resource_support:1;, uint8_t wusa_information_reception_capability:1;, uint8_t closed_access_group_capability:1;) - uint8_t spare10; +ED8(uint8_t paging_restriction:1;, + uint8_t reject_paging_request:1;, + uint8_t paging_indication_for_voice_services:1;, + uint8_t n1_nas_signalling_connection_release:1;, + uint8_t nr_paging_subgroup_support_indication:1;, + uint8_t five_prose_layer_3_ue_to_network_remote:1;, + uint8_t five_prose_layer_2_ue_to_network_remote:1;, + uint8_t five_prose_layer_3_ue_to_network_relay:1;) +ED7(uint8_t spare1:2;, + uint8_t nsag:1;, + uint8_t extended_cag_information_list_support:1;, + uint8_t sor_snpn_si:1;, + uint8_t event_notification:1;, + uint8_t minimization_of_service_interruption:1;, + uint8_t nssrg:1;) + uint8_t spare28; } __attribute__ ((packed)) ogs_nas_5gmm_capability_t; /* 9.11.3.2 5GMM cause @@ -240,24 +258,38 @@ * M LV 2 */ typedef struct ogs_nas_5gs_network_feature_support_s { uint8_t length; -ED6(uint8_t mpsi:1;, - uint8_t iwk_n26:1;, - uint8_t emf:2;, - uint8_t msc:2;, - uint8_t ims_vops_n3gpp:1;, - uint8_t ims_vops_3gpp:1;) -ED3(uint8_t spare:6;, - uint8_t mcsi:1;, - uint8_t emcn :1;) - uint8_t spare2; +ED6(uint8_t mps_indicator:1;, + uint8_t interworking_without_n26_interface_indicator:1;, + uint8_t emergency_services_fallback_indicator_for_3gpp_access:2;, + uint8_t emergency_service_support_indicator_for_3gpp_access:2;, + uint8_t ims_voice_over_ps_session_over_non_3gpp_access_indicator:1;, + uint8_t ims_voice_over_ps_session_over_3gpp_access_indicator:1;) +ED7(uint8_t user_plane_ciot_5gs_optimization:1;, + uint8_t ip_header_compression_for_control_plane_ciot_5gs_optimization:1;, + uint8_t n3_data_transfer:1;, + uint8_t control_plane_ciot_5gs_optimization:1;, + uint8_t restriction_on_enhanced_coverage:2;, + uint8_t mcs_indicator:1;, + uint8_t emergency_service_support_for_non_3gpp_access_indicator:1;) +ED8(uint8_t spare:1;, + uint8_t paging_restriction:1;, + uint8_t reject_paging_request:1;, + uint8_t paging_indication_for_voice_services:1;, + uint8_t n1_nas_signalling_connection_release:1;, + uint8_t ethernet_header_compression_for_control_plane_ciot_5gs_optimization:1;, + uint8_t atsss_support_indicator:1;, + uint8_t location_services_indicator_in_5gc:1;) } ogs_nas_5gs_network_feature_support_t; /* 9.11.3.6 5GS registration result * O TLV 3-5 */ typedef struct ogs_nas_5gs_registration_result_s { uint8_t length; -ED3(uint8_t spare:4;, - uint8_t sms_allowed:1;, +ED6(uint8_t spare:1;, + uint8_t disaster_roaming_registration_result_value:1;, + uint8_t emergency_registered:1;, + uint8_t network_slice_specific_authentication_and_authorization_is_to_be_performed:1;, + uint8_t sms_over_nas_transport_allowed:1;, uint8_t value:3;) } ogs_nas_5gs_registration_result_t; @@ -307,6 +339,22 @@ } __attribute__ ((packed)) taiOGS_MAX_NUM_OF_TAI; } __attribute__ ((packed)) ogs_5gs_tai0_list_t; +typedef struct ogs_5gs_tai1_list_s { + struct { + ED3(uint8_t spare:1;, + uint8_t type:2;, + uint8_t num:5;) + /* + * Do not change 'ogs_plmn_id_t' to 'ogs_nas_plmn_id_t'. + * Use 'ogs_plmn_id_t' for easy implementation. + * ogs_nas_tai_list_build() changes to NAS format(ogs_nas_plmn_id_t) + * and is sent to the UE. + */ + ogs_plmn_id_t plmn_id; + ogs_uint24_t tac; + } __attribute__ ((packed)) taiOGS_MAX_NUM_OF_TAI; +} __attribute__ ((packed)) ogs_5gs_tai1_list_t; + typedef struct ogs_5gs_tai2_list_s { ED3(uint8_t spare:1;, uint8_t type:2;, @@ -328,7 +376,9 @@ int ogs_nas_5gs_tai_list_build( ogs_nas_5gs_tracking_area_identity_list_t *target, - ogs_5gs_tai0_list_t *source0, ogs_5gs_tai2_list_t *source2); + ogs_5gs_tai0_list_t *source0, + ogs_5gs_tai1_list_t *source1, + ogs_5gs_tai2_list_t *source2); /* 9.11.3.9A 5GS update type * O TLV 3 */ @@ -373,6 +423,7 @@ typedef struct ogs_nas_allowed_pdu_session_status_s { uint8_t length; uint16_t psi; + uint8_t spare30; } __attribute__ ((packed)) ogs_nas_allowed_pdu_session_status_t; /* 9.11.3.18 Configuration update indication @@ -430,6 +481,7 @@ } ogs_nas_eps_nas_message_container_t; /* 9.11.3.25 EPS NAS security algorithms + * See subclause 9.9.3.23 in 3GPP TS 24.301 15. * O TV 2 */ typedef ogs_nas_security_algorithms_t ogs_nas_eps_nas_security_algorithms_t; @@ -482,8 +534,8 @@ typedef struct ogs_nas_network_slicing_indication_s { ED4(uint8_t type:4;, uint8_t spare:2;, - uint8_t dcni:1;, - uint8_t nssci:1;) + uint8_t default_configured_nssai_indication:1;, + uint8_t network_slicing_subscription_change_indication:1;) } __attribute__ ((packed)) ogs_nas_network_slicing_indication_t; /* 9.11.3.37 NSSAI @@ -622,13 +674,14 @@ } ogs_nas_sor_transparent_container_t; /* 9.11.3.48 S1 UE network capability + * See subclause 9.9.3.34 in 3GPP TS 24.301 15. * O TLV 4-15 */ typedef ogs_nas_ue_network_capability_t ogs_nas_s1_ue_network_capability_t; -/* 9.9.3.36 UE security capability - * M LV 3-6 - * 9.11.3.48A S1 UE security capability - * O TLV 4-7 */ +/* 9.11.3.48A S1 UE security capability + * O TLV 4-7 + * 9.9.3.36 UE security capability + * M LV 3-6 */ typedef ogs_nas_ue_security_capability_t ogs_nas_s1_ue_security_capability_t; /* 9.11.3.55 UE usage setting @@ -707,11 +760,7 @@ /* 9.11.3.81 5GS additional request result * O TLV 3 */ -typedef struct ogs_nas_5gs_additional_request_result_s { - uint8_t length; -ED2(uint8_t spare:6;, - uint8_t prd:2;) -} __attribute__ ((packed)) ogs_nas_5gs_additional_request_result_t; +typedef struct ogs_nas_additional_request_result_s ogs_nas_5gs_additional_request_result_t; /* 9.11.3.82 NSSRG information * O TLV-E 7-65538 */ @@ -759,16 +808,23 @@ /* 9.11.3.91 Priority indicator * O TV 1 */ typedef struct ogs_nas_priority_indicator_s { - uint8_t type; +ED3(uint8_t type:4;, + uint8_t spare:1;, + uint8_t mps_indicator:3;) } __attribute__ ((packed)) ogs_nas_priority_indicator_t; /* 9.11.4.1 5GSM capability * O TLV 3-15 */ typedef struct ogs_nas_5gsm_capability_s { uint8_t length; -ED3(uint8_t spare:6;, - uint8_t mh6_pdu:1;, - uint8_t rqos:1;) +ED5(uint8_t transfer_of_port_management_information_containers:1;, + uint8_t supported_atsss_steering_functionalities_and_steering_modes:4;, + uint8_t ethernet_pdn_type_in_s1_mode:1;, + uint8_t multi_homed_ipv6_pdu_session:1;, + uint8_t reflective_QoS:1;) +ED2(uint8_t spare1:7;, + uint8_t access_performance_measurements_per_qos_flow_rule:1;) + uint8_t spare211; } __attribute__ ((packed)) ogs_nas_5gsm_capability_t; /* 9.11.4.2 5GSM cause @@ -827,16 +883,17 @@ * O TLV 3 */ typedef struct ogs_nas_5gsm_congestion_re_attempt_indicator_s { uint8_t length; -ED2(uint8_t spare:7;, - uint8_t abo:1;) +ED3(uint8_t spare:6;, + uint8_t current_access_type_back_off_timer:1;, + uint8_t all_plmns_back_off_timer:1;) } __attribute__ ((packed)) ogs_nas_5gsm_congestion_re_attempt_indicator_t; /* 9.11.4.3 Always-on PDU session indication * O TV 1 */ typedef struct ogs_nas_always_on_pdu_session_indication_s { ED3(uint8_t type:4;, - uint8_t spare:1;, - uint8_t apsi:3;) + uint8_t spare:3;, + uint8_t always_on_pdu_session_indication:1;) } __attribute__ ((packed)) ogs_nas_always_on_pdu_session_indication_t; /* 9.11.4.4 Always-on PDU session requested @@ -844,7 +901,7 @@ typedef struct ogs_nas_always_on_pdu_session_requested_s { ED3(uint8_t type:4;, uint8_t spare:3;, - uint8_t apsr:1;) + uint8_t always_on_pdu_session_requested:1;) } __attribute__ ((packed)) ogs_nas_always_on_pdu_session_requested_t; /* 9.11.4.5 Allowed SSC mode @@ -1036,7 +1093,7 @@ typedef struct ogs_nas_5gsm_network_feature_support_s { uint8_t length; ED2(uint8_t spare1:7;, - uint8_t s1:1;) + uint8_t ethernet_pdn_type_in_s1_mode:1;) uint8_t spare212; } __attribute__ ((packed)) ogs_nas_5gsm_network_feature_support_t;
View file
open5gs_2.6.1.tar.xz/lib/nas/common/types.h -> open5gs_2.6.2.tar.xz/lib/nas/common/types.h
Changed
@@ -495,6 +495,18 @@ uint8_t retstriction_on_use_of_enhanced_coverage:1;, uint8_t v2x_communication_over_pc5:1;, uint8_t multiple_drb:1;) +ED8(uint8_t reject_paging_request:1;, + uint8_t paging_indication_for_voice_services:1;, + uint8_t nas_signalling_connection_release:1;, + uint8_t v2x_communication_over_nr_pc5:1;, + uint8_t user_plane_mobile_terminated_early_data_transmission:1;, + uint8_t control_plane_mobile_terminated_early_data_transmission:1;, + uint8_t wake_up_signal_assistance:1;, + uint8_t radio_capability_signalling_optimisation_capability:1;) +ED3(uint8_t spare1:6;, + uint8_t paging_timing_collision_control:1;, + uint8_t paging_restriction:1;) + char spare24; } __attribute__ ((packed)) ogs_nas_ue_network_capability_t; /* 9.9.3.36 UE security capability @@ -711,6 +723,7 @@ uint8_t length; ED2(uint8_t paging_time_window:4;, uint8_t e_drx_value:4;) + uint8_t extended_paging_time_window; } __attribute__ ((packed)) ogs_nas_extended_drx_parameters_t; /* 9.9.3.60 UE radio capability ID @@ -751,10 +764,25 @@ uint8_t length; ED2(uint8_t spare1:4;, uint8_t type:4;) - uint16_t ebi; + union { + uint16_t ebi; + uint16_t psimask; + }; uint8_t spare230; } __attribute__ ((packed)) ogs_nas_paging_restriction_t; +/* 9.9.3.67 EPS additional request result + * 9.11.3.81 5GS additional request result + * O TLV 3 */ +#define OGS_NAS_ADDITIONAL_REQUEST_RESULT_NO_ADDITIONAL_INFORMATION 0 +#define OGS_NAS_ADDITIONAL_REQUEST_RESULT_PAGING_RESTRICTION_IS_ACCEPTED 1 +#define OGS_NAS_ADDITIONAL_REQUEST_RESULT_PAGING_RESTRICTION_IS_REJECTED 2 +typedef struct ogs_nas_additional_request_result_s { + uint8_t length; +ED2(uint8_t spare:6;, + uint8_t paging_restriction_decision:2;) +} __attribute__ ((packed)) ogs_nas_additional_request_result_t; + /* 9.9.4.2 APN aggregate maximum bit rate * O TLV 4-8 */ typedef struct ogs_nas_apn_aggregate_maximum_bit_rate_s { @@ -803,7 +831,8 @@ #define OGS_NAS_PDU_ADDRESS_IPV4V6_LEN 13 typedef struct ogs_nas_pdu_address_s { uint8_t length; -ED2(uint8_t reserved:5;, +ED3(uint8_t spare:4;, + uint8_t smf_ipv6_link_local_address_presence:1;, uint8_t pdn_type:3;) union { uint32_t addr; @@ -849,8 +878,8 @@ typedef struct ogs_nas_re_attempt_indicator_s { uint8_t length; ED3(uint8_t spare:3;, /* allowed in A/Gb mode or Iu mode */ - uint8_t eplmnc:1;, /* allowed in an equivalent PLMN */ - uint8_t ratc:1;) + uint8_t ue_is_not_allowed_to_re_attempt_the_procedure_in_an_equivalent_plmn:1;, + uint8_t ue_is_not_allowed_to_re_attempt_the_procedure_in_A_Gb_mode_or_Iu_mode_or_N1:1;) } __attribute__ ((packed)) ogs_nas_re_attempt_indicator_t; /* 9.9.4.19 NBIFOM container @@ -908,22 +937,7 @@ * O TLV 4 */ typedef struct ogs_nas_serving_plmn_rate_control_s { uint8_t length; -ED8(uint8_t ebi7:1;, - uint8_t ebi6:1;, - uint8_t ebi5:1;, - uint8_t ebi4:1;, - uint8_t ebi3:1;, - uint8_t ebi2:1;, - uint8_t ebi1:1;, - uint8_t ebi0:1;) -ED8(uint8_t ebi15:1;, - uint8_t ebi14:1;, - uint8_t ebi13:1;, - uint8_t ebi12:1;, - uint8_t ebi11:1;, - uint8_t ebi10:1;, - uint8_t ebi9:1;, - uint8_t ebi8:1;) + uint16_t value; } __attribute__ ((packed)) ogs_nas_serving_plmn_rate_control_t; /* 9.9.4.29 Extended APN aggregate maximum bit rate
View file
open5gs_2.6.1.tar.xz/lib/nas/eps/types.c -> open5gs_2.6.2.tar.xz/lib/nas/eps/types.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -19,29 +19,32 @@ #include "ogs-nas-eps.h" -int ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, - ogs_eps_tai0_list_t *source0, ogs_eps_tai2_list_t *source2) +int ogs_nas_tai_list_build( + ogs_nas_tracking_area_identity_list_t *target, + ogs_eps_tai0_list_t *source0, + ogs_eps_tai1_list_t *source1, + ogs_eps_tai2_list_t *source2) { int i = 0, j = 0, size = 0; ogs_eps_tai0_list_t target0; + ogs_eps_tai1_list_t target1; ogs_eps_tai2_list_t target2; ogs_nas_plmn_id_t ogs_nas_plmn_id; ogs_assert(target); - ogs_assert(source0); - ogs_assert(source2); memset(target, 0, sizeof(ogs_nas_tracking_area_identity_list_t)); memset(&target0, 0, sizeof(ogs_eps_tai0_list_t)); + memset(&target1, 0, sizeof(ogs_eps_tai1_list_t)); memset(&target2, 0, sizeof(ogs_eps_tai2_list_t)); - for (i = 0; source0->taii.num; i++) { + for (i = 0; source0 && source0->taii.num; i++) { ogs_assert(source0->taii.type == OGS_TAI0_TYPE); target0.taii.type = source0->taii.type; /* <Spec> target->num = source->num - 1 */ - ogs_assert(source0->taii.num < OGS_MAX_NUM_OF_TAI); + ogs_assert(source0->taii.num <= OGS_MAX_NUM_OF_TAI); target0.taii.num = source0->taii.num - 1; memcpy(&target0.taii.plmn_id, ogs_nas_from_plmn_id(&ogs_nas_plmn_id, &source0->taii.plmn_id), @@ -61,15 +64,37 @@ target->length += size; } - if (source2->num) { + for (i = 0; source1 && source1->taii.num; i++) { + ogs_assert(source1->taii.type == OGS_TAI1_TYPE); + target1.taii.type = source1->taii.type; + + /* <Spec> target->num = source->num - 1 */ + ogs_assert(source1->taii.num <= OGS_MAX_NUM_OF_TAI); + target1.taii.num = source1->taii.num - 1; + memcpy(&target1.taii.plmn_id, + ogs_nas_from_plmn_id(&ogs_nas_plmn_id, &source1->taii.plmn_id), + OGS_PLMN_ID_LEN); + + target1.taii.tac = htobe16(source1->taii.tac); + + size = (1 + 3 + 2); + if ((target->length + size) > OGS_NAS_EPS_MAX_TAI_LIST_LEN) { + ogs_error("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", + target->length, size); + return OGS_ERROR; + } + memcpy(target->buffer + target->length, &target1.taii, size); + target->length += size; + } + + if (source2 && source2->num) { memset(&target2, 0, sizeof(target2)); - ogs_assert(source2->type == OGS_TAI1_TYPE || - source2->type == OGS_TAI2_TYPE); + ogs_assert(source2->type == OGS_TAI2_TYPE); target2.type = source2->type; /* <Spec> target->num = source->num - 1 */ - ogs_assert(source2->num < OGS_MAX_NUM_OF_TAI); + ogs_assert(source2->num <= OGS_MAX_NUM_OF_TAI); target2.num = source2->num - 1; size = (1 + (3 + 2) * source2->num);
View file
open5gs_2.6.1.tar.xz/lib/nas/eps/types.h -> open5gs_2.6.2.tar.xz/lib/nas/eps/types.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -122,7 +122,7 @@ /*9.9.2.5 Mobile station classmark 3 * See subclause 10.5.1.7 in 3GPP TS 24.008 13. * O TLV 2-34 */ -#define OGS_NAS_MAX_MOBILE_STATION_CLASSMARK_3_LEN 32 +#define OGS_NAS_MAX_MOBILE_STATION_CLASSMARK_3_LEN 33 typedef struct ogs_nas_mobile_station_classmark_3_s { uint8_t length; uint8_t bufferOGS_NAS_MAX_MOBILE_STATION_CLASSMARK_3_LEN; @@ -144,9 +144,9 @@ #define OGS_NAS_ADDITIONAL_UPDATE_TYPE_CIOT_RESERVED 3 typedef struct ogs_nas_additional_update_type_s { ED4(uint8_t type:4;, - uint8_t pnb_ciot:2;, - uint8_t saf:1;, - uint8_t autv:1;) + uint8_t preferred_ciot_network_behaviour:2;, + uint8_t signalling_active_flag:1;, + uint8_t additional_update_type_value:1;) } __attribute__ ((packed)) ogs_nas_additional_update_type_t; /* 9.9.3.4a Ciphering key sequence number @@ -343,6 +343,12 @@ uint8_t header_compression_for_control_plan_ciot_eps_optimization:1;, uint8_t s1_u_data_transfer:1;, uint8_t user_plane_ciot_eps_optimization :1;) +ED6(uint8_t spare:3;, + uint8_t paging_timing_collision_control:1;, + uint8_t paging_restriction:1;, + uint8_t reject_paging_request:1;, + uint8_t paging_indication_for_voice_services:1;, + uint8_t nas_signalling_connection_release:1;) } __attribute__ ((packed)) ogs_nas_eps_network_feature_support_t; /* 9.9.3.13 EPS update result @@ -426,12 +432,15 @@ uint8_t epc_capability:1;, uint8_t nf_capability:1;, uint8_t geran_network_sharing_capability:1;) -ED6(uint8_t user_plane_integrity_protection_support:1;, +ED8(uint8_t user_plane_integrity_protection_support:1;, uint8_t gia4:1;, uint8_t gia5:1;, uint8_t gia6:1;, uint8_t gia7:1;, - uint8_t spare:3;) + uint8_t epco_ie_indicator:1;, + uint8_t restriction_on_usex_of_enhanced_coverage_capability:1;, + uint8_t dual_connectivity_of_e_utra_with_nr_capability:1;) + uint8_t spare24; } __attribute__ ((packed)) ogs_nas_ms_network_capability_t; /* 9.9.3.20A MS network feature support @@ -537,6 +546,22 @@ } __attribute__ ((packed)) taiOGS_MAX_NUM_OF_TAI; } __attribute__ ((packed)) ogs_eps_tai0_list_t; +typedef struct ogs_eps_tai1_list_s { + struct { + ED3(uint8_t spare:1;, + uint8_t type:2;, + uint8_t num:5;) + /* + * Do not change 'ogs_plmn_id_t' to 'ogs_nas_plmn_id_t'. + * Use 'ogs_plmn_id_t' for easy implementation. + * ogs_nas_tai_list_build() changes to NAS format(ogs_nas_plmn_id_t) + * and is sent to the UE. + */ + ogs_plmn_id_t plmn_id; + uint16_t tac; + } __attribute__ ((packed)) taiOGS_MAX_NUM_OF_TAI; +} __attribute__ ((packed)) ogs_eps_tai1_list_t; + typedef struct ogs_eps_tai2_list_s { ED3(uint8_t spare:1;, uint8_t type:2;, @@ -556,8 +581,11 @@ uint8_t bufferOGS_NAS_EPS_MAX_TAI_LIST_LEN; } __attribute__ ((packed)) ogs_nas_tracking_area_identity_list_t; -int ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, - ogs_eps_tai0_list_t *source0, ogs_eps_tai2_list_t *source2); +int ogs_nas_tai_list_build( + ogs_nas_tracking_area_identity_list_t *target, + ogs_eps_tai0_list_t *source0, + ogs_eps_tai1_list_t *source1, + ogs_eps_tai2_list_t *source2); /* 9.9.3.35 UE radio capability information update needed @@ -779,11 +807,7 @@ /* 9.9.3.67 EPS additional request result * O TLV 3 */ -typedef struct ogs_nas_eps_additional_request_result_s { - uint8_t length; -ED2(uint8_t spare:6;, - uint8_t prd:2;) -} __attribute__ ((packed)) ogs_nas_eps_additional_request_result_t; +typedef struct ogs_nas_additional_request_result_s ogs_nas_eps_additional_request_result_t; /* 9.9.4.1 Access point name * See subclause 10.5.6.1 in 3GPP TS 24.008 13.
View file
open5gs_2.6.1.tar.xz/lib/pfcp/build.c -> open5gs_2.6.2.tar.xz/lib/pfcp/build.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -36,7 +36,7 @@ req = &pfcp_message->pfcp_heartbeat_request; req->recovery_time_stamp.presence = 1; - req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started; + req->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery; pfcp_message->h.type = type; pkbuf = ogs_pfcp_build_msg(pfcp_message); @@ -64,7 +64,7 @@ rsp = &pfcp_message->pfcp_heartbeat_response; rsp->recovery_time_stamp.presence = 1; - rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started; + rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery; pfcp_message->h.type = type; pkbuf = ogs_pfcp_build_msg(pfcp_message); @@ -105,7 +105,7 @@ req->node_id.len = node_id_len; req->recovery_time_stamp.presence = 1; - req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started; + req->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery; req->cp_function_features.presence = 1; req->cp_function_features.u8 = ogs_pfcp_self()->cp_function_features.octet5; @@ -153,7 +153,7 @@ rsp->cause.u8 = cause; rsp->recovery_time_stamp.presence = 1; - rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started; + rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery; rsp->cp_function_features.presence = 1; rsp->cp_function_features.u8 = ogs_pfcp_self()->cp_function_features.octet5; @@ -202,7 +202,7 @@ req->node_id.len = node_id_len; req->recovery_time_stamp.presence = 1; - req->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started; + req->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery; ogs_assert(ogs_pfcp_self()->up_function_features_len); req->up_function_features.presence = 1; @@ -273,7 +273,7 @@ rsp->cause.u8 = cause; rsp->recovery_time_stamp.presence = 1; - rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->pfcp_started; + rsp->recovery_time_stamp.u32 = ogs_pfcp_self()->local_recovery; ogs_assert(ogs_pfcp_self()->up_function_features_len); rsp->up_function_features.presence = 1;
View file
open5gs_2.6.1.tar.xz/lib/pfcp/context.c -> open5gs_2.6.2.tar.xz/lib/pfcp/context.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -44,7 +44,7 @@ /* Initialize SMF context */ memset(&self, 0, sizeof(ogs_pfcp_context_t)); - self.pfcp_started = ogs_time_ntp32_now(); + self.local_recovery = ogs_time_ntp32_now(); ogs_log_install_domain(&__ogs_pfcp_domain, "pfcp", ogs_core()->log.level); @@ -447,16 +447,13 @@ const char *hostnameOGS_MAX_NUM_OF_HOSTNAME; uint16_t port = self.pfcp_port; uint16_t tacOGS_MAX_NUM_OF_TAI = {0,}; - uint8_t num_of_tac = 0; + int num_of_tac = 0; const char *dnnOGS_MAX_NUM_OF_DNN; - uint8_t num_of_dnn = 0; + int num_of_dnn = 0; uint32_t e_cell_idOGS_MAX_NUM_OF_CELL_ID = {0,}; - uint8_t num_of_e_cell_id = 0; + int num_of_e_cell_id = 0; uint64_t nr_cell_idOGS_MAX_NUM_OF_CELL_ID = {0,}; - uint8_t num_of_nr_cell_id = 0; - - /* full list RR enabled by default */ - uint8_t rr_enable = 1; + int num_of_nr_cell_id = 0; if (ogs_yaml_iter_type(&pfcp_array) == YAML_MAPPING_NODE) { @@ -621,9 +618,6 @@ } while ( ogs_yaml_iter_type(&nr_cell_id_iter) == YAML_SEQUENCE_NODE); - } else if (!strcmp(pfcp_key, "rr")) { - const char *v = ogs_yaml_iter_value(&pfcp_iter); - if (v) rr_enable = atoi(v); } else ogs_warn("unknown key `%s`", pfcp_key); } @@ -664,7 +658,6 @@ memcpy(node->nr_cell_id, nr_cell_id, sizeof(node->nr_cell_id)); - node->rr_enable = rr_enable; } while (ogs_yaml_iter_type(&pfcp_array) == YAML_SEQUENCE_NODE); }
View file
open5gs_2.6.1.tar.xz/lib/pfcp/context.h -> open5gs_2.6.2.tar.xz/lib/pfcp/context.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -55,7 +55,7 @@ ogs_sockaddr_t *pfcp_addr; /* PFCP IPv4 Address */ ogs_sockaddr_t *pfcp_addr6; /* PFCP IPv6 Address */ - uint32_t pfcp_started; /* UTC time when the PFCP entity started */ + uint32_t local_recovery; /* UTC time */ /* CP Function Features */ ogs_pfcp_cp_function_features_t cp_function_features; @@ -105,8 +105,8 @@ uint64_t nr_cell_idOGS_MAX_NUM_OF_CELL_ID; uint8_t num_of_nr_cell_id; - /* flag to enable/ disable full list RR for this node */ - uint8_t rr_enable; + uint32_t remote_recovery; /* UTC time */ + bool restoration_required; ogs_list_t gtpu_resource_list; /* User Plane IP Resource Information */
View file
open5gs_2.6.1.tar.xz/lib/pfcp/handler.c -> open5gs_2.6.2.tar.xz/lib/pfcp/handler.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -24,7 +24,27 @@ ogs_pfcp_heartbeat_request_t *req) { int rv; + ogs_assert(node); ogs_assert(xact); + ogs_assert(req); + + if (req->recovery_time_stamp.presence == 0) { + ogs_error("No Recovery Time Stamp"); + return false; + } + + if (node->remote_recovery == 0 || + node->remote_recovery == req->recovery_time_stamp.u32) { + } else if (node->remote_recovery < req->recovery_time_stamp.u32) { + ogs_error("Remote PFCP restarted %u<%u in Heartbeat REQ", + node->remote_recovery, req->recovery_time_stamp.u32); + node->restoration_required = true; + } else if (node->remote_recovery > req->recovery_time_stamp.u32) { + ogs_error("Invalid Recovery Time Stamp %u>%u in Heartbeat REQ", + node->remote_recovery, req->recovery_time_stamp.u32); + } + + node->remote_recovery = req->recovery_time_stamp.u32; rv = ogs_pfcp_send_heartbeat_response(xact); if (rv != OGS_OK) { @@ -39,9 +59,30 @@ ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_heartbeat_response_t *rsp) { + ogs_assert(node); ogs_assert(xact); + ogs_assert(rsp); + ogs_pfcp_xact_commit(xact); + if (rsp->recovery_time_stamp.presence == 0) { + ogs_error("No Recovery Time Stamp"); + return false; + } + + if (node->remote_recovery == 0 || + node->remote_recovery == rsp->recovery_time_stamp.u32) { + } else if (node->remote_recovery < rsp->recovery_time_stamp.u32) { + ogs_error("Remote PFCP restarted %u<%u in Heartbeat RSP", + node->remote_recovery, rsp->recovery_time_stamp.u32); + node->restoration_required = true; + } else if (node->remote_recovery > rsp->recovery_time_stamp.u32) { + ogs_error("Invalid Recovery Time Stamp %u>%u in Heartbeat RSP", + node->remote_recovery, rsp->recovery_time_stamp.u32); + } + + node->remote_recovery = rsp->recovery_time_stamp.u32; + ogs_timer_start(node->t_no_heartbeat, ogs_app()->time.message.pfcp.no_heartbeat_duration);
View file
open5gs_2.6.1.tar.xz/lib/pfcp/handler.h -> open5gs_2.6.2.tar.xz/lib/pfcp/handler.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. *
View file
open5gs_2.6.1.tar.xz/lib/pfcp/path.c -> open5gs_2.6.2.tar.xz/lib/pfcp/path.c
Changed
@@ -193,6 +193,15 @@ rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + /* + * Force delete the PFCP transaction to check the PFCP recovery timestamp. + * + * Otherwise, duplicated request (lib/pfcp/xact.c:384) prevents the message + * from being passed to the state machine, so the PFCP recovery timestamp + * cannot be delivered in the handler routine. + */ + ogs_pfcp_xact_delete(xact); + return rv; }
View file
open5gs_2.6.1.tar.xz/lib/pfcp/types.h -> open5gs_2.6.2.tar.xz/lib/pfcp/types.h
Changed
@@ -284,14 +284,85 @@ union { struct { /* + * 10/8 DNSTS N4 + * UP function support DNS Traffic Steering based on + * FQDN in the DNS Query message (see + * clause 5.33.4) + * 10/7 IPREP N4 + * UP function supports IP Address and Port number + * replacement (see clause 5.33.3). + * 10/6 RESPS Sxb, N4 + * UP function supports Restoration of PFCP Sessions + * associated with one or more PGW-C/SMF FQ- + * CSID(s), Group Id(s) or CP IP address(es) (see + * clause 5.22.4) + * 10/5 UPBER N4 + * UP function supports the uplink packets buffering + * during EAS relocation. + * 10/4 L2TP Sxb, N4 + * UP function supports the L2TP feature as described + * in clause 5.31. + * 10/3 NSPOC Sxa, Sxb, N4 + * UP function supports notifying start of Pause of + * Charging via user plane. + * 10/2 QUASF Sxb, Sxc, N4 + * The UP function supports being provisioned in a + * URR with an Exempted Application ID for Quota + * Action or an Exempted SDF Filter for Quota Action + * which is to be used when the quota is exhausted. + * See also clauses 5.2.2.2.1 and 5.2.2.3.1. * 10/1 RTTWP N4 * UPF support of RTT measurements towards the UE Without PMF. */ -ED2(uint8_t reserved:7;, +ED8(uint8_t dnsts:1;, + uint8_t iprep:1;, + uint8_t resps:1;, + uint8_t upber:1;, + uint8_t l2tp:1;, + uint8_t nspoc:1;, + uint8_t quasf:1;, uint8_t rttwp:1;) }; uint8_t octet10; }; + union { + struct { + +/* + * 11/6 UPIDP N4 + * UP function supports User Plane Inactivity Detection + * and reporting per PDR feature as specified in + * clause 5.11.3. + * 11/5 RATP Sxb, N4 + * UP function supports Redirection Address Types set + * to "Port", "IPv4 address and Port", "IPv6 address + * and Port", or "IPv4 and IPv6 addresses and Port". + * 11/4 EPPPI N4 + * UP function supports Enhanced Provisioning of + * Paging Policy Indicator feature as specified in + * clause 5.36.2. + * 11/3 PSUPRM N4, N4mb + * UP function supports Per Slice UP Resource + * Management (see clause 5.35).3GPP TS 29.244 version 17.7.1 Release 17 + * 11/2 MBSN4 N4 + * UPF supports sending MBS multicast session data + * to associated PDU sessions using 5GC individual + * delivery. + * 11/1 DRQOS N4 + * UP function supports Direct Reporting of QoS + * monitoring events to Local NEF or AF (see + * clause 5.33.5). + */ +ED7(uint8_t spare:2;, + uint8_t upidp:1;, + uint8_t ratp:1;, + uint8_t epppi:1;, + uint8_t psuprm:1;, + uint8_t mbsn4:1;, + uint8_t drqos:1;) + }; + uint8_t octet11; + }; } __attribute__ ((packed)) ogs_pfcp_up_function_features_t; /* @@ -331,7 +402,16 @@ * DL packet for downlink data delivery status notification if the DL Buffering * Duration or DL Buffering Suggested Packet Count is exceeded or * it is discarded directly. See clause 5.2.3.1. - * Bit 4 to 8 – Spare, for future use and seto to "0". + * + * Bit 4 - FSSM (Forward packets to lower layer SSM): when set to "1", + * this indicates a request to the MB-UPF to forward MBS session data + * towards a low layer SSM address allocated by the MB-UPF + * using multicast transport. + * Bit 5 – MBSU (Forward and replicate MBS data using Unicast transport): + * when set to "1", this indicates a request to forward and replicate + * MBS session data towards multiple remote GTP-U peers using unicast transport. + * Bit 6 to 8 – Spare, for future use and seto to "0". + * * One and only one of the DROP, FORW, BUFF, IPMA and IPMD flags shall be * set to "1". @@ -341,6 +421,10 @@ * The DFRN flag may only be set if the FORW flag is set. * The EDRT flag may be set if the FORW flag is set. * The DDPN flag may be set with any of the DROP and BUFF flags. + * + * Both the MBSU flag and the FSSM flag may be set + * (to require the MB-UPF to forward MBS session data + * using both multicast and unicast transports). */ #define OGS_PFCP_APPLY_ACTION_DROP (1<<8) #define OGS_PFCP_APPLY_ACTION_FORW (1<<9) @@ -353,6 +437,8 @@ #define OGS_PFCP_APPLY_ACTION_EDRT (1<<0) #define OGS_PFCP_APPLY_ACTION_BDPN (1<<1) #define OGS_PFCP_APPLY_ACTION_DDPN (1<<2) +#define OGS_PFCP_APPLY_ACTION_FSSM (1<<3) +#define OGS_PFCP_APPLY_ACTION_MBSU (1<<4) typedef uint16_t ogs_pfcp_apply_action_t; @@ -361,7 +447,6 @@ typedef struct ogs_pfcp_cp_function_features_s { union { struct { - /* * 5/8 UIAUR Sxb, N4 * CP function supports the UE IP Address Usage Reporting feature, @@ -397,6 +482,26 @@ }; uint8_t octet5; }; + union { + struct { + +/* + * 6/2 RPGUR Sxa, Sxb, N4, N4mb + * CP function supports the Peer GTP-U Entity Restart + * Reporting as specified in clause 20.3.4a of + * 3GPP TS 23.007 24 and in clause 5.5 of 3GPP TS 23.527 40. + * 6/1 PSUCC Sxb, Sxc, N4, N4mb + * CP function supports PFCP session establishment + * or modification with Partial Success, i.e. with UP + * function reporting rules that cannot be activated. + * See clause 5.2.9. + */ +ED3(uint8_t spare:6;, + uint8_t rpgur:1;, + uint8_t psucc:1;) + }; + uint8_t octet6; + }; } __attribute__ ((packed)) ogs_pfcp_cp_function_features_t; @@ -659,7 +764,10 @@ uint8_t udp4:1;, uint8_t gtpu6:1;, uint8_t gtpu4:1;) - uint8_t spare; +ED4(uint8_t spare:5;, + uint8_t ssm_c_teid:1;, + uint8_t n6:1;, + uint8_t n19:1;) uint32_t teid; union { uint32_t addr; @@ -913,7 +1021,8 @@ }; union { struct { -ED2(uint8_t spare:7;, +ED3(uint8_t spare:6;, + uint8_t user_plane_inactivity_timer:1;, uint8_t report_the_end_marker_reception:1;) }; uint8_t reptri_7; @@ -932,14 +1041,25 @@ * this indicates an Error Indication Report. * - Bit 4 – UPIR (User Plane Inactivity Report): when set to 1, * this indicates a User Plane Inactivity Report. - * - Bit 5 to 8 – Spare, for future use and set to 0. + * - Bit 5 – TMIR (TSC Management Information Report): when set to "1", + * this indicates a TSC Management Information Report. + * - Bit 6 – Session Report (SESR): when set to "1", + * this indicates a Session Report. + * - Bit 7 – UISR (UP Initiated Session Request): when set to "1", + * this indicates it is a UP function initiated request + * for a reason which is indicated by the PFCPSRReq-Flags, + * for the PFCP session. + * - Bit 8 – Spare, for future use and set to "0". * * At least one bit shall be set to 1. Several bits may be set to 1. */ typedef struct ogs_pfcp_report_type_s { union { struct { -ED5(uint8_t spare:4;, +ED8(uint8_t spare:1;, + uint8_t up_initiated_session_request:1;, + uint8_t session_report:1;, + uint8_t tsc_management_information_report:1;, uint8_t user_plane_inactivity_report:1;, uint8_t error_indication_report:1;, uint8_t usage_report:1;, @@ -949,6 +1069,9 @@ }; } __attribute__ ((packed)) ogs_pfcp_report_type_t; +/* + * 8.2.27 Downlink Data Service Information + */ typedef struct ogs_pfcp_downlink_data_service_information_s { struct { ED3(uint8_t spare:6;, @@ -980,13 +1103,30 @@ * - Bit 3 – QAURR (Query All URRs): if this bit is set to 1, it indicates * that the UP function shall return immediate usage report(s) * for all the URRs previously provisioned for this PFCP session. - * - Bit 4 to 8 – Spare, for future use, shall be set to 0 by the sender and - * discarded by the receiver. + * - Bit 4 - SUMPC (Stop of Usage Measurement to Pause Charging): + * if this bit is set to "1", it indicates that the UP function + * shall stop the usage measurement for all URRs + * with the "ASPOC" flag set to "1". + * - Bit 5 - RUMUC (Resume of Usage Measurement to Un-pause of Charging): + * if this bit is set to "1", it indicates that the UP function + * shall resume the usage measurement for all URRs + * with the "ASPOC" flag set to "1". + * - Bit 6 - DETEID (Delete All DL N3mb and/or N19mb F-TEIDs): + * if this bit is set to "1", it indicates that the MB-UPF + * shall delete all NG-RAN N3mb DL F-TEIDs + * and all UPF N19mb DL F-TEIDs which were provisioned + * in Add MBS Unicast Parameters IEs for the MBS session + * (see clause 5.34.2.4). + * - Bit 7 to 8 – Spare, for future use, shall be set to "0" by the sender + * and discarded by the receiver. */ typedef struct ogs_pfcp_smreq_flags_s { union { struct { -ED4(uint8_t spare:5;, +ED7(uint8_t spare:2;, + uint8_t delete_all_dl_n3mb_and_or_n19mb_f_teids:1;, + uint8_t resume_of_usage_measurement_to_un_pause_of_charging:1;, + uint8_t stop_of_usage_measurement_to_pause_charging:1;, uint8_t query_all_urrs:1;, uint8_t send_end_marker_packets:1;, uint8_t drop_buffered_packets:1;) @@ -1049,7 +1189,8 @@ }; union { struct { -ED6(uint8_t spare:3;, +ED7(uint8_t spare:2;, + uint8_t user_plane_inactivity_timer:1;, uint8_t report_the_end_marker_reception:1;, uint8_t quota_validity_time:1;, uint8_t ip_multicast_join_leave:1;, @@ -1407,27 +1548,27 @@ * * The following flags are coded within Octet 5: * - * -Bit 1 – IMSIF: If this bit is set to "1", - * then the Length of IMSI and IMSI fields shall be present, - * otherwise these fields shall not be present. - * -Bit 2 – IMEIF: If this bit is set to "1", - * then the Length of IMEI and IMEI fields shall be present, - * otherwise these fields shall not be present. - * -Bit 3 – MSISDNF: If this bit is set to "1", - * then the Length of MSISDN and MSISDN fields shall be present, - * otherwise these fields shall not be present. - * -Bit 4 – NAIF: If this bit is set to "1", - * then the Length of NAI and NAI fields shall be present, - * otherwise these fields shall not be present. - * -Bit 5 – SUPIF: If this bit is set to "1", - * then the Length of SUPI and SUPI fields shall be present, - * otherwise these fields shall not be present. - * -Bit 6 – GPSIF: If this bit is set to "1", - * then the Length of GPSI and GPSI fields shall be present, - * otherwise these fields shall not be present. - * -Bit 7 – PEIF: If this bit is set to "1", - * then the Length of PEI and PEI fields shall be present, - * otherwise these fields shall not be present. + * - Bit 1 – IMSIF: If this bit is set to "1", + * then the Length of IMSI and IMSI fields shall be present, + * otherwise these fields shall not be present. + * - Bit 2 – IMEIF: If this bit is set to "1", + * then the Length of IMEI and IMEI fields shall be present, + * otherwise these fields shall not be present. + * - Bit 3 – MSISDNF: If this bit is set to "1", + * then the Length of MSISDN and MSISDN fields shall be present, + * otherwise these fields shall not be present. + * - Bit 4 – NAIF: If this bit is set to "1", + * then the Length of NAI and NAI fields shall be present, + * otherwise these fields shall not be present. + * - Bit 5 – SUPIF: If this bit is set to "1", + * then the Length of SUPI and SUPI fields shall be present, + * otherwise these fields shall not be present. + * - Bit 6 – GPSIF: If this bit is set to "1", + * then the Length of GPSI and GPSI fields shall be present, + * otherwise these fields shall not be present. + * - Bit 7 – PEIF: If this bit is set to "1", + * then the Length of PEI and PEI fields shall be present, + * otherwise these fields shall not be present. * - Bit 8: Spare, for future use and set to "0". * * One or more flags may be set to "1".
View file
open5gs_2.6.1.tar.xz/lib/pfcp/xact.c -> open5gs_2.6.2.tar.xz/lib/pfcp/xact.c
Changed
@@ -39,7 +39,6 @@ ogs_pfcp_node_t *node, uint32_t sqn); static ogs_pfcp_xact_stage_t ogs_pfcp_xact_get_stage( uint8_t type, uint32_t xid); -static int ogs_pfcp_xact_delete(ogs_pfcp_xact_t *xact); static int ogs_pfcp_xact_update_rx(ogs_pfcp_xact_t *xact, uint8_t type); static void response_timeout(void *data); @@ -772,7 +771,7 @@ return stage; } -static int ogs_pfcp_xact_delete(ogs_pfcp_xact_t *xact) +int ogs_pfcp_xact_delete(ogs_pfcp_xact_t *xact) { char bufOGS_ADDRSTRLEN;
View file
open5gs_2.6.1.tar.xz/lib/pfcp/xact.h -> open5gs_2.6.2.tar.xz/lib/pfcp/xact.h
Changed
@@ -140,6 +140,8 @@ int ogs_pfcp_xact_commit(ogs_pfcp_xact_t *xact); void ogs_pfcp_xact_delayed_commit(ogs_pfcp_xact_t *xact, ogs_time_t duration); +int ogs_pfcp_xact_delete(ogs_pfcp_xact_t *xact); + int ogs_pfcp_xact_receive(ogs_pfcp_node_t *node, ogs_pfcp_header_t *h, ogs_pfcp_xact_t **xact);
View file
open5gs_2.6.1.tar.xz/lib/proto/timer.c -> open5gs_2.6.2.tar.xz/lib/proto/timer.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -29,6 +29,8 @@ "OGS_TIMER_NF_INSTANCE_VALIDITY"; const char *OGS_TIMER_NAME_SUBSCRIPTION_VALIDITY = "OGS_TIMER_SUBSCRIPTION_VALIDITY"; +const char *OGS_TIMER_NAME_SUBSCRIPTION_PATCH = + "OGS_TIMER_SUBSCRIPTION_PATCH"; const char *OGS_TIMER_NAME_SBI_CLIENT_WAIT = "OGS_TIMER_SBI_CLIENT_WAIT"; @@ -45,6 +47,8 @@ return OGS_TIMER_NAME_NF_INSTANCE_VALIDITY; case OGS_TIMER_SUBSCRIPTION_VALIDITY: return OGS_TIMER_NAME_SUBSCRIPTION_VALIDITY; + case OGS_TIMER_SUBSCRIPTION_PATCH: + return OGS_TIMER_NAME_SUBSCRIPTION_PATCH; case OGS_TIMER_SBI_CLIENT_WAIT: return OGS_TIMER_NAME_SBI_CLIENT_WAIT; case OGS_TIMER_DBI_POLL_CHANGE_STREAM:
View file
open5gs_2.6.1.tar.xz/lib/proto/timer.h -> open5gs_2.6.2.tar.xz/lib/proto/timer.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -33,6 +33,7 @@ extern const char *OGS_TIMER_NAME_NF_INSTANCE_NO_HEARTBEAT; extern const char *OGS_TIMER_NAME_NF_INSTANCE_VALIDITY; extern const char *OGS_TIMER_NAME_SUBSCRIPTION_VALIDITY; +extern const char *OGS_TIMER_NAME_SUBSCRIPTION_PATCH; extern const char *OGS_TIMER_NAME_SBI_CLIENT_WAIT; /* forward declaration */ @@ -44,6 +45,7 @@ OGS_TIMER_NF_INSTANCE_NO_HEARTBEAT, OGS_TIMER_NF_INSTANCE_VALIDITY, OGS_TIMER_SUBSCRIPTION_VALIDITY, + OGS_TIMER_SUBSCRIPTION_PATCH, OGS_TIMER_SBI_CLIENT_WAIT, OGS_TIMER_DBI_POLL_CHANGE_STREAM,
View file
open5gs_2.6.1.tar.xz/lib/proto/types.h -> open5gs_2.6.2.tar.xz/lib/proto/types.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -83,7 +83,8 @@ #define OGS_MAX_FQDN_LEN 256 #define OGS_MAX_NUM_OF_SERVED_GUAMI 8 -#define OGS_MAX_NUM_OF_SERVED_TAI 16 +#define OGS_MAX_NUM_OF_SERVED_TAI OGS_MAX_NUM_OF_TAI +#define OGS_MAX_NUM_OF_ACCESS_CONTROL 8 #define OGS_MAX_NUM_OF_ALGORITHM 8 #define OGS_MAX_NUM_OF_BPLMN 6
View file
open5gs_2.6.1.tar.xz/lib/sbi/context.c -> open5gs_2.6.2.tar.xz/lib/sbi/context.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -1021,7 +1021,7 @@ return nf_instance; } -bool ogs_sbi_nf_instance_maximum_number_is_reached() +bool ogs_sbi_nf_instance_maximum_number_is_reached(void) { return nf_instance_pool.avail <= 0; } @@ -1883,9 +1883,6 @@ ogs_assert(subscription_data); memset(subscription_data, 0, sizeof(ogs_sbi_subscription_data_t)); - subscription_data->time.validity_duration = - ogs_app()->time.subscription.validity_duration; - ogs_list_add(&ogs_sbi_self()->subscription_data_list, subscription_data); return subscription_data; @@ -1923,6 +1920,9 @@ if (subscription_data->t_validity) ogs_timer_delete(subscription_data->t_validity); + if (subscription_data->t_patch) + ogs_timer_delete(subscription_data->t_patch); + if (subscription_data->client) ogs_sbi_client_remove(subscription_data->client);
View file
open5gs_2.6.1.tar.xz/lib/sbi/context.h -> open5gs_2.6.2.tar.xz/lib/sbi/context.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -246,11 +246,14 @@ typedef struct ogs_sbi_subscription_data_s { ogs_lnode_t lnode; +#define OGS_SBI_VALIDITY_SEC(v) \ + ogs_time_sec(v) + (ogs_time_usec(v) ? 1 : 0) struct { int validity_duration; } time; ogs_timer_t *t_validity; /* check validation */ + ogs_timer_t *t_patch; /* for sending PATCH */ char *id; /* SubscriptionId */ char *req_nf_instance_id; /* reqNfInstanceId */
View file
open5gs_2.6.1.tar.xz/lib/sbi/message.h -> open5gs_2.6.2.tar.xz/lib/sbi/message.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -143,6 +143,10 @@ #define OGS_SBI_RESOURCE_NAME_PCF_BINDINGS "pcfBindings" +#define OGS_SBI_PATCH_PATH_NF_STATUS "/nfStatus" +#define OGS_SBI_PATCH_PATH_LOAD "/load" +#define OGS_SBI_PATCH_PATH_VALIDITY_TIME "/validityTime" + #define OGS_SBI_FEATURES_IS_SET(__fEATURES, __n) \ (__fEATURES & (1 << ((__n)-1)))
View file
open5gs_2.6.1.tar.xz/lib/sbi/nnrf-build.c -> open5gs_2.6.2.tar.xz/lib/sbi/nnrf-build.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -1215,13 +1215,13 @@ OpenAPI_patch_item_t StatusItem; OpenAPI_patch_item_t LoadItem; - memset(&StatusItem, 0, sizeof(StatusItem)); - memset(&LoadItem, 0, sizeof(LoadItem)); - nf_instance = ogs_sbi_self()->nf_instance; ogs_assert(nf_instance); ogs_assert(nf_instance->id); + memset(&StatusItem, 0, sizeof(StatusItem)); + memset(&LoadItem, 0, sizeof(LoadItem)); + memset(&message, 0, sizeof(message)); message.h.method = (char *)OGS_SBI_HTTP_METHOD_PATCH; message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM; @@ -1239,7 +1239,7 @@ } StatusItem.op = OpenAPI_patch_operation_replace; - StatusItem.path = (char *)"/nfStatus"; + StatusItem.path = (char *)OGS_SBI_PATCH_PATH_NF_STATUS; StatusItem.value = OpenAPI_any_type_create_string( OpenAPI_nf_status_ToString(OpenAPI_nf_status_REGISTERED)); if (!StatusItem.value) { @@ -1250,7 +1250,7 @@ OpenAPI_list_add(PatchItemList, &StatusItem); LoadItem.op = OpenAPI_patch_operation_replace; - LoadItem.path = (char *)"/load"; + LoadItem.path = (char *)OGS_SBI_PATCH_PATH_LOAD; LoadItem.value = OpenAPI_any_type_create_number(nf_instance->load); if (!LoadItem.value) { ogs_error("No load item.value"); @@ -1387,6 +1387,71 @@ return request; } + +ogs_sbi_request_t *ogs_nnrf_nfm_build_status_update( + ogs_sbi_subscription_data_t *subscription_data) +{ + ogs_sbi_message_t message; + ogs_sbi_request_t *request = NULL; + + OpenAPI_list_t *PatchItemList = NULL; + OpenAPI_patch_item_t ValidityItem; + char *validity_time = NULL; + + ogs_assert(subscription_data); + ogs_assert(subscription_data->id); + + memset(&ValidityItem, 0, sizeof(ValidityItem)); + + memset(&message, 0, sizeof(message)); + message.h.method = (char *)OGS_SBI_HTTP_METHOD_PATCH; + message.h.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM; + message.h.api.version = (char *)OGS_SBI_API_V1; + message.h.resource.component0 = + (char *)OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS; + message.h.resource.component1 = subscription_data->id; + + message.http.content_type = (char *)OGS_SBI_CONTENT_PATCH_TYPE; + + PatchItemList = OpenAPI_list_create(); + if (!PatchItemList) { + ogs_error("No PatchItemList"); + goto end; + } + + ogs_assert(subscription_data->time.validity_duration); + validity_time = ogs_sbi_localtime_string( + ogs_time_now() + + ogs_time_from_sec(subscription_data->time.validity_duration)); + ogs_assert(validity_time); + + ValidityItem.op = OpenAPI_patch_operation_replace; + ValidityItem.path = (char *)OGS_SBI_PATCH_PATH_VALIDITY_TIME; + ValidityItem.value = OpenAPI_any_type_create_string(validity_time); + + if (!ValidityItem.value) { + ogs_error("No status item.value"); + goto end; + } + + OpenAPI_list_add(PatchItemList, &ValidityItem); + + message.PatchItemList = PatchItemList; + + request = ogs_sbi_build_request(&message); + ogs_expect(request); + +end: + if (ValidityItem.value) + OpenAPI_any_type_free(ValidityItem.value); + if (validity_time) + ogs_free(validity_time); + + if (PatchItemList) + OpenAPI_list_free(PatchItemList); + + return request; +} ogs_sbi_request_t *ogs_nnrf_nfm_build_status_unsubscribe( ogs_sbi_subscription_data_t *subscription_data)
View file
open5gs_2.6.1.tar.xz/lib/sbi/nnrf-build.h -> open5gs_2.6.2.tar.xz/lib/sbi/nnrf-build.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -37,6 +37,8 @@ ogs_sbi_request_t *ogs_nnrf_nfm_build_status_subscribe( ogs_sbi_subscription_data_t *subscription_data); +ogs_sbi_request_t *ogs_nnrf_nfm_build_status_update( + ogs_sbi_subscription_data_t *subscription_data); ogs_sbi_request_t *ogs_nnrf_nfm_build_status_unsubscribe( ogs_sbi_subscription_data_t *subscription_data); ogs_sbi_request_t *ogs_nnrf_nfm_build_profile_retrieve(char *nf_instance_id);
View file
open5gs_2.6.1.tar.xz/lib/sbi/nnrf-handler.c -> open5gs_2.6.2.tar.xz/lib/sbi/nnrf-handler.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -458,6 +458,68 @@ } } +static void handle_validity_time( + ogs_sbi_subscription_data_t *subscription_data, + char *validity_time, const char *action) +{ + ogs_time_t time, validity, patch; + + ogs_assert(validity_time); + ogs_assert(subscription_data); + ogs_assert(action); + + if (ogs_sbi_time_from_string(&time, validity_time) == false) { + ogs_error("%s Subscription %s until %s parser error", + subscription_data->id, action, validity_time); + return; + } + + validity = time - ogs_time_now(); + if (validity < 0) { + ogs_error("%s Subscription %s until %s validity:%d.%06d", + subscription_data->id, action, validity_time, + (int)ogs_time_sec(validity), (int)ogs_time_usec(validity)); + return; + } + + /* + * Store subscription_data->time.validity_duration to derive NRF validity. + * It will be used in ogs_nnrf_nfm_build_status_update(). + * + * So, you should not remove the following lines. + */ + subscription_data->time.validity_duration = OGS_SBI_VALIDITY_SEC(validity); + + if (!subscription_data->t_validity) { + subscription_data->t_validity = + ogs_timer_add(ogs_app()->timer_mgr, + ogs_timer_subscription_validity, subscription_data); + ogs_assert(subscription_data->t_validity); + } + ogs_timer_start(subscription_data->t_validity, validity); + + /* + * PATCH request will be sent before VALIDITY is expired. + */ +#define PATCH_TIME_FROM_VALIDITY(x) ((x) / 2) + patch = PATCH_TIME_FROM_VALIDITY(validity); + + if (!subscription_data->t_patch) { + subscription_data->t_patch = + ogs_timer_add(ogs_app()->timer_mgr, + ogs_timer_subscription_patch, subscription_data); + ogs_assert(subscription_data->t_patch); + } + ogs_timer_start(subscription_data->t_patch, patch); + + ogs_info("%s Subscription %s until %s " + "duration:%d,validity:%d.%06d,patch:%d.%06d", + subscription_data->id, action, validity_time, + subscription_data->time.validity_duration, + (int)ogs_time_sec(validity), (int)ogs_time_usec(validity), + (int)ogs_time_sec(patch), (int)ogs_time_usec(patch)); +} + void ogs_nnrf_nfm_handle_nf_status_subscribe( ogs_sbi_subscription_data_t *subscription_data, ogs_sbi_message_t *recvmsg) @@ -473,12 +535,44 @@ return; } - if (!SubscriptionData->subscription_id) { - ogs_error("No SubscriptionId"); + if (recvmsg->http.location) { + int rv; + ogs_sbi_message_t message; + ogs_sbi_header_t header; + + memset(&header, 0, sizeof(header)); + header.uri = recvmsg->http.location; + + rv = ogs_sbi_parse_header(&message, &header); + if (rv != OGS_OK) { + ogs_error("Cannot parse http.location %s", + recvmsg->http.location); + return; + } + + if (!message.h.resource.component1) { + ogs_error("No Subscription ID %s", recvmsg->http.location); + ogs_sbi_header_free(&header); + return; + } + + ogs_sbi_subscription_data_set_id( + subscription_data, message.h.resource.component1); + + ogs_sbi_header_free(&header); + + } else if (SubscriptionData->subscription_id) { + /* + * For compatibility with v2.5.x and lower versions + * + * Deprecated : It will be removed soon. + */ + ogs_sbi_subscription_data_set_id( + subscription_data, SubscriptionData->subscription_id); + } else { + ogs_error("No Subscription ID"); return; } - ogs_sbi_subscription_data_set_id( - subscription_data, SubscriptionData->subscription_id); /* SBI Features */ if (SubscriptionData->nrf_supported_features) { @@ -488,26 +582,31 @@ subscription_data->nrf_supported_features = 0; } - if (SubscriptionData->validity_time) { -#define VALIDITY_MINIMUM (10LL * OGS_USEC_PER_SEC) /* 10 seconds */ - ogs_time_t time, duration; - if (ogs_sbi_time_from_string( - &time, SubscriptionData->validity_time) == true) { - duration = time - ogs_time_now(); - if (duration < VALIDITY_MINIMUM) { - duration = VALIDITY_MINIMUM; - ogs_warn("%s Forced to %lld seconds", subscription_data->id, - (long long)ogs_time_sec(VALIDITY_MINIMUM)); - } - subscription_data->t_validity = ogs_timer_add(ogs_app()->timer_mgr, - ogs_timer_subscription_validity, subscription_data); - ogs_assert(subscription_data->t_validity); - ogs_timer_start(subscription_data->t_validity, duration); - } else { - ogs_error("Cannot parse validitiyTime %s", - SubscriptionData->validity_time); - } + /* Subscription Validity Time */ + if (SubscriptionData->validity_time) + handle_validity_time( + subscription_data, SubscriptionData->validity_time, "created"); +} + +void ogs_nnrf_nfm_handle_nf_status_update( + ogs_sbi_subscription_data_t *subscription_data, + ogs_sbi_message_t *recvmsg) +{ + OpenAPI_subscription_data_t *SubscriptionData = NULL; + + ogs_assert(recvmsg); + ogs_assert(subscription_data); + + SubscriptionData = recvmsg->SubscriptionData; + if (!SubscriptionData) { + ogs_error("No SubscriptionData"); + return; } + + /* Subscription Validity Time */ + if (SubscriptionData->validity_time) + handle_validity_time( + subscription_data, SubscriptionData->validity_time, "updated"); } bool ogs_nnrf_nfm_handle_nf_status_notify(
View file
open5gs_2.6.1.tar.xz/lib/sbi/nnrf-handler.h -> open5gs_2.6.2.tar.xz/lib/sbi/nnrf-handler.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -32,6 +32,9 @@ void ogs_nnrf_nfm_handle_nf_status_subscribe( ogs_sbi_subscription_data_t *subscription_data, ogs_sbi_message_t *recvmsg); +void ogs_nnrf_nfm_handle_nf_status_update( + ogs_sbi_subscription_data_t *subscription_data, + ogs_sbi_message_t *recvmsg); bool ogs_nnrf_nfm_handle_nf_status_notify( ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg);
View file
open5gs_2.6.1.tar.xz/lib/sbi/nnrf-path.c -> open5gs_2.6.2.tar.xz/lib/sbi/nnrf-path.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2022-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -109,6 +109,29 @@ if (!request) { ogs_error("No Request"); return false; + } + + rc = ogs_sbi_send_notification_request( + OGS_SBI_SERVICE_TYPE_NNRF_NFM, NULL, request, subscription_data); + ogs_expect(rc == true); + + ogs_sbi_request_free(request); + + return rc; +} + +bool ogs_nnrf_nfm_send_nf_status_update( + ogs_sbi_subscription_data_t *subscription_data) +{ + bool rc; + ogs_sbi_request_t *request = NULL; + + ogs_assert(subscription_data); + + request = ogs_nnrf_nfm_build_status_update(subscription_data); + if (!request) { + ogs_error("No Request"); + return false; } rc = ogs_sbi_send_notification_request(
View file
open5gs_2.6.1.tar.xz/lib/sbi/nnrf-path.h -> open5gs_2.6.2.tar.xz/lib/sbi/nnrf-path.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2022-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -33,6 +33,8 @@ OpenAPI_nf_type_e req_nf_type, char *req_nf_instance_id, OpenAPI_nf_type_e subscr_cond_nf_type, char *subscr_cond_service_name); +bool ogs_nnrf_nfm_send_nf_status_update( + ogs_sbi_subscription_data_t *subscription_data); bool ogs_nnrf_nfm_send_nf_status_unsubscribe( ogs_sbi_subscription_data_t *subscription_data);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/_application_data_influence_data_subs_to_notify_post_request_inner.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/_application_data_influence_data_subs_to_notify_post_request_inner.c
Changed
@@ -93,6 +93,10 @@ traffic_influ_data = cJSON_GetObjectItemCaseSensitive(_application_data_influence_data_subs_to_notify_post_request_innerJSON, "trafficInfluData"); if (traffic_influ_data) { traffic_influ_data_local_nonprim = OpenAPI_traffic_influ_data_parseFromJSON(traffic_influ_data); + if (!traffic_influ_data_local_nonprim) { + ogs_error("OpenAPI_traffic_influ_data_parseFromJSON failed traffic_influ_data"); + goto end; + } } _application_data_influence_data_subs_to_notify_post_request_inner_local_var = OpenAPI__application_data_influence_data_subs_to_notify_post_request_inner_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/abnormal_behaviour.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/abnormal_behaviour.c
Changed
@@ -198,6 +198,10 @@ goto end; } excep_local_nonprim = OpenAPI_exception_parseFromJSON(excep); + if (!excep_local_nonprim) { + ogs_error("OpenAPI_exception_parseFromJSON failed excep"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(abnormal_behaviourJSON, "dnn"); if (dnn) { @@ -210,6 +214,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(abnormal_behaviourJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } ratio = cJSON_GetObjectItemCaseSensitive(abnormal_behaviourJSON, "ratio"); @@ -231,6 +239,10 @@ addt_meas_info = cJSON_GetObjectItemCaseSensitive(abnormal_behaviourJSON, "addtMeasInfo"); if (addt_meas_info) { addt_meas_info_local_nonprim = OpenAPI_additional_measurement_parseFromJSON(addt_meas_info); + if (!addt_meas_info_local_nonprim) { + ogs_error("OpenAPI_additional_measurement_parseFromJSON failed addt_meas_info"); + goto end; + } } abnormal_behaviour_local_var = OpenAPI_abnormal_behaviour_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/access_and_mobility_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/access_and_mobility_data.c
Changed
@@ -398,6 +398,10 @@ location = cJSON_GetObjectItemCaseSensitive(access_and_mobility_dataJSON, "location"); if (location) { location_local_nonprim = OpenAPI_user_location_parseFromJSON(location); + if (!location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed location"); + goto end; + } } location_ts = cJSON_GetObjectItemCaseSensitive(access_and_mobility_dataJSON, "locationTs"); @@ -451,7 +455,6 @@ OpenAPI_rm_info_t *reg_statesItem = OpenAPI_rm_info_parseFromJSON(reg_states_local); if (!reg_statesItem) { ogs_error("No reg_statesItem"); - OpenAPI_list_free(reg_statesList); goto end; } OpenAPI_list_add(reg_statesList, reg_statesItem); @@ -484,7 +487,6 @@ OpenAPI_cm_info_t *conn_statesItem = OpenAPI_cm_info_parseFromJSON(conn_states_local); if (!conn_statesItem) { ogs_error("No conn_statesItem"); - OpenAPI_list_free(conn_statesList); goto end; } OpenAPI_list_add(conn_statesList, conn_statesItem); @@ -502,6 +504,10 @@ reachability_status = cJSON_GetObjectItemCaseSensitive(access_and_mobility_dataJSON, "reachabilityStatus"); if (reachability_status) { reachability_status_local_nonprim = OpenAPI_ue_reachability_parseFromJSON(reachability_status); + if (!reachability_status_local_nonprim) { + ogs_error("OpenAPI_ue_reachability_parseFromJSON failed reachability_status"); + goto end; + } } reachability_status_ts = cJSON_GetObjectItemCaseSensitive(access_and_mobility_dataJSON, "reachabilityStatusTs"); @@ -548,6 +554,10 @@ current_plmn = cJSON_GetObjectItemCaseSensitive(access_and_mobility_dataJSON, "currentPlmn"); if (current_plmn) { current_plmn_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(current_plmn); + if (!current_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed current_plmn"); + goto end; + } } current_plmn_ts = cJSON_GetObjectItemCaseSensitive(access_and_mobility_dataJSON, "currentPlmnTs");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data.c
Changed
@@ -1100,11 +1100,19 @@ subscribed_ue_ambr = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "subscribedUeAmbr"); if (subscribed_ue_ambr) { subscribed_ue_ambr_local_nonprim = OpenAPI_ambr_rm_parseFromJSON(subscribed_ue_ambr); + if (!subscribed_ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_rm_parseFromJSON failed subscribed_ue_ambr"); + goto end; + } } nssai = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "nssai"); if (nssai) { nssai_local_nonprim = OpenAPI_nssai_parseFromJSON(nssai); + if (!nssai_local_nonprim) { + ogs_error("OpenAPI_nssai_parseFromJSON failed nssai"); + goto end; + } } rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ratRestrictions"); @@ -1144,7 +1152,6 @@ OpenAPI_area_t *forbidden_areasItem = OpenAPI_area_parseFromJSON(forbidden_areas_local); if (!forbidden_areasItem) { ogs_error("No forbidden_areasItem"); - OpenAPI_list_free(forbidden_areasList); goto end; } OpenAPI_list_add(forbidden_areasList, forbidden_areasItem); @@ -1154,6 +1161,10 @@ service_area_restriction = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "serviceAreaRestriction"); if (service_area_restriction) { service_area_restriction_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(service_area_restriction); + if (!service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed service_area_restriction"); + goto end; + } } core_network_type_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "coreNetworkTypeRestrictions"); @@ -1226,6 +1237,10 @@ sor_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "sorInfo"); if (sor_info) { sor_info_local_nonprim = OpenAPI_sor_info_parseFromJSON(sor_info); + if (!sor_info_local_nonprim) { + ogs_error("OpenAPI_sor_info_parseFromJSON failed sor_info"); + goto end; + } } sor_info_expect_ind = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "sorInfoExpectInd"); @@ -1266,6 +1281,10 @@ upu_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "upuInfo"); if (upu_info) { upu_info_local_nonprim = OpenAPI_upu_info_parseFromJSON(upu_info); + if (!upu_info_local_nonprim) { + ogs_error("OpenAPI_upu_info_parseFromJSON failed upu_info"); + goto end; + } } routing_indicator = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "routingIndicator"); @@ -1355,16 +1374,28 @@ mdt_configuration = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "mdtConfiguration"); if (mdt_configuration) { mdt_configuration_local_nonprim = OpenAPI_mdt_configuration_parseFromJSON(mdt_configuration); + if (!mdt_configuration_local_nonprim) { + ogs_error("OpenAPI_mdt_configuration_parseFromJSON failed mdt_configuration"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } cag_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "cagData"); if (cag_data) { cag_data_local_nonprim = OpenAPI_cag_data_parseFromJSON(cag_data); + if (!cag_data_local_nonprim) { + ogs_error("OpenAPI_cag_data_parseFromJSON failed cag_data"); + goto end; + } } stn_sr = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "stnSr"); @@ -1410,6 +1441,10 @@ ec_restriction_data_wb = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ecRestrictionDataWb"); if (ec_restriction_data_wb) { ec_restriction_data_wb_local_nonprim = OpenAPI_ec_restriction_data_wb_parseFromJSON(ec_restriction_data_wb); + if (!ec_restriction_data_wb_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_data_wb_parseFromJSON failed ec_restriction_data_wb"); + goto end; + } } ec_restriction_data_nb = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ecRestrictionDataNb"); @@ -1423,6 +1458,10 @@ expected_ue_behaviour_list = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "expectedUeBehaviourList"); if (expected_ue_behaviour_list) { expected_ue_behaviour_list_local_nonprim = OpenAPI_expected_ue_behaviour_data_parseFromJSON(expected_ue_behaviour_list); + if (!expected_ue_behaviour_list_local_nonprim) { + ogs_error("OpenAPI_expected_ue_behaviour_data_parseFromJSON failed expected_ue_behaviour_list"); + goto end; + } } primary_rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "primaryRatRestrictions"); @@ -1481,7 +1520,6 @@ OpenAPI_edrx_parameters_t *edrx_parameters_listItem = OpenAPI_edrx_parameters_parseFromJSON(edrx_parameters_list_local); if (!edrx_parameters_listItem) { ogs_error("No edrx_parameters_listItem"); - OpenAPI_list_free(edrx_parameters_listList); goto end; } OpenAPI_list_add(edrx_parameters_listList, edrx_parameters_listItem); @@ -1506,7 +1544,6 @@ OpenAPI_ptw_parameters_t *ptw_parameters_listItem = OpenAPI_ptw_parameters_parseFromJSON(ptw_parameters_list_local); if (!ptw_parameters_listItem) { ogs_error("No ptw_parameters_listItem"); - OpenAPI_list_free(ptw_parameters_listList); goto end; } OpenAPI_list_add(ptw_parameters_listList, ptw_parameters_listItem); @@ -1565,7 +1602,6 @@ OpenAPI_wireline_area_t *wireline_forbidden_areasItem = OpenAPI_wireline_area_parseFromJSON(wireline_forbidden_areas_local); if (!wireline_forbidden_areasItem) { ogs_error("No wireline_forbidden_areasItem"); - OpenAPI_list_free(wireline_forbidden_areasList); goto end; } OpenAPI_list_add(wireline_forbidden_areasList, wireline_forbidden_areasItem); @@ -1575,6 +1611,10 @@ wireline_service_area_restriction = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "wirelineServiceAreaRestriction"); if (wireline_service_area_restriction) { wireline_service_area_restriction_local_nonprim = OpenAPI_wireline_service_area_restriction_parseFromJSON(wireline_service_area_restriction); + if (!wireline_service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_wireline_service_area_restriction_parseFromJSON failed wireline_service_area_restriction"); + goto end; + } } pcf_selection_assistance_infos = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "pcfSelectionAssistanceInfos"); @@ -1595,7 +1635,6 @@ OpenAPI_pcf_selection_assistance_info_t *pcf_selection_assistance_infosItem = OpenAPI_pcf_selection_assistance_info_parseFromJSON(pcf_selection_assistance_infos_local); if (!pcf_selection_assistance_infosItem) { ogs_error("No pcf_selection_assistance_infosItem"); - OpenAPI_list_free(pcf_selection_assistance_infosList); goto end; } OpenAPI_list_add(pcf_selection_assistance_infosList, pcf_selection_assistance_infosItem); @@ -1605,11 +1644,19 @@ aerial_ue_sub_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "aerialUeSubInfo"); if (aerial_ue_sub_info) { aerial_ue_sub_info_local_nonprim = OpenAPI_aerial_ue_subscription_info_parseFromJSON(aerial_ue_sub_info); + if (!aerial_ue_sub_info_local_nonprim) { + ogs_error("OpenAPI_aerial_ue_subscription_info_parseFromJSON failed aerial_ue_sub_info"); + goto end; + } } roaming_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "roamingRestrictions"); if (roaming_restrictions) { roaming_restrictions_local_nonprim = OpenAPI_roaming_restrictions_parseFromJSON(roaming_restrictions); + if (!roaming_restrictions_local_nonprim) { + ogs_error("OpenAPI_roaming_restrictions_parseFromJSON failed roaming_restrictions"); + goto end; + } } remote_prov_ind = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "remoteProvInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c
Changed
@@ -1100,11 +1100,19 @@ subscribed_ue_ambr = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "subscribedUeAmbr"); if (subscribed_ue_ambr) { subscribed_ue_ambr_local_nonprim = OpenAPI_ambr_rm_parseFromJSON(subscribed_ue_ambr); + if (!subscribed_ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_rm_parseFromJSON failed subscribed_ue_ambr"); + goto end; + } } nssai = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "nssai"); if (nssai) { nssai_local_nonprim = OpenAPI_nssai_1_parseFromJSON(nssai); + if (!nssai_local_nonprim) { + ogs_error("OpenAPI_nssai_1_parseFromJSON failed nssai"); + goto end; + } } rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ratRestrictions"); @@ -1144,7 +1152,6 @@ OpenAPI_area_1_t *forbidden_areasItem = OpenAPI_area_1_parseFromJSON(forbidden_areas_local); if (!forbidden_areasItem) { ogs_error("No forbidden_areasItem"); - OpenAPI_list_free(forbidden_areasList); goto end; } OpenAPI_list_add(forbidden_areasList, forbidden_areasItem); @@ -1154,6 +1161,10 @@ service_area_restriction = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "serviceAreaRestriction"); if (service_area_restriction) { service_area_restriction_local_nonprim = OpenAPI_service_area_restriction_1_parseFromJSON(service_area_restriction); + if (!service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_1_parseFromJSON failed service_area_restriction"); + goto end; + } } core_network_type_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "coreNetworkTypeRestrictions"); @@ -1226,6 +1237,10 @@ sor_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "sorInfo"); if (sor_info) { sor_info_local_nonprim = OpenAPI_sor_info_1_parseFromJSON(sor_info); + if (!sor_info_local_nonprim) { + ogs_error("OpenAPI_sor_info_1_parseFromJSON failed sor_info"); + goto end; + } } sor_info_expect_ind = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "sorInfoExpectInd"); @@ -1266,6 +1281,10 @@ upu_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "upuInfo"); if (upu_info) { upu_info_local_nonprim = OpenAPI_upu_info_1_parseFromJSON(upu_info); + if (!upu_info_local_nonprim) { + ogs_error("OpenAPI_upu_info_1_parseFromJSON failed upu_info"); + goto end; + } } routing_indicator = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "routingIndicator"); @@ -1355,16 +1374,28 @@ mdt_configuration = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "mdtConfiguration"); if (mdt_configuration) { mdt_configuration_local_nonprim = OpenAPI_mdt_configuration_1_parseFromJSON(mdt_configuration); + if (!mdt_configuration_local_nonprim) { + ogs_error("OpenAPI_mdt_configuration_1_parseFromJSON failed mdt_configuration"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } cag_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "cagData"); if (cag_data) { cag_data_local_nonprim = OpenAPI_cag_data_1_parseFromJSON(cag_data); + if (!cag_data_local_nonprim) { + ogs_error("OpenAPI_cag_data_1_parseFromJSON failed cag_data"); + goto end; + } } stn_sr = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "stnSr"); @@ -1410,6 +1441,10 @@ ec_restriction_data_wb = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ecRestrictionDataWb"); if (ec_restriction_data_wb) { ec_restriction_data_wb_local_nonprim = OpenAPI_ec_restriction_data_wb_parseFromJSON(ec_restriction_data_wb); + if (!ec_restriction_data_wb_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_data_wb_parseFromJSON failed ec_restriction_data_wb"); + goto end; + } } ec_restriction_data_nb = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ecRestrictionDataNb"); @@ -1423,6 +1458,10 @@ expected_ue_behaviour_list = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "expectedUeBehaviourList"); if (expected_ue_behaviour_list) { expected_ue_behaviour_list_local_nonprim = OpenAPI_expected_ue_behaviour_data_1_parseFromJSON(expected_ue_behaviour_list); + if (!expected_ue_behaviour_list_local_nonprim) { + ogs_error("OpenAPI_expected_ue_behaviour_data_1_parseFromJSON failed expected_ue_behaviour_list"); + goto end; + } } primary_rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "primaryRatRestrictions"); @@ -1481,7 +1520,6 @@ OpenAPI_edrx_parameters_1_t *edrx_parameters_listItem = OpenAPI_edrx_parameters_1_parseFromJSON(edrx_parameters_list_local); if (!edrx_parameters_listItem) { ogs_error("No edrx_parameters_listItem"); - OpenAPI_list_free(edrx_parameters_listList); goto end; } OpenAPI_list_add(edrx_parameters_listList, edrx_parameters_listItem); @@ -1506,7 +1544,6 @@ OpenAPI_ptw_parameters_1_t *ptw_parameters_listItem = OpenAPI_ptw_parameters_1_parseFromJSON(ptw_parameters_list_local); if (!ptw_parameters_listItem) { ogs_error("No ptw_parameters_listItem"); - OpenAPI_list_free(ptw_parameters_listList); goto end; } OpenAPI_list_add(ptw_parameters_listList, ptw_parameters_listItem); @@ -1565,7 +1602,6 @@ OpenAPI_wireline_area_1_t *wireline_forbidden_areasItem = OpenAPI_wireline_area_1_parseFromJSON(wireline_forbidden_areas_local); if (!wireline_forbidden_areasItem) { ogs_error("No wireline_forbidden_areasItem"); - OpenAPI_list_free(wireline_forbidden_areasList); goto end; } OpenAPI_list_add(wireline_forbidden_areasList, wireline_forbidden_areasItem); @@ -1575,6 +1611,10 @@ wireline_service_area_restriction = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "wirelineServiceAreaRestriction"); if (wireline_service_area_restriction) { wireline_service_area_restriction_local_nonprim = OpenAPI_wireline_service_area_restriction_1_parseFromJSON(wireline_service_area_restriction); + if (!wireline_service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_wireline_service_area_restriction_1_parseFromJSON failed wireline_service_area_restriction"); + goto end; + } } pcf_selection_assistance_infos = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "pcfSelectionAssistanceInfos"); @@ -1595,7 +1635,6 @@ OpenAPI_pcf_selection_assistance_info_1_t *pcf_selection_assistance_infosItem = OpenAPI_pcf_selection_assistance_info_1_parseFromJSON(pcf_selection_assistance_infos_local); if (!pcf_selection_assistance_infosItem) { ogs_error("No pcf_selection_assistance_infosItem"); - OpenAPI_list_free(pcf_selection_assistance_infosList); goto end; } OpenAPI_list_add(pcf_selection_assistance_infosList, pcf_selection_assistance_infosItem); @@ -1605,11 +1644,19 @@ aerial_ue_sub_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "aerialUeSubInfo"); if (aerial_ue_sub_info) { aerial_ue_sub_info_local_nonprim = OpenAPI_aerial_ue_subscription_info_1_parseFromJSON(aerial_ue_sub_info); + if (!aerial_ue_sub_info_local_nonprim) { + ogs_error("OpenAPI_aerial_ue_subscription_info_1_parseFromJSON failed aerial_ue_sub_info"); + goto end; + } } roaming_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "roamingRestrictions"); if (roaming_restrictions) { roaming_restrictions_local_nonprim = OpenAPI_roaming_restrictions_parseFromJSON(roaming_restrictions); + if (!roaming_restrictions_local_nonprim) { + ogs_error("OpenAPI_roaming_restrictions_parseFromJSON failed roaming_restrictions"); + goto end; + } } remote_prov_ind = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "remoteProvInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/access_net_charging_identifier.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/access_net_charging_identifier.c
Changed
@@ -130,7 +130,6 @@ OpenAPI_flows_t *flowsItem = OpenAPI_flows_parseFromJSON(flows_local); if (!flowsItem) { ogs_error("No flowsItem"); - OpenAPI_list_free(flowsList); goto end; } OpenAPI_list_add(flowsList, flowsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/access_token_req.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/access_token_req.c
Changed
@@ -473,6 +473,10 @@ requester_plmn = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "requesterPlmn"); if (requester_plmn) { requester_plmn_local_nonprim = OpenAPI_plmn_id_parseFromJSON(requester_plmn); + if (!requester_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed requester_plmn"); + goto end; + } } requester_plmn_list = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "requesterPlmnList"); @@ -493,7 +497,6 @@ OpenAPI_plmn_id_t *requester_plmn_listItem = OpenAPI_plmn_id_parseFromJSON(requester_plmn_list_local); if (!requester_plmn_listItem) { ogs_error("No requester_plmn_listItem"); - OpenAPI_list_free(requester_plmn_listList); goto end; } OpenAPI_list_add(requester_plmn_listList, requester_plmn_listItem); @@ -518,7 +521,6 @@ OpenAPI_snssai_t *requester_snssai_listItem = OpenAPI_snssai_parseFromJSON(requester_snssai_list_local); if (!requester_snssai_listItem) { ogs_error("No requester_snssai_listItem"); - OpenAPI_list_free(requester_snssai_listList); goto end; } OpenAPI_list_add(requester_snssai_listList, requester_snssai_listItem); @@ -551,7 +553,6 @@ OpenAPI_plmn_id_nid_t *requester_snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(requester_snpn_list_local); if (!requester_snpn_listItem) { ogs_error("No requester_snpn_listItem"); - OpenAPI_list_free(requester_snpn_listList); goto end; } OpenAPI_list_add(requester_snpn_listList, requester_snpn_listItem); @@ -561,11 +562,19 @@ target_plmn = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "targetPlmn"); if (target_plmn) { target_plmn_local_nonprim = OpenAPI_plmn_id_parseFromJSON(target_plmn); + if (!target_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed target_plmn"); + goto end; + } } target_snpn = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "targetSnpn"); if (target_snpn) { target_snpn_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(target_snpn); + if (!target_snpn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed target_snpn"); + goto end; + } } target_snssai_list = cJSON_GetObjectItemCaseSensitive(access_token_reqJSON, "targetSnssaiList"); @@ -586,7 +595,6 @@ OpenAPI_snssai_t *target_snssai_listItem = OpenAPI_snssai_parseFromJSON(target_snssai_list_local); if (!target_snssai_listItem) { ogs_error("No target_snssai_listItem"); - OpenAPI_list_free(target_snssai_listList); goto end; } OpenAPI_list_add(target_snssai_listList, target_snssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/additional_ee_subs_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/additional_ee_subs_info.c
Changed
@@ -130,7 +130,6 @@ OpenAPI_amf_subscription_info_t *amf_subscription_info_listItem = OpenAPI_amf_subscription_info_parseFromJSON(amf_subscription_info_list_local); if (!amf_subscription_info_listItem) { ogs_error("No amf_subscription_info_listItem"); - OpenAPI_list_free(amf_subscription_info_listList); goto end; } OpenAPI_list_add(amf_subscription_info_listList, amf_subscription_info_listItem); @@ -140,11 +139,19 @@ smf_subscription_info = cJSON_GetObjectItemCaseSensitive(additional_ee_subs_infoJSON, "smfSubscriptionInfo"); if (smf_subscription_info) { smf_subscription_info_local_nonprim = OpenAPI_smf_subscription_info_parseFromJSON(smf_subscription_info); + if (!smf_subscription_info_local_nonprim) { + ogs_error("OpenAPI_smf_subscription_info_parseFromJSON failed smf_subscription_info"); + goto end; + } } hss_subscription_info = cJSON_GetObjectItemCaseSensitive(additional_ee_subs_infoJSON, "hssSubscriptionInfo"); if (hss_subscription_info) { hss_subscription_info_local_nonprim = OpenAPI_hss_subscription_info_parseFromJSON(hss_subscription_info); + if (!hss_subscription_info_local_nonprim) { + ogs_error("OpenAPI_hss_subscription_info_parseFromJSON failed hss_subscription_info"); + goto end; + } } additional_ee_subs_info_local_var = OpenAPI_additional_ee_subs_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/additional_measurement.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/additional_measurement.c
Changed
@@ -184,6 +184,10 @@ unexp_loc = cJSON_GetObjectItemCaseSensitive(additional_measurementJSON, "unexpLoc"); if (unexp_loc) { unexp_loc_local_nonprim = OpenAPI_network_area_info_parseFromJSON(unexp_loc); + if (!unexp_loc_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed unexp_loc"); + goto end; + } } unexp_flow_teps = cJSON_GetObjectItemCaseSensitive(additional_measurementJSON, "unexpFlowTeps"); @@ -204,7 +208,6 @@ OpenAPI_ip_eth_flow_description_t *unexp_flow_tepsItem = OpenAPI_ip_eth_flow_description_parseFromJSON(unexp_flow_teps_local); if (!unexp_flow_tepsItem) { ogs_error("No unexp_flow_tepsItem"); - OpenAPI_list_free(unexp_flow_tepsList); goto end; } OpenAPI_list_add(unexp_flow_tepsList, unexp_flow_tepsItem); @@ -230,11 +233,19 @@ ddos_attack = cJSON_GetObjectItemCaseSensitive(additional_measurementJSON, "ddosAttack"); if (ddos_attack) { ddos_attack_local_nonprim = OpenAPI_address_list_parseFromJSON(ddos_attack); + if (!ddos_attack_local_nonprim) { + ogs_error("OpenAPI_address_list_parseFromJSON failed ddos_attack"); + goto end; + } } wrg_dest = cJSON_GetObjectItemCaseSensitive(additional_measurementJSON, "wrgDest"); if (wrg_dest) { wrg_dest_local_nonprim = OpenAPI_address_list_parseFromJSON(wrg_dest); + if (!wrg_dest_local_nonprim) { + ogs_error("OpenAPI_address_list_parseFromJSON failed wrg_dest"); + goto end; + } } circums = cJSON_GetObjectItemCaseSensitive(additional_measurementJSON, "circums"); @@ -255,7 +266,6 @@ OpenAPI_circumstance_description_t *circumsItem = OpenAPI_circumstance_description_parseFromJSON(circums_local); if (!circumsItem) { ogs_error("No circumsItem"); - OpenAPI_list_free(circumsList); goto end; } OpenAPI_list_add(circumsList, circumsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/additional_snssai_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/additional_snssai_data.c
Changed
@@ -112,6 +112,10 @@ subscribed_ue_slice_mbr = cJSON_GetObjectItemCaseSensitive(additional_snssai_dataJSON, "subscribedUeSliceMbr"); if (subscribed_ue_slice_mbr) { subscribed_ue_slice_mbr_local_nonprim = OpenAPI_slice_mbr_rm_parseFromJSON(subscribed_ue_slice_mbr); + if (!subscribed_ue_slice_mbr_local_nonprim) { + ogs_error("OpenAPI_slice_mbr_rm_parseFromJSON failed subscribed_ue_slice_mbr"); + goto end; + } } subscribed_ns_srg_list = cJSON_GetObjectItemCaseSensitive(additional_snssai_dataJSON, "subscribedNsSrgList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/additional_snssai_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/additional_snssai_data_1.c
Changed
@@ -112,6 +112,10 @@ subscribed_ue_slice_mbr = cJSON_GetObjectItemCaseSensitive(additional_snssai_data_1JSON, "subscribedUeSliceMbr"); if (subscribed_ue_slice_mbr) { subscribed_ue_slice_mbr_local_nonprim = OpenAPI_slice_mbr_rm_parseFromJSON(subscribed_ue_slice_mbr); + if (!subscribed_ue_slice_mbr_local_nonprim) { + ogs_error("OpenAPI_slice_mbr_rm_parseFromJSON failed subscribed_ue_slice_mbr"); + goto end; + } } subscribed_ns_srg_list = cJSON_GetObjectItemCaseSensitive(additional_snssai_data_1JSON, "subscribedNsSrgList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/addr_fqdn.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/addr_fqdn.c
Changed
@@ -81,6 +81,10 @@ ip_addr = cJSON_GetObjectItemCaseSensitive(addr_fqdnJSON, "ipAddr"); if (ip_addr) { ip_addr_local_nonprim = OpenAPI_ip_addr_parseFromJSON(ip_addr); + if (!ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_addr_parseFromJSON failed ip_addr"); + goto end; + } } fqdn = cJSON_GetObjectItemCaseSensitive(addr_fqdnJSON, "fqdn");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/af_coordination_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/af_coordination_info.c
Changed
@@ -154,7 +154,6 @@ OpenAPI_notification_info_t *notification_info_listItem = OpenAPI_notification_info_parseFromJSON(notification_info_list_local); if (!notification_info_listItem) { ogs_error("No notification_info_listItem"); - OpenAPI_list_free(notification_info_listList); goto end; } OpenAPI_list_add(notification_info_listList, notification_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/af_event_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/af_event_notification.c
Changed
@@ -112,7 +112,6 @@ OpenAPI_flows_t *flowsItem = OpenAPI_flows_parseFromJSON(flows_local); if (!flowsItem) { ogs_error("No flowsItem"); - OpenAPI_list_free(flowsList); goto end; } OpenAPI_list_add(flowsList, flowsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/af_external.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/af_external.c
Changed
@@ -142,7 +142,6 @@ OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local); if (!allowed_geographic_areaItem) { ogs_error("No allowed_geographic_areaItem"); - OpenAPI_list_free(allowed_geographic_areaList); goto end; } OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem); @@ -161,6 +160,10 @@ valid_time_period = cJSON_GetObjectItemCaseSensitive(af_externalJSON, "validTimePeriod"); if (valid_time_period) { valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period); + if (!valid_time_period_local_nonprim) { + ogs_error("OpenAPI_valid_time_period_parseFromJSON failed valid_time_period"); + goto end; + } } af_external_local_var = OpenAPI_af_external_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/af_routing_requirement.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/af_routing_requirement.c
Changed
@@ -264,7 +264,6 @@ OpenAPI_route_to_location_t *route_to_locsItem = OpenAPI_route_to_location_parseFromJSON(route_to_locs_local); if (!route_to_locsItem) { ogs_error("No route_to_locsItem"); - OpenAPI_list_free(route_to_locsList); goto end; } OpenAPI_list_add(route_to_locsList, route_to_locsItem); @@ -274,6 +273,10 @@ sp_val = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "spVal"); if (sp_val) { sp_val_local_nonprim = OpenAPI_spatial_validity_parseFromJSON(sp_val); + if (!sp_val_local_nonprim) { + ogs_error("OpenAPI_spatial_validity_parseFromJSON failed sp_val"); + goto end; + } } temp_vals = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "tempVals"); @@ -294,7 +297,6 @@ OpenAPI_temporal_validity_t *temp_valsItem = OpenAPI_temporal_validity_parseFromJSON(temp_vals_local); if (!temp_valsItem) { ogs_error("No temp_valsItem"); - OpenAPI_list_free(temp_valsList); goto end; } OpenAPI_list_add(temp_valsList, temp_valsItem); @@ -304,6 +306,10 @@ up_path_chg_sub = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "upPathChgSub"); if (up_path_chg_sub) { up_path_chg_sub_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_sub); + if (!up_path_chg_sub_local_nonprim) { + ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed up_path_chg_sub"); + goto end; + } } addr_preser_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "addrPreserInd"); @@ -348,7 +354,6 @@ OpenAPI_eas_ip_replacement_info_t *eas_ip_replace_infosItem = OpenAPI_eas_ip_replacement_info_parseFromJSON(eas_ip_replace_infos_local); if (!eas_ip_replace_infosItem) { ogs_error("No eas_ip_replace_infosItem"); - OpenAPI_list_free(eas_ip_replace_infosList); goto end; } OpenAPI_list_add(eas_ip_replace_infosList, eas_ip_replace_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/af_routing_requirement_rm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/af_routing_requirement_rm.c
Changed
@@ -264,7 +264,6 @@ OpenAPI_route_to_location_t *route_to_locsItem = OpenAPI_route_to_location_parseFromJSON(route_to_locs_local); if (!route_to_locsItem) { ogs_error("No route_to_locsItem"); - OpenAPI_list_free(route_to_locsList); goto end; } OpenAPI_list_add(route_to_locsList, route_to_locsItem); @@ -274,6 +273,10 @@ sp_val = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "spVal"); if (sp_val) { sp_val_local_nonprim = OpenAPI_spatial_validity_rm_parseFromJSON(sp_val); + if (!sp_val_local_nonprim) { + ogs_error("OpenAPI_spatial_validity_rm_parseFromJSON failed sp_val"); + goto end; + } } temp_vals = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "tempVals"); @@ -294,7 +297,6 @@ OpenAPI_temporal_validity_t *temp_valsItem = OpenAPI_temporal_validity_parseFromJSON(temp_vals_local); if (!temp_valsItem) { ogs_error("No temp_valsItem"); - OpenAPI_list_free(temp_valsList); goto end; } OpenAPI_list_add(temp_valsList, temp_valsItem); @@ -304,6 +306,10 @@ up_path_chg_sub = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "upPathChgSub"); if (up_path_chg_sub) { up_path_chg_sub_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_sub); + if (!up_path_chg_sub_local_nonprim) { + ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed up_path_chg_sub"); + goto end; + } } addr_preser_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "addrPreserInd"); @@ -348,7 +354,6 @@ OpenAPI_eas_ip_replacement_info_t *eas_ip_replace_infosItem = OpenAPI_eas_ip_replacement_info_parseFromJSON(eas_ip_replace_infos_local); if (!eas_ip_replace_infosItem) { ogs_error("No eas_ip_replace_infosItem"); - OpenAPI_list_free(eas_ip_replace_infosList); goto end; } OpenAPI_list_add(eas_ip_replace_infosList, eas_ip_replace_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/allowed_nssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/allowed_nssai.c
Changed
@@ -106,7 +106,6 @@ OpenAPI_allowed_snssai_t *allowed_snssai_listItem = OpenAPI_allowed_snssai_parseFromJSON(allowed_snssai_list_local); if (!allowed_snssai_listItem) { ogs_error("No allowed_snssai_listItem"); - OpenAPI_list_free(allowed_snssai_listList); goto end; } OpenAPI_list_add(allowed_snssai_listList, allowed_snssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/allowed_snssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/allowed_snssai.c
Changed
@@ -120,6 +120,10 @@ goto end; } allowed_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(allowed_snssai); + if (!allowed_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed allowed_snssai"); + goto end; + } nsi_information_list = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "nsiInformationList"); if (nsi_information_list) { @@ -139,7 +143,6 @@ OpenAPI_nsi_information_t *nsi_information_listItem = OpenAPI_nsi_information_parseFromJSON(nsi_information_list_local); if (!nsi_information_listItem) { ogs_error("No nsi_information_listItem"); - OpenAPI_list_free(nsi_information_listList); goto end; } OpenAPI_list_add(nsi_information_listList, nsi_information_listItem); @@ -149,6 +152,10 @@ mapped_home_snssai = cJSON_GetObjectItemCaseSensitive(allowed_snssaiJSON, "mappedHomeSnssai"); if (mapped_home_snssai) { mapped_home_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(mapped_home_snssai); + if (!mapped_home_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed mapped_home_snssai"); + goto end; + } } allowed_snssai_local_var = OpenAPI_allowed_snssai_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/am_influ_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/am_influ_data.c
Changed
@@ -358,7 +358,6 @@ OpenAPI_dnn_snssai_information_t *dnn_snssai_infosItem = OpenAPI_dnn_snssai_information_parseFromJSON(dnn_snssai_infos_local); if (!dnn_snssai_infosItem) { ogs_error("No dnn_snssai_infosItem"); - OpenAPI_list_free(dnn_snssai_infosList); goto end; } OpenAPI_list_add(dnn_snssai_infosList, dnn_snssai_infosItem); @@ -415,7 +414,6 @@ OpenAPI_am_influ_event_t *ev_subsItem = OpenAPI_am_influ_event_parseFromJSON(ev_subs_local); if (!ev_subsItem) { ogs_error("No ev_subsItem"); - OpenAPI_list_free(ev_subsList); goto end; } OpenAPI_list_add(ev_subsList, ev_subsItem); @@ -485,7 +483,6 @@ OpenAPI_service_area_coverage_info_t *cov_reqItem = OpenAPI_service_area_coverage_info_parseFromJSON(cov_req_local); if (!cov_reqItem) { ogs_error("No cov_reqItem"); - OpenAPI_list_free(cov_reqList); goto end; } OpenAPI_list_add(cov_reqList, cov_reqItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/am_requested_value_rep.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/am_requested_value_rep.c
Changed
@@ -201,6 +201,10 @@ user_loc = cJSON_GetObjectItemCaseSensitive(am_requested_value_repJSON, "userLoc"); if (user_loc) { user_loc_local_nonprim = OpenAPI_user_location_parseFromJSON(user_loc); + if (!user_loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_loc"); + goto end; + } } pra_statuses = cJSON_GetObjectItemCaseSensitive(am_requested_value_repJSON, "praStatuses"); @@ -285,7 +289,6 @@ OpenAPI_snssai_t *allowed_snssaisItem = OpenAPI_snssai_parseFromJSON(allowed_snssais_local); if (!allowed_snssaisItem) { ogs_error("No allowed_snssaisItem"); - OpenAPI_list_free(allowed_snssaisList); goto end; } OpenAPI_list_add(allowed_snssaisList, allowed_snssaisItem); @@ -310,7 +313,6 @@ OpenAPI_snssai_t *n3g_allowed_snssaisItem = OpenAPI_snssai_parseFromJSON(n3g_allowed_snssais_local); if (!n3g_allowed_snssaisItem) { ogs_error("No n3g_allowed_snssaisItem"); - OpenAPI_list_free(n3g_allowed_snssaisList); goto end; } OpenAPI_list_add(n3g_allowed_snssaisList, n3g_allowed_snssaisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf3_gpp_access_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf3_gpp_access_registration.c
Changed
@@ -643,6 +643,10 @@ goto end; } guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } backup_amf_info = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "backupAmfInfo"); if (backup_amf_info) { @@ -662,7 +666,6 @@ OpenAPI_backup_amf_info_t *backup_amf_infoItem = OpenAPI_backup_amf_info_parseFromJSON(backup_amf_info_local); if (!backup_amf_infoItem) { ogs_error("No backup_amf_infoItem"); - OpenAPI_list_free(backup_amf_infoList); goto end; } OpenAPI_list_add(backup_amf_infoList, backup_amf_infoItem); @@ -707,6 +710,10 @@ eps_interworking_info = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "epsInterworkingInfo"); if (eps_interworking_info) { eps_interworking_info_local_nonprim = OpenAPI_eps_interworking_info_parseFromJSON(eps_interworking_info); + if (!eps_interworking_info_local_nonprim) { + ogs_error("OpenAPI_eps_interworking_info_parseFromJSON failed eps_interworking_info"); + goto end; + } } ue_srvcc_capability = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "ueSrvccCapability"); @@ -728,11 +735,19 @@ vgmlc_address = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "vgmlcAddress"); if (vgmlc_address) { vgmlc_address_local_nonprim = OpenAPI_vgmlc_address_parseFromJSON(vgmlc_address); + if (!vgmlc_address_local_nonprim) { + ogs_error("OpenAPI_vgmlc_address_parseFromJSON failed vgmlc_address"); + goto end; + } } context_info = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } no_ee_subscription_ind = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registrationJSON, "noEeSubscriptionInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c
Changed
@@ -181,6 +181,10 @@ goto end; } guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } purge_flag = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "purgeFlag"); if (purge_flag) { @@ -225,7 +229,6 @@ OpenAPI_backup_amf_info_t *backup_amf_infoItem = OpenAPI_backup_amf_info_parseFromJSON(backup_amf_info_local); if (!backup_amf_infoItem) { ogs_error("No backup_amf_infoItem"); - OpenAPI_list_free(backup_amf_infoList); goto end; } OpenAPI_list_add(backup_amf_infoList, backup_amf_infoItem); @@ -235,6 +238,10 @@ eps_interworking_info = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "epsInterworkingInfo"); if (eps_interworking_info) { eps_interworking_info_local_nonprim = OpenAPI_eps_interworking_info_parseFromJSON(eps_interworking_info); + if (!eps_interworking_info_local_nonprim) { + ogs_error("OpenAPI_eps_interworking_info_parseFromJSON failed eps_interworking_info"); + goto end; + } } ue_srvcc_capability = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "ueSrvccCapability");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_event.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_event.c
Changed
@@ -410,6 +410,10 @@ goto end; } type_local_nonprim = OpenAPI_amf_event_type_parseFromJSON(type); + if (!type_local_nonprim) { + ogs_error("OpenAPI_amf_event_type_parseFromJSON failed type"); + goto end; + } immediate_flag = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "immediateFlag"); if (immediate_flag) { @@ -437,7 +441,6 @@ OpenAPI_amf_event_area_t *area_listItem = OpenAPI_amf_event_area_parseFromJSON(area_list_local); if (!area_listItem) { ogs_error("No area_listItem"); - OpenAPI_list_free(area_listList); goto end; } OpenAPI_list_add(area_listList, area_listItem); @@ -462,7 +465,6 @@ OpenAPI_location_filter_t *location_filter_listItem = OpenAPI_location_filter_parseFromJSON(location_filter_list_local); if (!location_filter_listItem) { ogs_error("No location_filter_listItem"); - OpenAPI_list_free(location_filter_listList); goto end; } OpenAPI_list_add(location_filter_listList, location_filter_listItem); @@ -495,7 +497,6 @@ OpenAPI_traffic_descriptor_t *traffic_descriptor_listItem = OpenAPI_traffic_descriptor_parseFromJSON(traffic_descriptor_list_local); if (!traffic_descriptor_listItem) { ogs_error("No traffic_descriptor_listItem"); - OpenAPI_list_free(traffic_descriptor_listList); goto end; } OpenAPI_list_add(traffic_descriptor_listList, traffic_descriptor_listItem); @@ -513,6 +514,10 @@ reachability_filter = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "reachabilityFilter"); if (reachability_filter) { reachability_filter_local_nonprim = OpenAPI_reachability_filter_parseFromJSON(reachability_filter); + if (!reachability_filter_local_nonprim) { + ogs_error("OpenAPI_reachability_filter_parseFromJSON failed reachability_filter"); + goto end; + } } udm_detect_ind = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "udmDetectInd"); @@ -568,6 +573,10 @@ target_area = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "targetArea"); if (target_area) { target_area_local_nonprim = OpenAPI_target_area_parseFromJSON(target_area); + if (!target_area_local_nonprim) { + ogs_error("OpenAPI_target_area_parseFromJSON failed target_area"); + goto end; + } } snssai_filter = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "snssaiFilter"); @@ -588,7 +597,6 @@ OpenAPI_ext_snssai_t *snssai_filterItem = OpenAPI_ext_snssai_parseFromJSON(snssai_filter_local); if (!snssai_filterItem) { ogs_error("No snssai_filterItem"); - OpenAPI_list_free(snssai_filterList); goto end; } OpenAPI_list_add(snssai_filterList, snssai_filterItem); @@ -598,6 +606,10 @@ ue_in_area_filter = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "ueInAreaFilter"); if (ue_in_area_filter) { ue_in_area_filter_local_nonprim = OpenAPI_ue_in_area_filter_parseFromJSON(ue_in_area_filter); + if (!ue_in_area_filter_local_nonprim) { + ogs_error("OpenAPI_ue_in_area_filter_parseFromJSON failed ue_in_area_filter"); + goto end; + } } min_interval = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "minInterval"); @@ -627,6 +639,10 @@ dispersion_area = cJSON_GetObjectItemCaseSensitive(amf_eventJSON, "dispersionArea"); if (dispersion_area) { dispersion_area_local_nonprim = OpenAPI_dispersion_area_parseFromJSON(dispersion_area); + if (!dispersion_area_local_nonprim) { + ogs_error("OpenAPI_dispersion_area_parseFromJSON failed dispersion_area"); + goto end; + } } amf_event_local_var = OpenAPI_amf_event_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_event_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_event_area.c
Changed
@@ -123,16 +123,28 @@ presence_info = cJSON_GetObjectItemCaseSensitive(amf_event_areaJSON, "presenceInfo"); if (presence_info) { presence_info_local_nonprim = OpenAPI_presence_info_parseFromJSON(presence_info); + if (!presence_info_local_nonprim) { + ogs_error("OpenAPI_presence_info_parseFromJSON failed presence_info"); + goto end; + } } ladn_info = cJSON_GetObjectItemCaseSensitive(amf_event_areaJSON, "ladnInfo"); if (ladn_info) { ladn_info_local_nonprim = OpenAPI_ladn_info_parseFromJSON(ladn_info); + if (!ladn_info_local_nonprim) { + ogs_error("OpenAPI_ladn_info_parseFromJSON failed ladn_info"); + goto end; + } } s_nssai = cJSON_GetObjectItemCaseSensitive(amf_event_areaJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } nsi_id = cJSON_GetObjectItemCaseSensitive(amf_event_areaJSON, "nsiId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_event_mode.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_event_mode.c
Changed
@@ -155,6 +155,10 @@ goto end; } trigger_local_nonprim = OpenAPI_amf_event_trigger_parseFromJSON(trigger); + if (!trigger_local_nonprim) { + ogs_error("OpenAPI_amf_event_trigger_parseFromJSON failed trigger"); + goto end; + } max_reports = cJSON_GetObjectItemCaseSensitive(amf_event_modeJSON, "maxReports"); if (max_reports) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_event_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_event_subscription.c
Changed
@@ -369,7 +369,6 @@ OpenAPI_amf_event_t *event_listItem = OpenAPI_amf_event_parseFromJSON(event_list_local); if (!event_listItem) { ogs_error("No event_listItem"); - OpenAPI_list_free(event_listList); goto end; } OpenAPI_list_add(event_listList, event_listItem); @@ -548,6 +547,10 @@ options = cJSON_GetObjectItemCaseSensitive(amf_event_subscriptionJSON, "options"); if (options) { options_local_nonprim = OpenAPI_amf_event_mode_parseFromJSON(options); + if (!options_local_nonprim) { + ogs_error("OpenAPI_amf_event_mode_parseFromJSON failed options"); + goto end; + } } source_nf_type = cJSON_GetObjectItemCaseSensitive(amf_event_subscriptionJSON, "sourceNfType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_info.c
Changed
@@ -286,7 +286,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem); @@ -310,7 +309,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -335,7 +333,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -360,7 +357,6 @@ OpenAPI_guami_t *backup_info_amf_failureItem = OpenAPI_guami_parseFromJSON(backup_info_amf_failure_local); if (!backup_info_amf_failureItem) { ogs_error("No backup_info_amf_failureItem"); - OpenAPI_list_free(backup_info_amf_failureList); goto end; } OpenAPI_list_add(backup_info_amf_failureList, backup_info_amf_failureItem); @@ -385,7 +381,6 @@ OpenAPI_guami_t *backup_info_amf_removalItem = OpenAPI_guami_parseFromJSON(backup_info_amf_removal_local); if (!backup_info_amf_removalItem) { ogs_error("No backup_info_amf_removalItem"); - OpenAPI_list_free(backup_info_amf_removalList); goto end; } OpenAPI_list_add(backup_info_amf_removalList, backup_info_amf_removalItem); @@ -395,6 +390,10 @@ n2_interface_amf_info = cJSON_GetObjectItemCaseSensitive(amf_infoJSON, "n2InterfaceAmfInfo"); if (n2_interface_amf_info) { n2_interface_amf_info_local_nonprim = OpenAPI_n2_interface_amf_info_parseFromJSON(n2_interface_amf_info); + if (!n2_interface_amf_info_local_nonprim) { + ogs_error("OpenAPI_n2_interface_amf_info_parseFromJSON failed n2_interface_amf_info"); + goto end; + } } amf_onboarding_capability = cJSON_GetObjectItemCaseSensitive(amf_infoJSON, "amfOnboardingCapability");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c
Changed
@@ -539,6 +539,10 @@ goto end; } guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } backup_amf_info = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registrationJSON, "backupAmfInfo"); if (backup_amf_info) { @@ -558,7 +562,6 @@ OpenAPI_backup_amf_info_t *backup_amf_infoItem = OpenAPI_backup_amf_info_parseFromJSON(backup_amf_info_local); if (!backup_amf_infoItem) { ogs_error("No backup_amf_infoItem"); - OpenAPI_list_free(backup_amf_infoList); goto end; } OpenAPI_list_add(backup_amf_infoList, backup_amf_infoItem); @@ -603,11 +606,19 @@ vgmlc_address = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registrationJSON, "vgmlcAddress"); if (vgmlc_address) { vgmlc_address_local_nonprim = OpenAPI_vgmlc_address_parseFromJSON(vgmlc_address); + if (!vgmlc_address_local_nonprim) { + ogs_error("OpenAPI_vgmlc_address_parseFromJSON failed vgmlc_address"); + goto end; + } } context_info = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registrationJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } no_ee_subscription_ind = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registrationJSON, "noEeSubscriptionInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c
Changed
@@ -136,6 +136,10 @@ goto end; } guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } purge_flag = cJSON_GetObjectItemCaseSensitive(amf_non3_gpp_access_registration_modificationJSON, "purgeFlag"); if (purge_flag) { @@ -180,7 +184,6 @@ OpenAPI_backup_amf_info_t *backup_amf_infoItem = OpenAPI_backup_amf_info_parseFromJSON(backup_amf_info_local); if (!backup_amf_infoItem) { ogs_error("No backup_amf_infoItem"); - OpenAPI_list_free(backup_amf_infoList); goto end; } OpenAPI_list_add(backup_amf_infoList, backup_amf_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_status_change_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_status_change_notification.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_amf_status_info_t *amf_status_info_listItem = OpenAPI_amf_status_info_parseFromJSON(amf_status_info_list_local); if (!amf_status_info_listItem) { ogs_error("No amf_status_info_listItem"); - OpenAPI_list_free(amf_status_info_listList); goto end; } OpenAPI_list_add(amf_status_info_listList, amf_status_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_status_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_status_info.c
Changed
@@ -134,7 +134,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/amf_subscription_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/amf_subscription_info.c
Changed
@@ -141,6 +141,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(amf_subscription_infoJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } amf_subscription_info_local_var = OpenAPI_amf_subscription_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/analytics_metadata_indication.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/analytics_metadata_indication.c
Changed
@@ -140,6 +140,10 @@ data_window = cJSON_GetObjectItemCaseSensitive(analytics_metadata_indicationJSON, "dataWindow"); if (data_window) { data_window_local_nonprim = OpenAPI_time_window_parseFromJSON(data_window); + if (!data_window_local_nonprim) { + ogs_error("OpenAPI_time_window_parseFromJSON failed data_window"); + goto end; + } } data_stat_props = cJSON_GetObjectItemCaseSensitive(analytics_metadata_indicationJSON, "dataStatProps"); @@ -160,7 +164,6 @@ OpenAPI_dataset_statistical_property_t *data_stat_propsItem = OpenAPI_dataset_statistical_property_parseFromJSON(data_stat_props_local); if (!data_stat_propsItem) { ogs_error("No data_stat_propsItem"); - OpenAPI_list_free(data_stat_propsList); goto end; } OpenAPI_list_add(data_stat_propsList, data_stat_propsItem); @@ -170,6 +173,10 @@ strategy = cJSON_GetObjectItemCaseSensitive(analytics_metadata_indicationJSON, "strategy"); if (strategy) { strategy_local_nonprim = OpenAPI_output_strategy_parseFromJSON(strategy); + if (!strategy_local_nonprim) { + ogs_error("OpenAPI_output_strategy_parseFromJSON failed strategy"); + goto end; + } } aggr_nwdaf_ids = cJSON_GetObjectItemCaseSensitive(analytics_metadata_indicationJSON, "aggrNwdafIds");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/analytics_metadata_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/analytics_metadata_info.c
Changed
@@ -156,6 +156,10 @@ data_window = cJSON_GetObjectItemCaseSensitive(analytics_metadata_infoJSON, "dataWindow"); if (data_window) { data_window_local_nonprim = OpenAPI_time_window_parseFromJSON(data_window); + if (!data_window_local_nonprim) { + ogs_error("OpenAPI_time_window_parseFromJSON failed data_window"); + goto end; + } } data_stat_props = cJSON_GetObjectItemCaseSensitive(analytics_metadata_infoJSON, "dataStatProps"); @@ -176,7 +180,6 @@ OpenAPI_dataset_statistical_property_t *data_stat_propsItem = OpenAPI_dataset_statistical_property_parseFromJSON(data_stat_props_local); if (!data_stat_propsItem) { ogs_error("No data_stat_propsItem"); - OpenAPI_list_free(data_stat_propsList); goto end; } OpenAPI_list_add(data_stat_propsList, data_stat_propsItem); @@ -186,11 +189,19 @@ strategy = cJSON_GetObjectItemCaseSensitive(analytics_metadata_infoJSON, "strategy"); if (strategy) { strategy_local_nonprim = OpenAPI_output_strategy_parseFromJSON(strategy); + if (!strategy_local_nonprim) { + ogs_error("OpenAPI_output_strategy_parseFromJSON failed strategy"); + goto end; + } } accuracy = cJSON_GetObjectItemCaseSensitive(analytics_metadata_infoJSON, "accuracy"); if (accuracy) { accuracy_local_nonprim = OpenAPI_accuracy_parseFromJSON(accuracy); + if (!accuracy_local_nonprim) { + ogs_error("OpenAPI_accuracy_parseFromJSON failed accuracy"); + goto end; + } } analytics_metadata_info_local_var = OpenAPI_analytics_metadata_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/analytics_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/analytics_subscription.c
Changed
@@ -137,7 +137,6 @@ OpenAPI_nwdaf_subscription_t *nwdaf_subscription_listItem = OpenAPI_nwdaf_subscription_parseFromJSON(nwdaf_subscription_list_local); if (!nwdaf_subscription_listItem) { ogs_error("No nwdaf_subscription_listItem"); - OpenAPI_list_free(nwdaf_subscription_listList); goto end; } OpenAPI_list_add(nwdaf_subscription_listList, nwdaf_subscription_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/api_ie_mapping.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/api_ie_mapping.c
Changed
@@ -114,6 +114,10 @@ goto end; } api_signature_local_nonprim = OpenAPI_api_signature_parseFromJSON(api_signature); + if (!api_signature_local_nonprim) { + ogs_error("OpenAPI_api_signature_parseFromJSON failed api_signature"); + goto end; + } api_method = cJSON_GetObjectItemCaseSensitive(api_ie_mappingJSON, "apiMethod"); if (!api_method) { @@ -147,7 +151,6 @@ OpenAPI_ie_info_t *ie_listItem = OpenAPI_ie_info_parseFromJSON(ie_list_local); if (!ie_listItem) { ogs_error("No ie_listItem"); - OpenAPI_list_free(ie_listList); goto end; } OpenAPI_list_add(ie_listList, ie_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_detection_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_detection_info.c
Changed
@@ -136,7 +136,6 @@ OpenAPI_flow_information_t *sdf_descriptionsItem = OpenAPI_flow_information_parseFromJSON(sdf_descriptions_local); if (!sdf_descriptionsItem) { ogs_error("No sdf_descriptionsItem"); - OpenAPI_list_free(sdf_descriptionsList); goto end; } OpenAPI_list_add(sdf_descriptionsList, sdf_descriptionsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_list_for_ue_comm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_list_for_ue_comm.c
Changed
@@ -155,6 +155,10 @@ spatial_validity = cJSON_GetObjectItemCaseSensitive(app_list_for_ue_commJSON, "spatialValidity"); if (spatial_validity) { spatial_validity_local_nonprim = OpenAPI_network_area_info_parseFromJSON(spatial_validity); + if (!spatial_validity_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed spatial_validity"); + goto end; + } } app_list_for_ue_comm_local_var = OpenAPI_app_list_for_ue_comm_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_session_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_session_context.c
Changed
@@ -109,16 +109,28 @@ asc_req_data = cJSON_GetObjectItemCaseSensitive(app_session_contextJSON, "ascReqData"); if (asc_req_data) { asc_req_data_local_nonprim = OpenAPI_app_session_context_req_data_parseFromJSON(asc_req_data); + if (!asc_req_data_local_nonprim) { + ogs_error("OpenAPI_app_session_context_req_data_parseFromJSON failed asc_req_data"); + goto end; + } } asc_resp_data = cJSON_GetObjectItemCaseSensitive(app_session_contextJSON, "ascRespData"); if (asc_resp_data) { asc_resp_data_local_nonprim = OpenAPI_app_session_context_resp_data_parseFromJSON(asc_resp_data); + if (!asc_resp_data_local_nonprim) { + ogs_error("OpenAPI_app_session_context_resp_data_parseFromJSON failed asc_resp_data"); + goto end; + } } evs_notif = cJSON_GetObjectItemCaseSensitive(app_session_contextJSON, "evsNotif"); if (evs_notif) { evs_notif_local_nonprim = OpenAPI_events_notification_parseFromJSON(evs_notif); + if (!evs_notif_local_nonprim) { + ogs_error("OpenAPI_events_notification_parseFromJSON failed evs_notif"); + goto end; + } } app_session_context_local_var = OpenAPI_app_session_context_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_session_context_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_session_context_req_data.c
Changed
@@ -575,6 +575,10 @@ af_rout_req = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "afRoutReq"); if (af_rout_req) { af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_parseFromJSON(af_rout_req); + if (!af_rout_req_local_nonprim) { + ogs_error("OpenAPI_af_routing_requirement_parseFromJSON failed af_rout_req"); + goto end; + } } asp_id = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "aspId"); @@ -604,6 +608,10 @@ ev_subsc = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "evSubsc"); if (ev_subsc) { ev_subsc_local_nonprim = OpenAPI_events_subsc_req_data_parseFromJSON(ev_subsc); + if (!ev_subsc_local_nonprim) { + ogs_error("OpenAPI_events_subsc_req_data_parseFromJSON failed ev_subsc"); + goto end; + } } mcptt_id = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "mcpttId"); @@ -729,6 +737,10 @@ slice_info = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "sliceInfo"); if (slice_info) { slice_info_local_nonprim = OpenAPI_snssai_parseFromJSON(slice_info); + if (!slice_info_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed slice_info"); + goto end; + } } spon_id = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "sponId"); @@ -801,11 +813,19 @@ tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(app_session_context_req_dataJSON, "tsnPortManContNwtts"); @@ -826,7 +846,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_session_context_resp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_session_context_resp_data.c
Changed
@@ -122,7 +122,6 @@ OpenAPI_ue_identity_info_t *ue_idsItem = OpenAPI_ue_identity_info_parseFromJSON(ue_ids_local); if (!ue_idsItem) { ogs_error("No ue_idsItem"); - OpenAPI_list_free(ue_idsList); goto end; } OpenAPI_list_add(ue_idsList, ue_idsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_session_context_update_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_session_context_update_data.c
Changed
@@ -389,6 +389,10 @@ af_rout_req = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "afRoutReq"); if (af_rout_req) { af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_rm_parseFromJSON(af_rout_req); + if (!af_rout_req_local_nonprim) { + ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON failed af_rout_req"); + goto end; + } } asp_id = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "aspId"); @@ -410,6 +414,10 @@ ev_subsc = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "evSubsc"); if (ev_subsc) { ev_subsc_local_nonprim = OpenAPI_events_subsc_req_data_rm_parseFromJSON(ev_subsc); + if (!ev_subsc_local_nonprim) { + ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON failed ev_subsc"); + goto end; + } } mcptt_id = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "mcpttId"); @@ -482,6 +490,10 @@ preempt_control_info = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "preemptControlInfo"); if (preempt_control_info) { preempt_control_info_local_nonprim = OpenAPI_preemption_control_information_rm_parseFromJSON(preempt_control_info); + if (!preempt_control_info_local_nonprim) { + ogs_error("OpenAPI_preemption_control_information_rm_parseFromJSON failed preempt_control_info"); + goto end; + } } res_prio = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "resPrio"); @@ -531,11 +543,19 @@ tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "tsnPortManContNwtts"); @@ -556,7 +576,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/app_session_context_update_data_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/app_session_context_update_data_patch.c
Changed
@@ -67,6 +67,10 @@ asc_req_data = cJSON_GetObjectItemCaseSensitive(app_session_context_update_data_patchJSON, "ascReqData"); if (asc_req_data) { asc_req_data_local_nonprim = OpenAPI_app_session_context_update_data_parseFromJSON(asc_req_data); + if (!asc_req_data_local_nonprim) { + ogs_error("OpenAPI_app_session_context_update_data_parseFromJSON failed asc_req_data"); + goto end; + } } app_session_context_update_data_patch_local_var = OpenAPI_app_session_context_update_data_patch_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/application_data_change_notif.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/application_data_change_notif.c
Changed
@@ -167,16 +167,28 @@ iptv_config_data = cJSON_GetObjectItemCaseSensitive(application_data_change_notifJSON, "iptvConfigData"); if (iptv_config_data) { iptv_config_data_local_nonprim = OpenAPI_iptv_config_data_parseFromJSON(iptv_config_data); + if (!iptv_config_data_local_nonprim) { + ogs_error("OpenAPI_iptv_config_data_parseFromJSON failed iptv_config_data"); + goto end; + } } pfd_data = cJSON_GetObjectItemCaseSensitive(application_data_change_notifJSON, "pfdData"); if (pfd_data) { pfd_data_local_nonprim = OpenAPI_pfd_change_notification_parseFromJSON(pfd_data); + if (!pfd_data_local_nonprim) { + ogs_error("OpenAPI_pfd_change_notification_parseFromJSON failed pfd_data"); + goto end; + } } bdt_policy_data = cJSON_GetObjectItemCaseSensitive(application_data_change_notifJSON, "bdtPolicyData"); if (bdt_policy_data) { bdt_policy_data_local_nonprim = OpenAPI_bdt_policy_data_parseFromJSON(bdt_policy_data); + if (!bdt_policy_data_local_nonprim) { + ogs_error("OpenAPI_bdt_policy_data_parseFromJSON failed bdt_policy_data"); + goto end; + } } res_uri = cJSON_GetObjectItemCaseSensitive(application_data_change_notifJSON, "resUri"); @@ -192,11 +204,19 @@ ser_param_data = cJSON_GetObjectItemCaseSensitive(application_data_change_notifJSON, "serParamData"); if (ser_param_data) { ser_param_data_local_nonprim = OpenAPI_service_parameter_data_parseFromJSON(ser_param_data); + if (!ser_param_data_local_nonprim) { + ogs_error("OpenAPI_service_parameter_data_parseFromJSON failed ser_param_data"); + goto end; + } } am_influ_data = cJSON_GetObjectItemCaseSensitive(application_data_change_notifJSON, "amInfluData"); if (am_influ_data) { am_influ_data_local_nonprim = OpenAPI_am_influ_data_parseFromJSON(am_influ_data); + if (!am_influ_data_local_nonprim) { + ogs_error("OpenAPI_am_influ_data_parseFromJSON failed am_influ_data"); + goto end; + } } application_data_change_notif_local_var = OpenAPI_application_data_change_notif_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/application_data_subs.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/application_data_subs.c
Changed
@@ -206,7 +206,6 @@ OpenAPI_data_filter_t *data_filtersItem = OpenAPI_data_filter_parseFromJSON(data_filters_local); if (!data_filtersItem) { ogs_error("No data_filtersItem"); - OpenAPI_list_free(data_filtersList); goto end; } OpenAPI_list_add(data_filtersList, data_filtersItem); @@ -247,7 +246,6 @@ OpenAPI_am_influ_data_t *am_influ_entriesItem = OpenAPI_am_influ_data_parseFromJSON(am_influ_entries_local); if (!am_influ_entriesItem) { ogs_error("No am_influ_entriesItem"); - OpenAPI_list_free(am_influ_entriesList); goto end; } OpenAPI_list_add(am_influ_entriesList, am_influ_entriesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/area_of_validity.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/area_of_validity.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/assign_ebi_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/assign_ebi_data.c
Changed
@@ -179,7 +179,6 @@ OpenAPI_arp_t *arp_listItem = OpenAPI_arp_parseFromJSON(arp_list_local); if (!arp_listItem) { ogs_error("No arp_listItem"); - OpenAPI_list_free(arp_listList); goto end; } OpenAPI_list_add(arp_listList, arp_listItem); @@ -216,6 +215,10 @@ old_guami = cJSON_GetObjectItemCaseSensitive(assign_ebi_dataJSON, "oldGuami"); if (old_guami) { old_guami_local_nonprim = OpenAPI_guami_parseFromJSON(old_guami); + if (!old_guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed old_guami"); + goto end; + } } modified_ebi_list = cJSON_GetObjectItemCaseSensitive(assign_ebi_dataJSON, "modifiedEbiList"); @@ -236,7 +239,6 @@ OpenAPI_ebi_arp_mapping_t *modified_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(modified_ebi_list_local); if (!modified_ebi_listItem) { ogs_error("No modified_ebi_listItem"); - OpenAPI_list_free(modified_ebi_listList); goto end; } OpenAPI_list_add(modified_ebi_listList, modified_ebi_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/assign_ebi_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/assign_ebi_error.c
Changed
@@ -95,6 +95,10 @@ goto end; } error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } failure_details = cJSON_GetObjectItemCaseSensitive(assign_ebi_errorJSON, "failureDetails"); if (!failure_details) { @@ -102,6 +106,10 @@ goto end; } failure_details_local_nonprim = OpenAPI_assign_ebi_failed_parseFromJSON(failure_details); + if (!failure_details_local_nonprim) { + ogs_error("OpenAPI_assign_ebi_failed_parseFromJSON failed failure_details"); + goto end; + } assign_ebi_error_local_var = OpenAPI_assign_ebi_error_create ( error_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/assign_ebi_failed.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/assign_ebi_failed.c
Changed
@@ -106,7 +106,6 @@ OpenAPI_arp_t *failed_arp_listItem = OpenAPI_arp_parseFromJSON(failed_arp_list_local); if (!failed_arp_listItem) { ogs_error("No failed_arp_listItem"); - OpenAPI_list_free(failed_arp_listList); goto end; } OpenAPI_list_add(failed_arp_listList, failed_arp_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/assigned_ebi_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/assigned_ebi_data.c
Changed
@@ -188,7 +188,6 @@ OpenAPI_ebi_arp_mapping_t *assigned_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(assigned_ebi_list_local); if (!assigned_ebi_listItem) { ogs_error("No assigned_ebi_listItem"); - OpenAPI_list_free(assigned_ebi_listList); goto end; } OpenAPI_list_add(assigned_ebi_listList, assigned_ebi_listItem); @@ -212,7 +211,6 @@ OpenAPI_arp_t *failed_arp_listItem = OpenAPI_arp_parseFromJSON(failed_arp_list_local); if (!failed_arp_listItem) { ogs_error("No failed_arp_listItem"); - OpenAPI_list_free(failed_arp_listList); goto end; } OpenAPI_list_add(failed_arp_listList, failed_arp_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ausf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ausf_info.c
Changed
@@ -162,7 +162,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -208,7 +207,6 @@ OpenAPI_suci_info_t *suci_infosItem = OpenAPI_suci_info_parseFromJSON(suci_infos_local); if (!suci_infosItem) { ogs_error("No suci_infosItem"); - OpenAPI_list_free(suci_infosList); goto end; } OpenAPI_list_add(suci_infosList, suci_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authentication_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authentication_info.c
Changed
@@ -269,6 +269,10 @@ resynchronization_info = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "resynchronizationInfo"); if (resynchronization_info) { resynchronization_info_local_nonprim = OpenAPI_resynchronization_info_parseFromJSON(resynchronization_info); + if (!resynchronization_info_local_nonprim) { + ogs_error("OpenAPI_resynchronization_info_parseFromJSON failed resynchronization_info"); + goto end; + } } pei = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "pei"); @@ -282,6 +286,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } udm_group_id = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "udmGroupId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authentication_info_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authentication_info_request.c
Changed
@@ -192,6 +192,10 @@ resynchronization_info = cJSON_GetObjectItemCaseSensitive(authentication_info_requestJSON, "resynchronizationInfo"); if (resynchronization_info) { resynchronization_info_local_nonprim = OpenAPI_resynchronization_info_parseFromJSON(resynchronization_info); + if (!resynchronization_info_local_nonprim) { + ogs_error("OpenAPI_resynchronization_info_parseFromJSON failed resynchronization_info"); + goto end; + } } ausf_instance_id = cJSON_GetObjectItemCaseSensitive(authentication_info_requestJSON, "ausfInstanceId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authentication_info_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authentication_info_result.c
Changed
@@ -192,6 +192,10 @@ authentication_vector = cJSON_GetObjectItemCaseSensitive(authentication_info_resultJSON, "authenticationVector"); if (authentication_vector) { authentication_vector_local_nonprim = OpenAPI_authentication_vector_parseFromJSON(authentication_vector); + if (!authentication_vector_local_nonprim) { + ogs_error("OpenAPI_authentication_vector_parseFromJSON failed authentication_vector"); + goto end; + } } supi = cJSON_GetObjectItemCaseSensitive(authentication_info_resultJSON, "supi"); @@ -244,7 +248,6 @@ OpenAPI_server_addressing_info_t *pvs_infoItem = OpenAPI_server_addressing_info_parseFromJSON(pvs_info_local); if (!pvs_infoItem) { ogs_error("No pvs_infoItem"); - OpenAPI_list_free(pvs_infoList); goto end; } OpenAPI_list_add(pvs_infoList, pvs_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authentication_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authentication_subscription.c
Changed
@@ -280,6 +280,10 @@ sequence_number = cJSON_GetObjectItemCaseSensitive(authentication_subscriptionJSON, "sequenceNumber"); if (sequence_number) { sequence_number_local_nonprim = OpenAPI_sequence_number_parseFromJSON(sequence_number); + if (!sequence_number_local_nonprim) { + ogs_error("OpenAPI_sequence_number_parseFromJSON failed sequence_number"); + goto end; + } } authentication_management_field = cJSON_GetObjectItemCaseSensitive(authentication_subscriptionJSON, "authenticationManagementField");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authorization_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authorization_data.c
Changed
@@ -186,7 +186,6 @@ OpenAPI_user_identifier_t *authorization_dataItem = OpenAPI_user_identifier_parseFromJSON(authorization_data_local); if (!authorization_dataItem) { ogs_error("No authorization_dataItem"); - OpenAPI_list_free(authorization_dataList); goto end; } OpenAPI_list_add(authorization_dataList, authorization_dataItem); @@ -231,7 +230,6 @@ OpenAPI_snssai_t *allowed_snssai_listItem = OpenAPI_snssai_parseFromJSON(allowed_snssai_list_local); if (!allowed_snssai_listItem) { ogs_error("No allowed_snssai_listItem"); - OpenAPI_list_free(allowed_snssai_listList); goto end; } OpenAPI_list_add(allowed_snssai_listList, allowed_snssai_listItem); @@ -256,7 +254,6 @@ OpenAPI_mtc_provider_t *allowed_mtc_providersItem = OpenAPI_mtc_provider_parseFromJSON(allowed_mtc_providers_local); if (!allowed_mtc_providersItem) { ogs_error("No allowed_mtc_providersItem"); - OpenAPI_list_free(allowed_mtc_providersList); goto end; } OpenAPI_list_add(allowed_mtc_providersList, allowed_mtc_providersItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authorization_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authorization_info.c
Changed
@@ -183,6 +183,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(authorization_infoJSON, "dnn"); if (!dnn) { @@ -241,6 +245,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(authorization_infoJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } authorization_info_local_var = OpenAPI_authorization_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authorized_default_qos.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authorized_default_qos.c
Changed
@@ -191,6 +191,10 @@ arp = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "arp"); if (arp) { arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } } priority_level = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "priorityLevel");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/authorized_network_slice_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/authorized_network_slice_info.c
Changed
@@ -385,7 +385,6 @@ OpenAPI_allowed_nssai_t *allowed_nssai_listItem = OpenAPI_allowed_nssai_parseFromJSON(allowed_nssai_list_local); if (!allowed_nssai_listItem) { ogs_error("No allowed_nssai_listItem"); - OpenAPI_list_free(allowed_nssai_listList); goto end; } OpenAPI_list_add(allowed_nssai_listList, allowed_nssai_listItem); @@ -410,7 +409,6 @@ OpenAPI_configured_snssai_t *configured_nssaiItem = OpenAPI_configured_snssai_parseFromJSON(configured_nssai_local); if (!configured_nssaiItem) { ogs_error("No configured_nssaiItem"); - OpenAPI_list_free(configured_nssaiList); goto end; } OpenAPI_list_add(configured_nssaiList, configured_nssaiItem); @@ -464,7 +462,6 @@ OpenAPI_snssai_t *rejected_nssai_in_plmnItem = OpenAPI_snssai_parseFromJSON(rejected_nssai_in_plmn_local); if (!rejected_nssai_in_plmnItem) { ogs_error("No rejected_nssai_in_plmnItem"); - OpenAPI_list_free(rejected_nssai_in_plmnList); goto end; } OpenAPI_list_add(rejected_nssai_in_plmnList, rejected_nssai_in_plmnItem); @@ -489,7 +486,6 @@ OpenAPI_snssai_t *rejected_nssai_in_taItem = OpenAPI_snssai_parseFromJSON(rejected_nssai_in_ta_local); if (!rejected_nssai_in_taItem) { ogs_error("No rejected_nssai_in_taItem"); - OpenAPI_list_free(rejected_nssai_in_taList); goto end; } OpenAPI_list_add(rejected_nssai_in_taList, rejected_nssai_in_taItem); @@ -499,6 +495,10 @@ nsi_information = cJSON_GetObjectItemCaseSensitive(authorized_network_slice_infoJSON, "nsiInformation"); if (nsi_information) { nsi_information_local_nonprim = OpenAPI_nsi_information_parseFromJSON(nsi_information); + if (!nsi_information_local_nonprim) { + ogs_error("OpenAPI_nsi_information_parseFromJSON failed nsi_information"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(authorized_network_slice_infoJSON, "supportedFeatures"); @@ -589,7 +589,6 @@ OpenAPI_snssai_t *target_nssaiItem = OpenAPI_snssai_parseFromJSON(target_nssai_local); if (!target_nssaiItem) { ogs_error("No target_nssaiItem"); - OpenAPI_list_free(target_nssaiList); goto end; } OpenAPI_list_add(target_nssaiList, target_nssaiItem); @@ -614,7 +613,6 @@ OpenAPI_nsag_info_t *nsag_infosItem = OpenAPI_nsag_info_parseFromJSON(nsag_infos_local); if (!nsag_infosItem) { ogs_error("No nsag_infosItem"); - OpenAPI_list_free(nsag_infosList); goto end; } OpenAPI_list_add(nsag_infosList, nsag_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/backup_amf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/backup_amf_info.c
Changed
@@ -114,7 +114,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bdt_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bdt_data.c
Changed
@@ -275,6 +275,10 @@ goto end; } trans_policy_local_nonprim = OpenAPI_transfer_policy_parseFromJSON(trans_policy); + if (!trans_policy_local_nonprim) { + ogs_error("OpenAPI_transfer_policy_parseFromJSON failed trans_policy"); + goto end; + } bdt_ref_id = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "bdtRefId"); if (bdt_ref_id) { @@ -287,6 +291,10 @@ nw_area_info = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "nwAreaInfo"); if (nw_area_info) { nw_area_info_local_nonprim = OpenAPI_network_area_info_2_parseFromJSON(nw_area_info); + if (!nw_area_info_local_nonprim) { + ogs_error("OpenAPI_network_area_info_2_parseFromJSON failed nw_area_info"); + goto end; + } } num_of_ues = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "numOfUes"); @@ -300,6 +308,10 @@ vol_per_ue = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "volPerUe"); if (vol_per_ue) { vol_per_ue_local_nonprim = OpenAPI_usage_threshold_parseFromJSON(vol_per_ue); + if (!vol_per_ue_local_nonprim) { + ogs_error("OpenAPI_usage_threshold_parseFromJSON failed vol_per_ue"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "dnn"); @@ -313,6 +325,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } traffic_des = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "trafficDes"); @@ -326,6 +342,10 @@ bdtp_status = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "bdtpStatus"); if (bdtp_status) { bdtp_status_local_nonprim = OpenAPI_bdt_policy_status_parseFromJSON(bdtp_status); + if (!bdtp_status_local_nonprim) { + ogs_error("OpenAPI_bdt_policy_status_parseFromJSON failed bdtp_status"); + goto end; + } } supp_feat = cJSON_GetObjectItemCaseSensitive(bdt_dataJSON, "suppFeat");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bdt_data_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bdt_data_patch.c
Changed
@@ -88,11 +88,19 @@ trans_policy = cJSON_GetObjectItemCaseSensitive(bdt_data_patchJSON, "transPolicy"); if (trans_policy) { trans_policy_local_nonprim = OpenAPI_transfer_policy_parseFromJSON(trans_policy); + if (!trans_policy_local_nonprim) { + ogs_error("OpenAPI_transfer_policy_parseFromJSON failed trans_policy"); + goto end; + } } bdtp_status = cJSON_GetObjectItemCaseSensitive(bdt_data_patchJSON, "bdtpStatus"); if (bdtp_status) { bdtp_status_local_nonprim = OpenAPI_bdt_policy_status_parseFromJSON(bdtp_status); + if (!bdtp_status_local_nonprim) { + ogs_error("OpenAPI_bdt_policy_status_parseFromJSON failed bdtp_status"); + goto end; + } } bdt_data_patch_local_var = OpenAPI_bdt_data_patch_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bdt_policy_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bdt_policy_data.c
Changed
@@ -198,6 +198,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(bdt_policy_dataJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } res_uri = cJSON_GetObjectItemCaseSensitive(bdt_policy_dataJSON, "resUri");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/binding_resp.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/binding_resp.c
Changed
@@ -110,7 +110,6 @@ OpenAPI_ip_end_point_t *pcf_sm_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_sm_ip_end_points_local); if (!pcf_sm_ip_end_pointsItem) { ogs_error("No pcf_sm_ip_end_pointsItem"); - OpenAPI_list_free(pcf_sm_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_sm_ip_end_pointsList, pcf_sm_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bsf_event_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bsf_event_notification.c
Changed
@@ -145,6 +145,10 @@ pcf_for_ue_info = cJSON_GetObjectItemCaseSensitive(bsf_event_notificationJSON, "pcfForUeInfo"); if (pcf_for_ue_info) { pcf_for_ue_info_local_nonprim = OpenAPI_pcf_for_ue_info_parseFromJSON(pcf_for_ue_info); + if (!pcf_for_ue_info_local_nonprim) { + ogs_error("OpenAPI_pcf_for_ue_info_parseFromJSON failed pcf_for_ue_info"); + goto end; + } } pcf_for_pdu_sess_infos = cJSON_GetObjectItemCaseSensitive(bsf_event_notificationJSON, "pcfForPduSessInfos"); @@ -165,7 +169,6 @@ OpenAPI_pcf_for_pdu_session_info_t *pcf_for_pdu_sess_infosItem = OpenAPI_pcf_for_pdu_session_info_parseFromJSON(pcf_for_pdu_sess_infos_local); if (!pcf_for_pdu_sess_infosItem) { ogs_error("No pcf_for_pdu_sess_infosItem"); - OpenAPI_list_free(pcf_for_pdu_sess_infosList); goto end; } OpenAPI_list_add(pcf_for_pdu_sess_infosList, pcf_for_pdu_sess_infosItem); @@ -190,7 +193,6 @@ OpenAPI_snssai_dnn_pair_t *match_snssai_dnnsItem = OpenAPI_snssai_dnn_pair_parseFromJSON(match_snssai_dnns_local); if (!match_snssai_dnnsItem) { ogs_error("No match_snssai_dnnsItem"); - OpenAPI_list_free(match_snssai_dnnsList); goto end; } OpenAPI_list_add(match_snssai_dnnsList, match_snssai_dnnsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bsf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bsf_info.c
Changed
@@ -303,7 +303,6 @@ OpenAPI_ipv4_address_range_t *ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_address_ranges_local); if (!ipv4_address_rangesItem) { ogs_error("No ipv4_address_rangesItem"); - OpenAPI_list_free(ipv4_address_rangesList); goto end; } OpenAPI_list_add(ipv4_address_rangesList, ipv4_address_rangesItem); @@ -328,7 +327,6 @@ OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local); if (!ipv6_prefix_rangesItem) { ogs_error("No ipv6_prefix_rangesItem"); - OpenAPI_list_free(ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem); @@ -377,7 +375,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -402,7 +399,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bsf_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bsf_notification.c
Changed
@@ -183,7 +183,6 @@ OpenAPI_bsf_event_notification_t *event_notifsItem = OpenAPI_bsf_event_notification_parseFromJSON(event_notifs_local); if (!event_notifsItem) { ogs_error("No event_notifsItem"); - OpenAPI_list_free(event_notifsList); goto end; } OpenAPI_list_add(event_notifsList, event_notifsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bsf_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bsf_subscription.c
Changed
@@ -253,6 +253,10 @@ snssai_dnn_pairs = cJSON_GetObjectItemCaseSensitive(bsf_subscriptionJSON, "snssaiDnnPairs"); if (snssai_dnn_pairs) { snssai_dnn_pairs_local_nonprim = OpenAPI_snssai_dnn_pair_parseFromJSON(snssai_dnn_pairs); + if (!snssai_dnn_pairs_local_nonprim) { + ogs_error("OpenAPI_snssai_dnn_pair_parseFromJSON failed snssai_dnn_pairs"); + goto end; + } } add_snssai_dnn_pairs = cJSON_GetObjectItemCaseSensitive(bsf_subscriptionJSON, "addSnssaiDnnPairs"); @@ -273,7 +277,6 @@ OpenAPI_snssai_dnn_pair_t *add_snssai_dnn_pairsItem = OpenAPI_snssai_dnn_pair_parseFromJSON(add_snssai_dnn_pairs_local); if (!add_snssai_dnn_pairsItem) { ogs_error("No add_snssai_dnn_pairsItem"); - OpenAPI_list_free(add_snssai_dnn_pairsList); goto end; } OpenAPI_list_add(add_snssai_dnn_pairsList, add_snssai_dnn_pairsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/bsf_subscription_resp.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/bsf_subscription_resp.c
Changed
@@ -321,6 +321,10 @@ snssai_dnn_pairs = cJSON_GetObjectItemCaseSensitive(bsf_subscription_respJSON, "snssaiDnnPairs"); if (snssai_dnn_pairs) { snssai_dnn_pairs_local_nonprim = OpenAPI_snssai_dnn_pair_parseFromJSON(snssai_dnn_pairs); + if (!snssai_dnn_pairs_local_nonprim) { + ogs_error("OpenAPI_snssai_dnn_pair_parseFromJSON failed snssai_dnn_pairs"); + goto end; + } } add_snssai_dnn_pairs = cJSON_GetObjectItemCaseSensitive(bsf_subscription_respJSON, "addSnssaiDnnPairs"); @@ -341,7 +345,6 @@ OpenAPI_snssai_dnn_pair_t *add_snssai_dnn_pairsItem = OpenAPI_snssai_dnn_pair_parseFromJSON(add_snssai_dnn_pairs_local); if (!add_snssai_dnn_pairsItem) { ogs_error("No add_snssai_dnn_pairsItem"); - OpenAPI_list_free(add_snssai_dnn_pairsList); goto end; } OpenAPI_list_add(add_snssai_dnn_pairsList, add_snssai_dnn_pairsItem); @@ -402,7 +405,6 @@ OpenAPI_bsf_event_notification_t *event_notifsItem = OpenAPI_bsf_event_notification_parseFromJSON(event_notifs_local); if (!event_notifsItem) { ogs_error("No event_notifsItem"); - OpenAPI_list_free(event_notifsList); goto end; } OpenAPI_list_add(event_notifsList, event_notifsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/cancel_relocate_ue_context_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/cancel_relocate_ue_context_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(cancel_relocate_ue_context_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_cancel_relocate_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_cancel_relocate_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_gtpc_message = cJSON_GetObjectItemCaseSensitive(cancel_relocate_ue_context_requestJSON, "binaryDataGtpcMessage");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/candidate_for_replacement.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/candidate_for_replacement.c
Changed
@@ -97,6 +97,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } dnns = cJSON_GetObjectItemCaseSensitive(candidate_for_replacementJSON, "dnns"); if (dnns) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/cell_global_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/cell_global_id.c
Changed
@@ -104,6 +104,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } lac = cJSON_GetObjectItemCaseSensitive(cell_global_idJSON, "lac"); if (!lac) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/chf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/chf_info.c
Changed
@@ -184,7 +184,6 @@ OpenAPI_supi_range_t *supi_range_listItem = OpenAPI_supi_range_parseFromJSON(supi_range_list_local); if (!supi_range_listItem) { ogs_error("No supi_range_listItem"); - OpenAPI_list_free(supi_range_listList); goto end; } OpenAPI_list_add(supi_range_listList, supi_range_listItem); @@ -209,7 +208,6 @@ OpenAPI_identity_range_t *gpsi_range_listItem = OpenAPI_identity_range_parseFromJSON(gpsi_range_list_local); if (!gpsi_range_listItem) { ogs_error("No gpsi_range_listItem"); - OpenAPI_list_free(gpsi_range_listList); goto end; } OpenAPI_list_add(gpsi_range_listList, gpsi_range_listItem); @@ -234,7 +232,6 @@ OpenAPI_plmn_range_t *plmn_range_listItem = OpenAPI_plmn_range_parseFromJSON(plmn_range_list_local); if (!plmn_range_listItem) { ogs_error("No plmn_range_listItem"); - OpenAPI_list_free(plmn_range_listList); goto end; } OpenAPI_list_add(plmn_range_listList, plmn_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/circumstance_description.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/circumstance_description.c
Changed
@@ -121,6 +121,10 @@ loc_area = cJSON_GetObjectItemCaseSensitive(circumstance_descriptionJSON, "locArea"); if (loc_area) { loc_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(loc_area); + if (!loc_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed loc_area"); + goto end; + } } vol = cJSON_GetObjectItemCaseSensitive(circumstance_descriptionJSON, "vol");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/class_criterion.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/class_criterion.c
Changed
@@ -103,6 +103,10 @@ goto end; } disper_class_local_nonprim = OpenAPI_dispersion_class_parseFromJSON(disper_class); + if (!disper_class_local_nonprim) { + ogs_error("OpenAPI_dispersion_class_parseFromJSON failed disper_class"); + goto end; + } class_threshold = cJSON_GetObjectItemCaseSensitive(class_criterionJSON, "classThreshold"); if (!class_threshold) { @@ -120,6 +124,10 @@ goto end; } thres_match_local_nonprim = OpenAPI_matching_direction_parseFromJSON(thres_match); + if (!thres_match_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed thres_match"); + goto end; + } class_criterion_local_var = OpenAPI_class_criterion_create ( disper_class_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/cm_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/cm_info.c
Changed
@@ -85,6 +85,10 @@ goto end; } cm_state_local_nonprim = OpenAPI_cm_state_parseFromJSON(cm_state); + if (!cm_state_local_nonprim) { + ogs_error("OpenAPI_cm_state_parseFromJSON failed cm_state"); + goto end; + } access_type = cJSON_GetObjectItemCaseSensitive(cm_infoJSON, "accessType"); if (!access_type) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/cn_assisted_ran_para.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/cn_assisted_ran_para.c
Changed
@@ -170,6 +170,10 @@ scheduled_communication_time = cJSON_GetObjectItemCaseSensitive(cn_assisted_ran_paraJSON, "scheduledCommunicationTime"); if (scheduled_communication_time) { scheduled_communication_time_local_nonprim = OpenAPI_scheduled_communication_time_parseFromJSON(scheduled_communication_time); + if (!scheduled_communication_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_parseFromJSON failed scheduled_communication_time"); + goto end; + } } scheduled_communication_type = cJSON_GetObjectItemCaseSensitive(cn_assisted_ran_paraJSON, "scheduledCommunicationType"); @@ -193,6 +197,10 @@ battery_indication = cJSON_GetObjectItemCaseSensitive(cn_assisted_ran_paraJSON, "batteryIndication"); if (battery_indication) { battery_indication_local_nonprim = OpenAPI_battery_indication_parseFromJSON(battery_indication); + if (!battery_indication_local_nonprim) { + ogs_error("OpenAPI_battery_indication_parseFromJSON failed battery_indication"); + goto end; + } } cn_assisted_ran_para_local_var = OpenAPI_cn_assisted_ran_para_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/cnf.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/cnf.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_cnf_unit_t *cnf_unitsItem = OpenAPI_cnf_unit_parseFromJSON(cnf_units_local); if (!cnf_unitsItem) { ogs_error("No cnf_unitsItem"); - OpenAPI_list_free(cnf_unitsList); goto end; } OpenAPI_list_add(cnf_unitsList, cnf_unitsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/cnf_unit.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/cnf_unit.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_atom_t *cnf_unitItem = OpenAPI_atom_parseFromJSON(cnf_unit_local); if (!cnf_unitItem) { ogs_error("No cnf_unitItem"); - OpenAPI_list_free(cnf_unitList); goto end; } OpenAPI_list_add(cnf_unitList, cnf_unitItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/communication_characteristics.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/communication_characteristics.c
Changed
@@ -163,11 +163,19 @@ pp_subs_reg_timer = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppSubsRegTimer"); if (pp_subs_reg_timer) { pp_subs_reg_timer_local_nonprim = OpenAPI_pp_subs_reg_timer_parseFromJSON(pp_subs_reg_timer); + if (!pp_subs_reg_timer_local_nonprim) { + ogs_error("OpenAPI_pp_subs_reg_timer_parseFromJSON failed pp_subs_reg_timer"); + goto end; + } } pp_active_time = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppActiveTime"); if (pp_active_time) { pp_active_time_local_nonprim = OpenAPI_pp_active_time_parseFromJSON(pp_active_time); + if (!pp_active_time_local_nonprim) { + ogs_error("OpenAPI_pp_active_time_parseFromJSON failed pp_active_time"); + goto end; + } } pp_dl_packet_count = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppDlPacketCount"); @@ -181,16 +189,28 @@ pp_dl_packet_count_ext = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppDlPacketCountExt"); if (pp_dl_packet_count_ext) { pp_dl_packet_count_ext_local_nonprim = OpenAPI_pp_dl_packet_count_ext_parseFromJSON(pp_dl_packet_count_ext); + if (!pp_dl_packet_count_ext_local_nonprim) { + ogs_error("OpenAPI_pp_dl_packet_count_ext_parseFromJSON failed pp_dl_packet_count_ext"); + goto end; + } } pp_maximum_response_time = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppMaximumResponseTime"); if (pp_maximum_response_time) { pp_maximum_response_time_local_nonprim = OpenAPI_pp_maximum_response_time_parseFromJSON(pp_maximum_response_time); + if (!pp_maximum_response_time_local_nonprim) { + ogs_error("OpenAPI_pp_maximum_response_time_parseFromJSON failed pp_maximum_response_time"); + goto end; + } } pp_maximum_latency = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppMaximumLatency"); if (pp_maximum_latency) { pp_maximum_latency_local_nonprim = OpenAPI_pp_maximum_latency_parseFromJSON(pp_maximum_latency); + if (!pp_maximum_latency_local_nonprim) { + ogs_error("OpenAPI_pp_maximum_latency_parseFromJSON failed pp_maximum_latency"); + goto end; + } } communication_characteristics_local_var = OpenAPI_communication_characteristics_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/complex_query.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/complex_query.c
Changed
@@ -122,7 +122,6 @@ OpenAPI_cnf_unit_t *cnf_unitsItem = OpenAPI_cnf_unit_parseFromJSON(cnf_units_local); if (!cnf_unitsItem) { ogs_error("No cnf_unitsItem"); - OpenAPI_list_free(cnf_unitsList); goto end; } OpenAPI_list_add(cnf_unitsList, cnf_unitsItem); @@ -149,7 +148,6 @@ OpenAPI_dnf_unit_t *dnf_unitsItem = OpenAPI_dnf_unit_parseFromJSON(dnf_units_local); if (!dnf_unitsItem) { ogs_error("No dnf_unitsItem"); - OpenAPI_list_free(dnf_unitsList); goto end; } OpenAPI_list_add(dnf_unitsList, dnf_unitsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/configured_snssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/configured_snssai.c
Changed
@@ -93,10 +93,18 @@ goto end; } configured_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(configured_snssai); + if (!configured_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed configured_snssai"); + goto end; + } mapped_home_snssai = cJSON_GetObjectItemCaseSensitive(configured_snssaiJSON, "mappedHomeSnssai"); if (mapped_home_snssai) { mapped_home_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(mapped_home_snssai); + if (!mapped_home_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed mapped_home_snssai"); + goto end; + } } configured_snssai_local_var = OpenAPI_configured_snssai_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/confirmation_data_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/confirmation_data_response.c
Changed
@@ -156,7 +156,6 @@ OpenAPI_server_addressing_info_t *pvs_infoItem = OpenAPI_server_addressing_info_parseFromJSON(pvs_info_local); if (!pvs_infoItem) { ogs_error("No pvs_infoItem"); - OpenAPI_list_free(pvs_infoList); goto end; } OpenAPI_list_add(pvs_infoList, pvs_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/congestion_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/congestion_info.c
Changed
@@ -184,6 +184,10 @@ goto end; } cong_type_local_nonprim = OpenAPI_congestion_type_parseFromJSON(cong_type); + if (!cong_type_local_nonprim) { + ogs_error("OpenAPI_congestion_type_parseFromJSON failed cong_type"); + goto end; + } time_intev = cJSON_GetObjectItemCaseSensitive(congestion_infoJSON, "timeIntev"); if (!time_intev) { @@ -191,6 +195,10 @@ goto end; } time_intev_local_nonprim = OpenAPI_time_window_parseFromJSON(time_intev); + if (!time_intev_local_nonprim) { + ogs_error("OpenAPI_time_window_parseFromJSON failed time_intev"); + goto end; + } nsi = cJSON_GetObjectItemCaseSensitive(congestion_infoJSON, "nsi"); if (!nsi) { @@ -198,6 +206,10 @@ goto end; } nsi_local_nonprim = OpenAPI_threshold_level_parseFromJSON(nsi); + if (!nsi_local_nonprim) { + ogs_error("OpenAPI_threshold_level_parseFromJSON failed nsi"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(congestion_infoJSON, "confidence"); if (confidence) { @@ -225,7 +237,6 @@ OpenAPI_top_application_t *top_app_list_ulItem = OpenAPI_top_application_parseFromJSON(top_app_list_ul_local); if (!top_app_list_ulItem) { ogs_error("No top_app_list_ulItem"); - OpenAPI_list_free(top_app_list_ulList); goto end; } OpenAPI_list_add(top_app_list_ulList, top_app_list_ulItem); @@ -250,7 +261,6 @@ OpenAPI_top_application_t *top_app_list_dlItem = OpenAPI_top_application_parseFromJSON(top_app_list_dl_local); if (!top_app_list_dlItem) { ogs_error("No top_app_list_dlItem"); - OpenAPI_list_free(top_app_list_dlList); goto end; } OpenAPI_list_add(top_app_list_dlList, top_app_list_dlItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/consumer_nf_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/consumer_nf_information.c
Changed
@@ -132,7 +132,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/context_data_sets.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/context_data_sets.c
Changed
@@ -301,11 +301,19 @@ amf3_gpp = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "amf3Gpp"); if (amf3_gpp) { amf3_gpp_local_nonprim = OpenAPI_amf3_gpp_access_registration_parseFromJSON(amf3_gpp); + if (!amf3_gpp_local_nonprim) { + ogs_error("OpenAPI_amf3_gpp_access_registration_parseFromJSON failed amf3_gpp"); + goto end; + } } amf_non3_gpp = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "amfNon3Gpp"); if (amf_non3_gpp) { amf_non3_gpp_local_nonprim = OpenAPI_amf_non3_gpp_access_registration_parseFromJSON(amf_non3_gpp); + if (!amf_non3_gpp_local_nonprim) { + ogs_error("OpenAPI_amf_non3_gpp_access_registration_parseFromJSON failed amf_non3_gpp"); + goto end; + } } sdm_subscriptions = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "sdmSubscriptions"); @@ -326,7 +334,6 @@ OpenAPI_sdm_subscription_t *sdm_subscriptionsItem = OpenAPI_sdm_subscription_parseFromJSON(sdm_subscriptions_local); if (!sdm_subscriptionsItem) { ogs_error("No sdm_subscriptionsItem"); - OpenAPI_list_free(sdm_subscriptionsList); goto end; } OpenAPI_list_add(sdm_subscriptionsList, sdm_subscriptionsItem); @@ -351,7 +358,6 @@ OpenAPI_ee_subscription_t *ee_subscriptionsItem = OpenAPI_ee_subscription_parseFromJSON(ee_subscriptions_local); if (!ee_subscriptionsItem) { ogs_error("No ee_subscriptionsItem"); - OpenAPI_list_free(ee_subscriptionsList); goto end; } OpenAPI_list_add(ee_subscriptionsList, ee_subscriptionsItem); @@ -361,11 +367,19 @@ smsf3_gpp_access = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "smsf3GppAccess"); if (smsf3_gpp_access) { smsf3_gpp_access_local_nonprim = OpenAPI_smsf_registration_parseFromJSON(smsf3_gpp_access); + if (!smsf3_gpp_access_local_nonprim) { + ogs_error("OpenAPI_smsf_registration_parseFromJSON failed smsf3_gpp_access"); + goto end; + } } smsf_non3_gpp_access = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "smsfNon3GppAccess"); if (smsf_non3_gpp_access) { smsf_non3_gpp_access_local_nonprim = OpenAPI_smsf_registration_parseFromJSON(smsf_non3_gpp_access); + if (!smsf_non3_gpp_access_local_nonprim) { + ogs_error("OpenAPI_smsf_registration_parseFromJSON failed smsf_non3_gpp_access"); + goto end; + } } subscription_data_subscriptions = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "subscriptionDataSubscriptions"); @@ -386,7 +400,6 @@ OpenAPI_subscription_data_subscriptions_t *subscription_data_subscriptionsItem = OpenAPI_subscription_data_subscriptions_parseFromJSON(subscription_data_subscriptions_local); if (!subscription_data_subscriptionsItem) { ogs_error("No subscription_data_subscriptionsItem"); - OpenAPI_list_free(subscription_data_subscriptionsList); goto end; } OpenAPI_list_add(subscription_data_subscriptionsList, subscription_data_subscriptionsItem); @@ -411,7 +424,6 @@ OpenAPI_smf_registration_t *smf_registrationsItem = OpenAPI_smf_registration_parseFromJSON(smf_registrations_local); if (!smf_registrationsItem) { ogs_error("No smf_registrationsItem"); - OpenAPI_list_free(smf_registrationsList); goto end; } OpenAPI_list_add(smf_registrationsList, smf_registrationsItem); @@ -421,16 +433,28 @@ ip_sm_gw = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "ipSmGw"); if (ip_sm_gw) { ip_sm_gw_local_nonprim = OpenAPI_ip_sm_gw_registration_parseFromJSON(ip_sm_gw); + if (!ip_sm_gw_local_nonprim) { + ogs_error("OpenAPI_ip_sm_gw_registration_parseFromJSON failed ip_sm_gw"); + goto end; + } } roaming_info = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "roamingInfo"); if (roaming_info) { roaming_info_local_nonprim = OpenAPI_roaming_info_update_parseFromJSON(roaming_info); + if (!roaming_info_local_nonprim) { + ogs_error("OpenAPI_roaming_info_update_parseFromJSON failed roaming_info"); + goto end; + } } pei_info = cJSON_GetObjectItemCaseSensitive(context_data_setsJSON, "peiInfo"); if (pei_info) { pei_info_local_nonprim = OpenAPI_pei_update_info_parseFromJSON(pei_info); + if (!pei_info_local_nonprim) { + ogs_error("OpenAPI_pei_update_info_parseFromJSON failed pei_info"); + goto end; + } } context_data_sets_local_var = OpenAPI_context_data_sets_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/create_ue_context_201_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/create_ue_context_201_response.c
Changed
@@ -339,6 +339,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(create_ue_context_201_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_created_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_created_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(create_ue_context_201_responseJSON, "binaryDataN2Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/create_ue_context_403_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/create_ue_context_403_response.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(create_ue_context_403_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_create_error_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_create_error_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(create_ue_context_403_responseJSON, "binaryDataN2Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/create_ue_context_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/create_ue_context_request.c
Changed
@@ -373,6 +373,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(create_ue_context_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_create_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_create_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(create_ue_context_requestJSON, "binaryDataN2Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/data_change_notify.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/data_change_notify.c
Changed
@@ -231,7 +231,6 @@ OpenAPI_notify_item_t *notify_itemsItem = OpenAPI_notify_item_parseFromJSON(notify_items_local); if (!notify_itemsItem) { ogs_error("No notify_itemsItem"); - OpenAPI_list_free(notify_itemsList); goto end; } OpenAPI_list_add(notify_itemsList, notify_itemsItem); @@ -241,6 +240,10 @@ sdm_subscription = cJSON_GetObjectItemCaseSensitive(data_change_notifyJSON, "sdmSubscription"); if (sdm_subscription) { sdm_subscription_local_nonprim = OpenAPI_sdm_subscription_1_parseFromJSON(sdm_subscription); + if (!sdm_subscription_local_nonprim) { + ogs_error("OpenAPI_sdm_subscription_1_parseFromJSON failed sdm_subscription"); + goto end; + } } additional_sdm_subscriptions = cJSON_GetObjectItemCaseSensitive(data_change_notifyJSON, "additionalSdmSubscriptions"); @@ -261,7 +264,6 @@ OpenAPI_sdm_subscription_1_t *additional_sdm_subscriptionsItem = OpenAPI_sdm_subscription_1_parseFromJSON(additional_sdm_subscriptions_local); if (!additional_sdm_subscriptionsItem) { ogs_error("No additional_sdm_subscriptionsItem"); - OpenAPI_list_free(additional_sdm_subscriptionsList); goto end; } OpenAPI_list_add(additional_sdm_subscriptionsList, additional_sdm_subscriptionsItem); @@ -286,7 +288,6 @@ OpenAPI_subscription_data_subscriptions_t *subscription_data_subscriptionsItem = OpenAPI_subscription_data_subscriptions_parseFromJSON(subscription_data_subscriptions_local); if (!subscription_data_subscriptionsItem) { ogs_error("No subscription_data_subscriptionsItem"); - OpenAPI_list_free(subscription_data_subscriptionsList); goto end; } OpenAPI_list_add(subscription_data_subscriptionsList, subscription_data_subscriptionsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/data_filter.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/data_filter.c
Changed
@@ -313,6 +313,10 @@ goto end; } data_ind_local_nonprim = OpenAPI_data_ind_parseFromJSON(data_ind); + if (!data_ind_local_nonprim) { + ogs_error("OpenAPI_data_ind_parseFromJSON failed data_ind"); + goto end; + } dnns = cJSON_GetObjectItemCaseSensitive(data_filterJSON, "dnns"); if (dnns) { @@ -353,7 +357,6 @@ OpenAPI_snssai_t *snssaisItem = OpenAPI_snssai_parseFromJSON(snssais_local); if (!snssaisItem) { ogs_error("No snssaisItem"); - OpenAPI_list_free(snssaisList); goto end; } OpenAPI_list_add(snssaisList, snssaisItem); @@ -512,7 +515,6 @@ OpenAPI_dnn_snssai_information_t *dnn_snssai_infosItem = OpenAPI_dnn_snssai_information_parseFromJSON(dnn_snssai_infos_local); if (!dnn_snssai_infosItem) { ogs_error("No dnn_snssai_infosItem"); - OpenAPI_list_free(dnn_snssai_infosList); goto end; } OpenAPI_list_add(dnn_snssai_infosList, dnn_snssai_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/data_restoration_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/data_restoration_notification.c
Changed
@@ -256,6 +256,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(data_restoration_notificationJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } supi_ranges = cJSON_GetObjectItemCaseSensitive(data_restoration_notificationJSON, "supiRanges"); @@ -276,7 +280,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -301,7 +304,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -347,7 +349,6 @@ OpenAPI_snssai_t *s_nssai_listItem = OpenAPI_snssai_parseFromJSON(s_nssai_list_local); if (!s_nssai_listItem) { ogs_error("No s_nssai_listItem"); - OpenAPI_list_free(s_nssai_listList); goto end; } OpenAPI_list_add(s_nssai_listList, s_nssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration.c
Changed
@@ -145,7 +145,6 @@ OpenAPI_ddd_traffic_descriptor_t *ddd_traffic_desItem = OpenAPI_ddd_traffic_descriptor_parseFromJSON(ddd_traffic_des_local); if (!ddd_traffic_desItem) { ogs_error("No ddd_traffic_desItem"); - OpenAPI_list_free(ddd_traffic_desList); goto end; } OpenAPI_list_add(ddd_traffic_desList, ddd_traffic_desItem); @@ -163,6 +162,10 @@ slice = cJSON_GetObjectItemCaseSensitive(datalink_reporting_configurationJSON, "slice"); if (slice) { slice_local_nonprim = OpenAPI_snssai_parseFromJSON(slice); + if (!slice_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed slice"); + goto end; + } } ddd_status_list = cJSON_GetObjectItemCaseSensitive(datalink_reporting_configurationJSON, "dddStatusList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/datalink_reporting_configuration_1.c
Changed
@@ -145,7 +145,6 @@ OpenAPI_ddd_traffic_descriptor_1_t *ddd_traffic_desItem = OpenAPI_ddd_traffic_descriptor_1_parseFromJSON(ddd_traffic_des_local); if (!ddd_traffic_desItem) { ogs_error("No ddd_traffic_desItem"); - OpenAPI_list_free(ddd_traffic_desList); goto end; } OpenAPI_list_add(ddd_traffic_desList, ddd_traffic_desItem); @@ -163,6 +162,10 @@ slice = cJSON_GetObjectItemCaseSensitive(datalink_reporting_configuration_1JSON, "slice"); if (slice) { slice_local_nonprim = OpenAPI_snssai_parseFromJSON(slice); + if (!slice_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed slice"); + goto end; + } } ddd_status_list = cJSON_GetObjectItemCaseSensitive(datalink_reporting_configuration_1JSON, "dddStatusList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dccf_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dccf_cond.c
Changed
@@ -209,7 +209,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -234,7 +233,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dccf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dccf_info.c
Changed
@@ -202,7 +202,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -227,7 +226,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ddn_failure_sub_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ddn_failure_sub_info.c
Changed
@@ -114,7 +114,6 @@ OpenAPI_ddd_traffic_descriptor_t *ddd_traffic_descriptor_listItem = OpenAPI_ddd_traffic_descriptor_parseFromJSON(ddd_traffic_descriptor_list_local); if (!ddd_traffic_descriptor_listItem) { ogs_error("No ddd_traffic_descriptor_listItem"); - OpenAPI_list_free(ddd_traffic_descriptor_listList); goto end; } OpenAPI_list_add(ddd_traffic_descriptor_listList, ddd_traffic_descriptor_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ddn_failure_subs.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ddn_failure_subs.c
Changed
@@ -108,7 +108,6 @@ OpenAPI_ddn_failure_sub_info_t *ddn_failure_subs_info_listItem = OpenAPI_ddn_failure_sub_info_parseFromJSON(ddn_failure_subs_info_list_local); if (!ddn_failure_subs_info_listItem) { ogs_error("No ddn_failure_subs_info_listItem"); - OpenAPI_list_free(ddn_failure_subs_info_listList); goto end; } OpenAPI_list_add(ddn_failure_subs_info_listList, ddn_failure_subs_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/default_unrelated_class.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/default_unrelated_class.c
Changed
@@ -156,7 +156,6 @@ OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local); if (!allowed_geographic_areaItem) { ogs_error("No allowed_geographic_areaItem"); - OpenAPI_list_free(allowed_geographic_areaList); goto end; } OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem); @@ -184,6 +183,10 @@ valid_time_period = cJSON_GetObjectItemCaseSensitive(default_unrelated_classJSON, "validTimePeriod"); if (valid_time_period) { valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period); + if (!valid_time_period_local_nonprim) { + ogs_error("OpenAPI_valid_time_period_parseFromJSON failed valid_time_period"); + goto end; + } } code_word_list = cJSON_GetObjectItemCaseSensitive(default_unrelated_classJSON, "codeWordList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dispersion_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dispersion_area.c
Changed
@@ -154,7 +154,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -179,7 +178,6 @@ OpenAPI_ncgi_t *ncgi_listItem = OpenAPI_ncgi_parseFromJSON(ncgi_list_local); if (!ncgi_listItem) { ogs_error("No ncgi_listItem"); - OpenAPI_list_free(ncgi_listList); goto end; } OpenAPI_list_add(ncgi_listList, ncgi_listItem); @@ -204,7 +202,6 @@ OpenAPI_ecgi_t *ecgi_listItem = OpenAPI_ecgi_parseFromJSON(ecgi_list_local); if (!ecgi_listItem) { ogs_error("No ecgi_listItem"); - OpenAPI_list_free(ecgi_listList); goto end; } OpenAPI_list_add(ecgi_listList, ecgi_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dispersion_collection.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dispersion_collection.c
Changed
@@ -246,11 +246,19 @@ ue_loc = cJSON_GetObjectItemCaseSensitive(dispersion_collectionJSON, "ueLoc"); if (ue_loc) { ue_loc_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_loc); + if (!ue_loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_loc"); + goto end; + } } snssai = cJSON_GetObjectItemCaseSensitive(dispersion_collectionJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } supis = cJSON_GetObjectItemCaseSensitive(dispersion_collectionJSON, "supis"); @@ -313,7 +321,6 @@ OpenAPI_application_volume_t *app_volumesItem = OpenAPI_application_volume_parseFromJSON(app_volumes_local); if (!app_volumesItem) { ogs_error("No app_volumesItem"); - OpenAPI_list_free(app_volumesList); goto end; } OpenAPI_list_add(app_volumesList, app_volumesItem); @@ -331,6 +338,10 @@ disper_class = cJSON_GetObjectItemCaseSensitive(dispersion_collectionJSON, "disperClass"); if (disper_class) { disper_class_local_nonprim = OpenAPI_dispersion_class_parseFromJSON(disper_class); + if (!disper_class_local_nonprim) { + ogs_error("OpenAPI_dispersion_class_parseFromJSON failed disper_class"); + goto end; + } } usage_rank = cJSON_GetObjectItemCaseSensitive(dispersion_collectionJSON, "usageRank");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dispersion_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dispersion_info.c
Changed
@@ -160,7 +160,6 @@ OpenAPI_dispersion_collection_t *disper_collectsItem = OpenAPI_dispersion_collection_parseFromJSON(disper_collects_local); if (!disper_collectsItem) { ogs_error("No disper_collectsItem"); - OpenAPI_list_free(disper_collectsList); goto end; } OpenAPI_list_add(disper_collectsList, disper_collectsItem); @@ -172,6 +171,10 @@ goto end; } disper_type_local_nonprim = OpenAPI_dispersion_type_parseFromJSON(disper_type); + if (!disper_type_local_nonprim) { + ogs_error("OpenAPI_dispersion_type_parseFromJSON failed disper_type"); + goto end; + } dispersion_info_local_var = OpenAPI_dispersion_info_create ( ogs_strdup(ts_start->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dispersion_requirement.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dispersion_requirement.c
Changed
@@ -168,6 +168,10 @@ goto end; } disper_type_local_nonprim = OpenAPI_dispersion_type_parseFromJSON(disper_type); + if (!disper_type_local_nonprim) { + ogs_error("OpenAPI_dispersion_type_parseFromJSON failed disper_type"); + goto end; + } class_criters = cJSON_GetObjectItemCaseSensitive(dispersion_requirementJSON, "classCriters"); if (class_criters) { @@ -187,7 +191,6 @@ OpenAPI_class_criterion_t *class_critersItem = OpenAPI_class_criterion_parseFromJSON(class_criters_local); if (!class_critersItem) { ogs_error("No class_critersItem"); - OpenAPI_list_free(class_critersList); goto end; } OpenAPI_list_add(class_critersList, class_critersItem); @@ -212,7 +215,6 @@ OpenAPI_ranking_criterion_t *rank_critersItem = OpenAPI_ranking_criterion_parseFromJSON(rank_criters_local); if (!rank_critersItem) { ogs_error("No rank_critersItem"); - OpenAPI_list_free(rank_critersList); goto end; } OpenAPI_list_add(rank_critersList, rank_critersItem); @@ -222,11 +224,19 @@ disp_order_criter = cJSON_GetObjectItemCaseSensitive(dispersion_requirementJSON, "dispOrderCriter"); if (disp_order_criter) { disp_order_criter_local_nonprim = OpenAPI_dispersion_ordering_criterion_parseFromJSON(disp_order_criter); + if (!disp_order_criter_local_nonprim) { + ogs_error("OpenAPI_dispersion_ordering_criterion_parseFromJSON failed disp_order_criter"); + goto end; + } } order = cJSON_GetObjectItemCaseSensitive(dispersion_requirementJSON, "order"); if (order) { order_local_nonprim = OpenAPI_matching_direction_parseFromJSON(order); + if (!order_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed order"); + goto end; + } } dispersion_requirement_local_var = OpenAPI_dispersion_requirement_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dn_perf.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dn_perf.c
Changed
@@ -167,11 +167,19 @@ app_server_ins_addr = cJSON_GetObjectItemCaseSensitive(dn_perfJSON, "appServerInsAddr"); if (app_server_ins_addr) { app_server_ins_addr_local_nonprim = OpenAPI_addr_fqdn_parseFromJSON(app_server_ins_addr); + if (!app_server_ins_addr_local_nonprim) { + ogs_error("OpenAPI_addr_fqdn_parseFromJSON failed app_server_ins_addr"); + goto end; + } } upf_info = cJSON_GetObjectItemCaseSensitive(dn_perfJSON, "upfInfo"); if (upf_info) { upf_info_local_nonprim = OpenAPI_upf_information_parseFromJSON(upf_info); + if (!upf_info_local_nonprim) { + ogs_error("OpenAPI_upf_information_parseFromJSON failed upf_info"); + goto end; + } } dnai = cJSON_GetObjectItemCaseSensitive(dn_perfJSON, "dnai"); @@ -188,15 +196,27 @@ goto end; } perf_data_local_nonprim = OpenAPI_perf_data_parseFromJSON(perf_data); + if (!perf_data_local_nonprim) { + ogs_error("OpenAPI_perf_data_parseFromJSON failed perf_data"); + goto end; + } spatial_valid_con = cJSON_GetObjectItemCaseSensitive(dn_perfJSON, "spatialValidCon"); if (spatial_valid_con) { spatial_valid_con_local_nonprim = OpenAPI_network_area_info_parseFromJSON(spatial_valid_con); + if (!spatial_valid_con_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed spatial_valid_con"); + goto end; + } } temporal_valid_con = cJSON_GetObjectItemCaseSensitive(dn_perfJSON, "temporalValidCon"); if (temporal_valid_con) { temporal_valid_con_local_nonprim = OpenAPI_time_window_parseFromJSON(temporal_valid_con); + if (!temporal_valid_con_local_nonprim) { + ogs_error("OpenAPI_time_window_parseFromJSON failed temporal_valid_con"); + goto end; + } } dn_perf_local_var = OpenAPI_dn_perf_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dn_perf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dn_perf_info.c
Changed
@@ -152,6 +152,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(dn_perf_infoJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } dn_perf = cJSON_GetObjectItemCaseSensitive(dn_perf_infoJSON, "dnPerf"); @@ -175,7 +179,6 @@ OpenAPI_dn_perf_t *dn_perfItem = OpenAPI_dn_perf_parseFromJSON(dn_perf_local); if (!dn_perfItem) { ogs_error("No dn_perfItem"); - OpenAPI_list_free(dn_perfList); goto end; } OpenAPI_list_add(dn_perfList, dn_perfItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dn_performance_req.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dn_performance_req.c
Changed
@@ -115,11 +115,19 @@ dn_perf_order_criter = cJSON_GetObjectItemCaseSensitive(dn_performance_reqJSON, "dnPerfOrderCriter"); if (dn_perf_order_criter) { dn_perf_order_criter_local_nonprim = OpenAPI_dn_perf_ordering_criterion_parseFromJSON(dn_perf_order_criter); + if (!dn_perf_order_criter_local_nonprim) { + ogs_error("OpenAPI_dn_perf_ordering_criterion_parseFromJSON failed dn_perf_order_criter"); + goto end; + } } order = cJSON_GetObjectItemCaseSensitive(dn_performance_reqJSON, "order"); if (order) { order_local_nonprim = OpenAPI_matching_direction_parseFromJSON(order); + if (!order_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed order"); + goto end; + } } report_thresholds = cJSON_GetObjectItemCaseSensitive(dn_performance_reqJSON, "reportThresholds"); @@ -140,7 +148,6 @@ OpenAPI_threshold_level_t *report_thresholdsItem = OpenAPI_threshold_level_parseFromJSON(report_thresholds_local); if (!report_thresholdsItem) { ogs_error("No report_thresholdsItem"); - OpenAPI_list_free(report_thresholdsList); goto end; } OpenAPI_list_add(report_thresholdsList, report_thresholdsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnf.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnf.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_dnf_unit_t *dnf_unitsItem = OpenAPI_dnf_unit_parseFromJSON(dnf_units_local); if (!dnf_unitsItem) { ogs_error("No dnf_unitsItem"); - OpenAPI_list_free(dnf_unitsList); goto end; } OpenAPI_list_add(dnf_unitsList, dnf_unitsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnf_unit.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnf_unit.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_atom_t *dnf_unitItem = OpenAPI_atom_parseFromJSON(dnf_unit_local); if (!dnf_unitItem) { ogs_error("No dnf_unitItem"); - OpenAPI_list_free(dnf_unitList); goto end; } OpenAPI_list_add(dnf_unitList, dnf_unitItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnn_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnn_configuration.c
Changed
@@ -644,6 +644,10 @@ goto end; } pdu_session_types_local_nonprim = OpenAPI_pdu_session_types_parseFromJSON(pdu_session_types); + if (!pdu_session_types_local_nonprim) { + ogs_error("OpenAPI_pdu_session_types_parseFromJSON failed pdu_session_types"); + goto end; + } ssc_modes = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "sscModes"); if (!ssc_modes) { @@ -651,6 +655,10 @@ goto end; } ssc_modes_local_nonprim = OpenAPI_ssc_modes_parseFromJSON(ssc_modes); + if (!ssc_modes_local_nonprim) { + ogs_error("OpenAPI_ssc_modes_parseFromJSON failed ssc_modes"); + goto end; + } iwk_eps_ind = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "iwkEpsInd"); if (iwk_eps_ind) { @@ -663,11 +671,19 @@ _5g_qos_profile = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "5gQosProfile"); if (_5g_qos_profile) { _5g_qos_profile_local_nonprim = OpenAPI_subscribed_default_qos_parseFromJSON(_5g_qos_profile); + if (!_5g_qos_profile_local_nonprim) { + ogs_error("OpenAPI_subscribed_default_qos_parseFromJSON failed _5g_qos_profile"); + goto end; + } } session_ambr = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "sessionAmbr"); if (session_ambr) { session_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed session_ambr"); + goto end; + } } _3gpp_charging_characteristics = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "3gppChargingCharacteristics"); @@ -696,7 +712,6 @@ OpenAPI_ip_address_t *static_ip_addressItem = OpenAPI_ip_address_parseFromJSON(static_ip_address_local); if (!static_ip_addressItem) { ogs_error("No static_ip_addressItem"); - OpenAPI_list_free(static_ip_addressList); goto end; } OpenAPI_list_add(static_ip_addressList, static_ip_addressItem); @@ -706,6 +721,10 @@ up_security = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "upSecurity"); if (up_security) { up_security_local_nonprim = OpenAPI_up_security_parseFromJSON(up_security); + if (!up_security_local_nonprim) { + ogs_error("OpenAPI_up_security_parseFromJSON failed up_security"); + goto end; + } } pdu_session_continuity_ind = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "pduSessionContinuityInd"); @@ -728,6 +747,10 @@ nidd_info = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "niddInfo"); if (nidd_info) { nidd_info_local_nonprim = OpenAPI_nidd_information_parseFromJSON(nidd_info); + if (!nidd_info_local_nonprim) { + ogs_error("OpenAPI_nidd_information_parseFromJSON failed nidd_info"); + goto end; + } } redundant_session_allowed = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "redundantSessionAllowed"); @@ -741,6 +764,10 @@ acs_info = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "acsInfo"); if (acs_info) { acs_info_local_nonprim = OpenAPI_acs_info_parseFromJSON(acs_info); + if (!acs_info_local_nonprim) { + ogs_error("OpenAPI_acs_info_parseFromJSON failed acs_info"); + goto end; + } } ipv4_frame_route_list = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "ipv4FrameRouteList"); @@ -761,7 +788,6 @@ OpenAPI_frame_route_info_t *ipv4_frame_route_listItem = OpenAPI_frame_route_info_parseFromJSON(ipv4_frame_route_list_local); if (!ipv4_frame_route_listItem) { ogs_error("No ipv4_frame_route_listItem"); - OpenAPI_list_free(ipv4_frame_route_listList); goto end; } OpenAPI_list_add(ipv4_frame_route_listList, ipv4_frame_route_listItem); @@ -786,7 +812,6 @@ OpenAPI_frame_route_info_t *ipv6_frame_route_listItem = OpenAPI_frame_route_info_parseFromJSON(ipv6_frame_route_list_local); if (!ipv6_frame_route_listItem) { ogs_error("No ipv6_frame_route_listItem"); - OpenAPI_list_free(ipv6_frame_route_listList); goto end; } OpenAPI_list_add(ipv6_frame_route_listList, ipv6_frame_route_listItem); @@ -828,6 +853,10 @@ dn_aaa_address = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "dnAaaAddress"); if (dn_aaa_address) { dn_aaa_address_local_nonprim = OpenAPI_ip_address_parseFromJSON(dn_aaa_address); + if (!dn_aaa_address_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed dn_aaa_address"); + goto end; + } } additional_dn_aaa_addresses = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "additionalDnAaaAddresses"); @@ -848,7 +877,6 @@ OpenAPI_ip_address_t *additional_dn_aaa_addressesItem = OpenAPI_ip_address_parseFromJSON(additional_dn_aaa_addresses_local); if (!additional_dn_aaa_addressesItem) { ogs_error("No additional_dn_aaa_addressesItem"); - OpenAPI_list_free(additional_dn_aaa_addressesList); goto end; } OpenAPI_list_add(additional_dn_aaa_addressesList, additional_dn_aaa_addressesItem); @@ -874,16 +902,28 @@ ipv4_index = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "ipv4Index"); if (ipv4_index) { ipv4_index_local_nonprim = OpenAPI_ip_index_parseFromJSON(ipv4_index); + if (!ipv4_index_local_nonprim) { + ogs_error("OpenAPI_ip_index_parseFromJSON failed ipv4_index"); + goto end; + } } ipv6_index = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "ipv6Index"); if (ipv6_index) { ipv6_index_local_nonprim = OpenAPI_ip_index_parseFromJSON(ipv6_index); + if (!ipv6_index_local_nonprim) { + ogs_error("OpenAPI_ip_index_parseFromJSON failed ipv6_index"); + goto end; + } } ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "ecsAddrConfigInfo"); if (ecs_addr_config_info) { ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_parseFromJSON(ecs_addr_config_info); + if (!ecs_addr_config_info_local_nonprim) { + ogs_error("OpenAPI_ecs_addr_config_info_parseFromJSON failed ecs_addr_config_info"); + goto end; + } } additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "additionalEcsAddrConfigInfos"); @@ -904,7 +944,6 @@ OpenAPI_ecs_addr_config_info_t *additional_ecs_addr_config_infosItem = OpenAPI_ecs_addr_config_info_parseFromJSON(additional_ecs_addr_config_infos_local); if (!additional_ecs_addr_config_infosItem) { ogs_error("No additional_ecs_addr_config_infosItem"); - OpenAPI_list_free(additional_ecs_addr_config_infosList); goto end; } OpenAPI_list_add(additional_ecs_addr_config_infosList, additional_ecs_addr_config_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnn_configuration_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnn_configuration_1.c
Changed
@@ -644,6 +644,10 @@ goto end; } pdu_session_types_local_nonprim = OpenAPI_pdu_session_types_1_parseFromJSON(pdu_session_types); + if (!pdu_session_types_local_nonprim) { + ogs_error("OpenAPI_pdu_session_types_1_parseFromJSON failed pdu_session_types"); + goto end; + } ssc_modes = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "sscModes"); if (!ssc_modes) { @@ -651,6 +655,10 @@ goto end; } ssc_modes_local_nonprim = OpenAPI_ssc_modes_1_parseFromJSON(ssc_modes); + if (!ssc_modes_local_nonprim) { + ogs_error("OpenAPI_ssc_modes_1_parseFromJSON failed ssc_modes"); + goto end; + } iwk_eps_ind = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "iwkEpsInd"); if (iwk_eps_ind) { @@ -663,11 +671,19 @@ _5g_qos_profile = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "5gQosProfile"); if (_5g_qos_profile) { _5g_qos_profile_local_nonprim = OpenAPI_subscribed_default_qos_1_parseFromJSON(_5g_qos_profile); + if (!_5g_qos_profile_local_nonprim) { + ogs_error("OpenAPI_subscribed_default_qos_1_parseFromJSON failed _5g_qos_profile"); + goto end; + } } session_ambr = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "sessionAmbr"); if (session_ambr) { session_ambr_local_nonprim = OpenAPI_ambr_1_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_1_parseFromJSON failed session_ambr"); + goto end; + } } _3gpp_charging_characteristics = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "3gppChargingCharacteristics"); @@ -696,7 +712,6 @@ OpenAPI_ip_address_1_t *static_ip_addressItem = OpenAPI_ip_address_1_parseFromJSON(static_ip_address_local); if (!static_ip_addressItem) { ogs_error("No static_ip_addressItem"); - OpenAPI_list_free(static_ip_addressList); goto end; } OpenAPI_list_add(static_ip_addressList, static_ip_addressItem); @@ -706,6 +721,10 @@ up_security = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "upSecurity"); if (up_security) { up_security_local_nonprim = OpenAPI_up_security_1_parseFromJSON(up_security); + if (!up_security_local_nonprim) { + ogs_error("OpenAPI_up_security_1_parseFromJSON failed up_security"); + goto end; + } } pdu_session_continuity_ind = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "pduSessionContinuityInd"); @@ -728,6 +747,10 @@ nidd_info = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "niddInfo"); if (nidd_info) { nidd_info_local_nonprim = OpenAPI_nidd_information_1_parseFromJSON(nidd_info); + if (!nidd_info_local_nonprim) { + ogs_error("OpenAPI_nidd_information_1_parseFromJSON failed nidd_info"); + goto end; + } } redundant_session_allowed = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "redundantSessionAllowed"); @@ -741,6 +764,10 @@ acs_info = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "acsInfo"); if (acs_info) { acs_info_local_nonprim = OpenAPI_acs_info_1_parseFromJSON(acs_info); + if (!acs_info_local_nonprim) { + ogs_error("OpenAPI_acs_info_1_parseFromJSON failed acs_info"); + goto end; + } } ipv4_frame_route_list = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "ipv4FrameRouteList"); @@ -761,7 +788,6 @@ OpenAPI_frame_route_info_1_t *ipv4_frame_route_listItem = OpenAPI_frame_route_info_1_parseFromJSON(ipv4_frame_route_list_local); if (!ipv4_frame_route_listItem) { ogs_error("No ipv4_frame_route_listItem"); - OpenAPI_list_free(ipv4_frame_route_listList); goto end; } OpenAPI_list_add(ipv4_frame_route_listList, ipv4_frame_route_listItem); @@ -786,7 +812,6 @@ OpenAPI_frame_route_info_1_t *ipv6_frame_route_listItem = OpenAPI_frame_route_info_1_parseFromJSON(ipv6_frame_route_list_local); if (!ipv6_frame_route_listItem) { ogs_error("No ipv6_frame_route_listItem"); - OpenAPI_list_free(ipv6_frame_route_listList); goto end; } OpenAPI_list_add(ipv6_frame_route_listList, ipv6_frame_route_listItem); @@ -828,6 +853,10 @@ dn_aaa_address = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "dnAaaAddress"); if (dn_aaa_address) { dn_aaa_address_local_nonprim = OpenAPI_ip_address_1_parseFromJSON(dn_aaa_address); + if (!dn_aaa_address_local_nonprim) { + ogs_error("OpenAPI_ip_address_1_parseFromJSON failed dn_aaa_address"); + goto end; + } } additional_dn_aaa_addresses = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "additionalDnAaaAddresses"); @@ -848,7 +877,6 @@ OpenAPI_ip_address_1_t *additional_dn_aaa_addressesItem = OpenAPI_ip_address_1_parseFromJSON(additional_dn_aaa_addresses_local); if (!additional_dn_aaa_addressesItem) { ogs_error("No additional_dn_aaa_addressesItem"); - OpenAPI_list_free(additional_dn_aaa_addressesList); goto end; } OpenAPI_list_add(additional_dn_aaa_addressesList, additional_dn_aaa_addressesItem); @@ -874,16 +902,28 @@ ipv4_index = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "ipv4Index"); if (ipv4_index) { ipv4_index_local_nonprim = OpenAPI_ip_index_parseFromJSON(ipv4_index); + if (!ipv4_index_local_nonprim) { + ogs_error("OpenAPI_ip_index_parseFromJSON failed ipv4_index"); + goto end; + } } ipv6_index = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "ipv6Index"); if (ipv6_index) { ipv6_index_local_nonprim = OpenAPI_ip_index_parseFromJSON(ipv6_index); + if (!ipv6_index_local_nonprim) { + ogs_error("OpenAPI_ip_index_parseFromJSON failed ipv6_index"); + goto end; + } } ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "ecsAddrConfigInfo"); if (ecs_addr_config_info) { ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_1_parseFromJSON(ecs_addr_config_info); + if (!ecs_addr_config_info_local_nonprim) { + ogs_error("OpenAPI_ecs_addr_config_info_1_parseFromJSON failed ecs_addr_config_info"); + goto end; + } } additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "additionalEcsAddrConfigInfos"); @@ -904,7 +944,6 @@ OpenAPI_ecs_addr_config_info_1_t *additional_ecs_addr_config_infosItem = OpenAPI_ecs_addr_config_info_1_parseFromJSON(additional_ecs_addr_config_infos_local); if (!additional_ecs_addr_config_infosItem) { ogs_error("No additional_ecs_addr_config_infosItem"); - OpenAPI_list_free(additional_ecs_addr_config_infosList); goto end; } OpenAPI_list_add(additional_ecs_addr_config_infosList, additional_ecs_addr_config_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnn_smf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnn_smf_info_item.c
Changed
@@ -114,7 +114,6 @@ OpenAPI_dnn_smf_info_item_dnai_list_inner_t *dnai_listItem = OpenAPI_dnn_smf_info_item_dnai_list_inner_parseFromJSON(dnai_list_local); if (!dnai_listItem) { ogs_error("No dnai_listItem"); - OpenAPI_list_free(dnai_listList); goto end; } OpenAPI_list_add(dnai_listList, dnai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnn_snssai_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnn_snssai_information.c
Changed
@@ -89,6 +89,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(dnn_snssai_informationJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } dnn_snssai_information_local_var = OpenAPI_dnn_snssai_information_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/dnn_upf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/dnn_upf_info_item.c
Changed
@@ -314,7 +314,6 @@ OpenAPI_ipv4_address_range_t *ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_address_ranges_local); if (!ipv4_address_rangesItem) { ogs_error("No ipv4_address_rangesItem"); - OpenAPI_list_free(ipv4_address_rangesList); goto end; } OpenAPI_list_add(ipv4_address_rangesList, ipv4_address_rangesItem); @@ -339,7 +338,6 @@ OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local); if (!ipv6_prefix_rangesItem) { ogs_error("No ipv6_prefix_rangesItem"); - OpenAPI_list_free(ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem); @@ -364,7 +362,6 @@ OpenAPI_ip_index_t *ipv4_index_listItem = OpenAPI_ip_index_parseFromJSON(ipv4_index_list_local); if (!ipv4_index_listItem) { ogs_error("No ipv4_index_listItem"); - OpenAPI_list_free(ipv4_index_listList); goto end; } OpenAPI_list_add(ipv4_index_listList, ipv4_index_listItem); @@ -389,7 +386,6 @@ OpenAPI_ip_index_t *ipv6_index_listItem = OpenAPI_ip_index_parseFromJSON(ipv6_index_list_local); if (!ipv6_index_listItem) { ogs_error("No ipv6_index_listItem"); - OpenAPI_list_free(ipv6_index_listList); goto end; } OpenAPI_list_add(ipv6_index_listList, ipv6_index_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/eap_session.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/eap_session.c
Changed
@@ -276,7 +276,6 @@ OpenAPI_server_addressing_info_t *pvs_infoItem = OpenAPI_server_addressing_info_parseFromJSON(pvs_info_local); if (!pvs_infoItem) { ogs_error("No pvs_infoItem"); - OpenAPI_list_free(pvs_infoList); goto end; } OpenAPI_list_add(pvs_infoList, pvs_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/eas_ip_replacement_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/eas_ip_replacement_info.c
Changed
@@ -95,6 +95,10 @@ goto end; } source_local_nonprim = OpenAPI_eas_server_address_parseFromJSON(source); + if (!source_local_nonprim) { + ogs_error("OpenAPI_eas_server_address_parseFromJSON failed source"); + goto end; + } target = cJSON_GetObjectItemCaseSensitive(eas_ip_replacement_infoJSON, "target"); if (!target) { @@ -102,6 +106,10 @@ goto end; } target_local_nonprim = OpenAPI_eas_server_address_parseFromJSON(target); + if (!target_local_nonprim) { + ogs_error("OpenAPI_eas_server_address_parseFromJSON failed target"); + goto end; + } eas_ip_replacement_info_local_var = OpenAPI_eas_ip_replacement_info_create ( source_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/eas_server_address.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/eas_server_address.c
Changed
@@ -80,6 +80,10 @@ goto end; } ip_local_nonprim = OpenAPI_ip_addr_parseFromJSON(ip); + if (!ip_local_nonprim) { + ogs_error("OpenAPI_ip_addr_parseFromJSON failed ip"); + goto end; + } port = cJSON_GetObjectItemCaseSensitive(eas_server_addressJSON, "port"); if (!port) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/easdf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/easdf_info.c
Changed
@@ -142,7 +142,6 @@ OpenAPI_snssai_easdf_info_item_t *s_nssai_easdf_info_listItem = OpenAPI_snssai_easdf_info_item_parseFromJSON(s_nssai_easdf_info_list_local); if (!s_nssai_easdf_info_listItem) { ogs_error("No s_nssai_easdf_info_listItem"); - OpenAPI_list_free(s_nssai_easdf_info_listList); goto end; } OpenAPI_list_add(s_nssai_easdf_info_listList, s_nssai_easdf_info_listItem); @@ -167,7 +166,6 @@ OpenAPI_ip_addr_t *easdf_n6_ip_address_listItem = OpenAPI_ip_addr_parseFromJSON(easdf_n6_ip_address_list_local); if (!easdf_n6_ip_address_listItem) { ogs_error("No easdf_n6_ip_address_listItem"); - OpenAPI_list_free(easdf_n6_ip_address_listList); goto end; } OpenAPI_list_add(easdf_n6_ip_address_listList, easdf_n6_ip_address_listItem); @@ -192,7 +190,6 @@ OpenAPI_ip_addr_t *upf_n6_ip_address_listItem = OpenAPI_ip_addr_parseFromJSON(upf_n6_ip_address_list_local); if (!upf_n6_ip_address_listItem) { ogs_error("No upf_n6_ip_address_listItem"); - OpenAPI_list_free(upf_n6_ip_address_listList); goto end; } OpenAPI_list_add(upf_n6_ip_address_listList, upf_n6_ip_address_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ebi_arp_mapping.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ebi_arp_mapping.c
Changed
@@ -90,6 +90,10 @@ goto end; } arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } ebi_arp_mapping_local_var = OpenAPI_ebi_arp_mapping_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ec_restriction.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ec_restriction.c
Changed
@@ -146,7 +146,6 @@ OpenAPI_plmn_ec_info_t *plmn_ec_infosItem = OpenAPI_plmn_ec_info_parseFromJSON(plmn_ec_infos_local); if (!plmn_ec_infosItem) { ogs_error("No plmn_ec_infosItem"); - OpenAPI_list_free(plmn_ec_infosList); goto end; } OpenAPI_list_add(plmn_ec_infosList, plmn_ec_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ec_restriction_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ec_restriction_1.c
Changed
@@ -146,7 +146,6 @@ OpenAPI_plmn_ec_info_1_t *plmn_ec_infosItem = OpenAPI_plmn_ec_info_1_parseFromJSON(plmn_ec_infos_local); if (!plmn_ec_infosItem) { ogs_error("No plmn_ec_infosItem"); - OpenAPI_list_free(plmn_ec_infosList); goto end; } OpenAPI_list_add(plmn_ec_infosList, plmn_ec_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ecgi.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ecgi.c
Changed
@@ -102,6 +102,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } eutra_cell_id = cJSON_GetObjectItemCaseSensitive(ecgiJSON, "eutraCellId"); if (!eutra_cell_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ecgi_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ecgi_1.c
Changed
@@ -102,6 +102,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } eutra_cell_id = cJSON_GetObjectItemCaseSensitive(ecgi_1JSON, "eutraCellId"); if (!eutra_cell_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ecs_addr_config_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ecs_addr_config_info.c
Changed
@@ -88,11 +88,19 @@ ecs_server_addr = cJSON_GetObjectItemCaseSensitive(ecs_addr_config_infoJSON, "ecsServerAddr"); if (ecs_server_addr) { ecs_server_addr_local_nonprim = OpenAPI_ecs_server_addr_parseFromJSON(ecs_server_addr); + if (!ecs_server_addr_local_nonprim) { + ogs_error("OpenAPI_ecs_server_addr_parseFromJSON failed ecs_server_addr"); + goto end; + } } spatial_validity_cond = cJSON_GetObjectItemCaseSensitive(ecs_addr_config_infoJSON, "spatialValidityCond"); if (spatial_validity_cond) { spatial_validity_cond_local_nonprim = OpenAPI_spatial_validity_cond_parseFromJSON(spatial_validity_cond); + if (!spatial_validity_cond_local_nonprim) { + ogs_error("OpenAPI_spatial_validity_cond_parseFromJSON failed spatial_validity_cond"); + goto end; + } } ecs_addr_config_info_local_var = OpenAPI_ecs_addr_config_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ecs_addr_config_info_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ecs_addr_config_info_1.c
Changed
@@ -88,11 +88,19 @@ ecs_server_addr = cJSON_GetObjectItemCaseSensitive(ecs_addr_config_info_1JSON, "ecsServerAddr"); if (ecs_server_addr) { ecs_server_addr_local_nonprim = OpenAPI_ecs_server_addr_parseFromJSON(ecs_server_addr); + if (!ecs_server_addr_local_nonprim) { + ogs_error("OpenAPI_ecs_server_addr_parseFromJSON failed ecs_server_addr"); + goto end; + } } spatial_validity_cond = cJSON_GetObjectItemCaseSensitive(ecs_addr_config_info_1JSON, "spatialValidityCond"); if (spatial_validity_cond) { spatial_validity_cond_local_nonprim = OpenAPI_spatial_validity_cond_1_parseFromJSON(spatial_validity_cond); + if (!spatial_validity_cond_local_nonprim) { + ogs_error("OpenAPI_spatial_validity_cond_1_parseFromJSON failed spatial_validity_cond"); + goto end; + } } ecs_addr_config_info_1_local_var = OpenAPI_ecs_addr_config_info_1_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ecs_server_addr.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ecs_server_addr.c
Changed
@@ -173,7 +173,6 @@ OpenAPI_ip_addr_t *ecs_ip_address_listItem = OpenAPI_ip_addr_parseFromJSON(ecs_ip_address_list_local); if (!ecs_ip_address_listItem) { ogs_error("No ecs_ip_address_listItem"); - OpenAPI_list_free(ecs_ip_address_listList); goto end; } OpenAPI_list_add(ecs_ip_address_listList, ecs_ip_address_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ee_group_profile_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ee_group_profile_data.c
Changed
@@ -178,7 +178,6 @@ OpenAPI_event_type_t *restricted_event_typesItem = OpenAPI_event_type_parseFromJSON(restricted_event_types_local); if (!restricted_event_typesItem) { ogs_error("No restricted_event_typesItem"); - OpenAPI_list_free(restricted_event_typesList); goto end; } OpenAPI_list_add(restricted_event_typesList, restricted_event_typesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ee_profile_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ee_profile_data.c
Changed
@@ -178,7 +178,6 @@ OpenAPI_event_type_t *restricted_event_typesItem = OpenAPI_event_type_parseFromJSON(restricted_event_types_local); if (!restricted_event_typesItem) { ogs_error("No restricted_event_typesItem"); - OpenAPI_list_free(restricted_event_typesList); goto end; } OpenAPI_list_add(restricted_event_typesList, restricted_event_typesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ee_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ee_subscription.c
Changed
@@ -354,6 +354,10 @@ reporting_options = cJSON_GetObjectItemCaseSensitive(ee_subscriptionJSON, "reportingOptions"); if (reporting_options) { reporting_options_local_nonprim = OpenAPI_reporting_options_parseFromJSON(reporting_options); + if (!reporting_options_local_nonprim) { + ogs_error("OpenAPI_reporting_options_parseFromJSON failed reporting_options"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ee_subscriptionJSON, "supportedFeatures"); @@ -375,6 +379,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(ee_subscriptionJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } epc_applied_ind = cJSON_GetObjectItemCaseSensitive(ee_subscriptionJSON, "epcAppliedInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ee_subscription_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ee_subscription_1.c
Changed
@@ -354,6 +354,10 @@ reporting_options = cJSON_GetObjectItemCaseSensitive(ee_subscription_1JSON, "reportingOptions"); if (reporting_options) { reporting_options_local_nonprim = OpenAPI_reporting_options_1_parseFromJSON(reporting_options); + if (!reporting_options_local_nonprim) { + ogs_error("OpenAPI_reporting_options_1_parseFromJSON failed reporting_options"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ee_subscription_1JSON, "supportedFeatures"); @@ -375,6 +379,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(ee_subscription_1JSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } epc_applied_ind = cJSON_GetObjectItemCaseSensitive(ee_subscription_1JSON, "epcAppliedInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ee_subscription_ext.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ee_subscription_ext.c
Changed
@@ -423,6 +423,10 @@ reporting_options = cJSON_GetObjectItemCaseSensitive(ee_subscription_extJSON, "reportingOptions"); if (reporting_options) { reporting_options_local_nonprim = OpenAPI_reporting_options_1_parseFromJSON(reporting_options); + if (!reporting_options_local_nonprim) { + ogs_error("OpenAPI_reporting_options_1_parseFromJSON failed reporting_options"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ee_subscription_extJSON, "supportedFeatures"); @@ -444,6 +448,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(ee_subscription_extJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } epc_applied_ind = cJSON_GetObjectItemCaseSensitive(ee_subscription_extJSON, "epcAppliedInd"); @@ -562,7 +570,6 @@ OpenAPI_amf_subscription_info_t *amf_subscription_info_listItem = OpenAPI_amf_subscription_info_parseFromJSON(amf_subscription_info_list_local); if (!amf_subscription_info_listItem) { ogs_error("No amf_subscription_info_listItem"); - OpenAPI_list_free(amf_subscription_info_listList); goto end; } OpenAPI_list_add(amf_subscription_info_listList, amf_subscription_info_listItem); @@ -572,11 +579,19 @@ smf_subscription_info = cJSON_GetObjectItemCaseSensitive(ee_subscription_extJSON, "smfSubscriptionInfo"); if (smf_subscription_info) { smf_subscription_info_local_nonprim = OpenAPI_smf_subscription_info_parseFromJSON(smf_subscription_info); + if (!smf_subscription_info_local_nonprim) { + ogs_error("OpenAPI_smf_subscription_info_parseFromJSON failed smf_subscription_info"); + goto end; + } } hss_subscription_info = cJSON_GetObjectItemCaseSensitive(ee_subscription_extJSON, "hssSubscriptionInfo"); if (hss_subscription_info) { hss_subscription_info_local_nonprim = OpenAPI_hss_subscription_info_parseFromJSON(hss_subscription_info); + if (!hss_subscription_info_local_nonprim) { + ogs_error("OpenAPI_hss_subscription_info_parseFromJSON failed hss_subscription_info"); + goto end; + } } ee_subscription_ext_local_var = OpenAPI_ee_subscription_ext_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ellipsoid_arc.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ellipsoid_arc.c
Changed
@@ -135,6 +135,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(ellipsoid_arcJSON, "point"); if (!point) { @@ -142,6 +146,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } inner_radius = cJSON_GetObjectItemCaseSensitive(ellipsoid_arcJSON, "innerRadius"); if (!inner_radius) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ellipsoid_arc_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ellipsoid_arc_all_of.c
Changed
@@ -112,6 +112,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } inner_radius = cJSON_GetObjectItemCaseSensitive(ellipsoid_arc_all_ofJSON, "innerRadius"); if (!inner_radius) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/emergency_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/emergency_info.c
Changed
@@ -136,6 +136,10 @@ pgw_ip_address = cJSON_GetObjectItemCaseSensitive(emergency_infoJSON, "pgwIpAddress"); if (pgw_ip_address) { pgw_ip_address_local_nonprim = OpenAPI_ip_address_parseFromJSON(pgw_ip_address); + if (!pgw_ip_address_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed pgw_ip_address"); + goto end; + } } smf_instance_id = cJSON_GetObjectItemCaseSensitive(emergency_infoJSON, "smfInstanceId"); @@ -157,6 +161,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(emergency_infoJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } emergency_info_local_var = OpenAPI_emergency_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/enhanced_coverage_restriction_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/enhanced_coverage_restriction_data.c
Changed
@@ -88,7 +88,6 @@ OpenAPI_plmn_ec_info_t *plmn_ec_info_listItem = OpenAPI_plmn_ec_info_parseFromJSON(plmn_ec_info_list_local); if (!plmn_ec_info_listItem) { ogs_error("No plmn_ec_info_listItem"); - OpenAPI_list_free(plmn_ec_info_listList); goto end; } OpenAPI_list_add(plmn_ec_info_listList, plmn_ec_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/eps_iwk_pgw.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/eps_iwk_pgw.c
Changed
@@ -119,6 +119,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(eps_iwk_pgwJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } eps_iwk_pgw_local_var = OpenAPI_eps_iwk_pgw_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/error_report.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/error_report.c
Changed
@@ -170,6 +170,10 @@ error = cJSON_GetObjectItemCaseSensitive(error_reportJSON, "error"); if (error) { error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } } rule_reports = cJSON_GetObjectItemCaseSensitive(error_reportJSON, "ruleReports"); @@ -190,7 +194,6 @@ OpenAPI_rule_report_t *rule_reportsItem = OpenAPI_rule_report_parseFromJSON(rule_reports_local); if (!rule_reportsItem) { ogs_error("No rule_reportsItem"); - OpenAPI_list_free(rule_reportsList); goto end; } OpenAPI_list_add(rule_reportsList, rule_reportsItem); @@ -215,7 +218,6 @@ OpenAPI_session_rule_report_t *sess_rule_reportsItem = OpenAPI_session_rule_report_parseFromJSON(sess_rule_reports_local); if (!sess_rule_reportsItem) { ogs_error("No sess_rule_reportsItem"); - OpenAPI_list_free(sess_rule_reportsList); goto end; } OpenAPI_list_add(sess_rule_reportsList, sess_rule_reportsItem); @@ -259,7 +261,6 @@ OpenAPI_invalid_param_t *invalid_policy_decsItem = OpenAPI_invalid_param_parseFromJSON(invalid_policy_decs_local); if (!invalid_policy_decsItem) { ogs_error("No invalid_policy_decsItem"); - OpenAPI_list_free(invalid_policy_decsList); goto end; } OpenAPI_list_add(invalid_policy_decsList, invalid_policy_decsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/eutra_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/eutra_location.c
Changed
@@ -215,6 +215,10 @@ goto end; } tai_local_nonprim = OpenAPI_tai_parseFromJSON(tai); + if (!tai_local_nonprim) { + ogs_error("OpenAPI_tai_parseFromJSON failed tai"); + goto end; + } ignore_tai = cJSON_GetObjectItemCaseSensitive(eutra_locationJSON, "ignoreTai"); if (ignore_tai) { @@ -230,6 +234,10 @@ goto end; } ecgi_local_nonprim = OpenAPI_ecgi_parseFromJSON(ecgi); + if (!ecgi_local_nonprim) { + ogs_error("OpenAPI_ecgi_parseFromJSON failed ecgi"); + goto end; + } ignore_ecgi = cJSON_GetObjectItemCaseSensitive(eutra_locationJSON, "ignoreEcgi"); if (ignore_ecgi) { @@ -274,11 +282,19 @@ global_ngenb_id = cJSON_GetObjectItemCaseSensitive(eutra_locationJSON, "globalNgenbId"); if (global_ngenb_id) { global_ngenb_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(global_ngenb_id); + if (!global_ngenb_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed global_ngenb_id"); + goto end; + } } global_enb_id = cJSON_GetObjectItemCaseSensitive(eutra_locationJSON, "globalENbId"); if (global_enb_id) { global_enb_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(global_enb_id); + if (!global_enb_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed global_enb_id"); + goto end; + } } eutra_location_local_var = OpenAPI_eutra_location_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/event_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/event_notification.c
Changed
@@ -567,6 +567,10 @@ goto end; } event_local_nonprim = OpenAPI_nwdaf_event_parseFromJSON(event); + if (!event_local_nonprim) { + ogs_error("OpenAPI_nwdaf_event_parseFromJSON failed event"); + goto end; + } start = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "start"); if (start) { @@ -595,6 +599,10 @@ fail_notify_code = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "failNotifyCode"); if (fail_notify_code) { fail_notify_code_local_nonprim = OpenAPI_nwdaf_failure_code_parseFromJSON(fail_notify_code); + if (!fail_notify_code_local_nonprim) { + ogs_error("OpenAPI_nwdaf_failure_code_parseFromJSON failed fail_notify_code"); + goto end; + } } rv_wait_time = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "rvWaitTime"); @@ -608,6 +616,10 @@ ana_meta_info = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "anaMetaInfo"); if (ana_meta_info) { ana_meta_info_local_nonprim = OpenAPI_analytics_metadata_info_parseFromJSON(ana_meta_info); + if (!ana_meta_info_local_nonprim) { + ogs_error("OpenAPI_analytics_metadata_info_parseFromJSON failed ana_meta_info"); + goto end; + } } nf_load_level_infos = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "nfLoadLevelInfos"); @@ -628,7 +640,6 @@ OpenAPI_nf_load_level_information_t *nf_load_level_infosItem = OpenAPI_nf_load_level_information_parseFromJSON(nf_load_level_infos_local); if (!nf_load_level_infosItem) { ogs_error("No nf_load_level_infosItem"); - OpenAPI_list_free(nf_load_level_infosList); goto end; } OpenAPI_list_add(nf_load_level_infosList, nf_load_level_infosItem); @@ -653,7 +664,6 @@ OpenAPI_nsi_load_level_info_t *nsi_load_level_infosItem = OpenAPI_nsi_load_level_info_parseFromJSON(nsi_load_level_infos_local); if (!nsi_load_level_infosItem) { ogs_error("No nsi_load_level_infosItem"); - OpenAPI_list_free(nsi_load_level_infosList); goto end; } OpenAPI_list_add(nsi_load_level_infosList, nsi_load_level_infosItem); @@ -663,6 +673,10 @@ slice_load_level_info = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "sliceLoadLevelInfo"); if (slice_load_level_info) { slice_load_level_info_local_nonprim = OpenAPI_slice_load_level_information_parseFromJSON(slice_load_level_info); + if (!slice_load_level_info_local_nonprim) { + ogs_error("OpenAPI_slice_load_level_information_parseFromJSON failed slice_load_level_info"); + goto end; + } } svc_exps = cJSON_GetObjectItemCaseSensitive(event_notificationJSON, "svcExps"); @@ -683,7 +697,6 @@ OpenAPI_service_experience_info_t *svc_expsItem = OpenAPI_service_experience_info_parseFromJSON(svc_exps_local); if (!svc_expsItem) { ogs_error("No svc_expsItem"); - OpenAPI_list_free(svc_expsList); goto end; } OpenAPI_list_add(svc_expsList, svc_expsItem); @@ -708,7 +721,6 @@ OpenAPI_qos_sustainability_info_t *qos_sustain_infosItem = OpenAPI_qos_sustainability_info_parseFromJSON(qos_sustain_infos_local); if (!qos_sustain_infosItem) { ogs_error("No qos_sustain_infosItem"); - OpenAPI_list_free(qos_sustain_infosList); goto end; } OpenAPI_list_add(qos_sustain_infosList, qos_sustain_infosItem); @@ -733,7 +745,6 @@ OpenAPI_ue_communication_t *ue_commsItem = OpenAPI_ue_communication_parseFromJSON(ue_comms_local); if (!ue_commsItem) { ogs_error("No ue_commsItem"); - OpenAPI_list_free(ue_commsList); goto end; } OpenAPI_list_add(ue_commsList, ue_commsItem); @@ -758,7 +769,6 @@ OpenAPI_ue_mobility_t *ue_mobsItem = OpenAPI_ue_mobility_parseFromJSON(ue_mobs_local); if (!ue_mobsItem) { ogs_error("No ue_mobsItem"); - OpenAPI_list_free(ue_mobsList); goto end; } OpenAPI_list_add(ue_mobsList, ue_mobsItem); @@ -783,7 +793,6 @@ OpenAPI_user_data_congestion_info_t *user_data_cong_infosItem = OpenAPI_user_data_congestion_info_parseFromJSON(user_data_cong_infos_local); if (!user_data_cong_infosItem) { ogs_error("No user_data_cong_infosItem"); - OpenAPI_list_free(user_data_cong_infosList); goto end; } OpenAPI_list_add(user_data_cong_infosList, user_data_cong_infosItem); @@ -808,7 +817,6 @@ OpenAPI_abnormal_behaviour_t *abnor_behavrsItem = OpenAPI_abnormal_behaviour_parseFromJSON(abnor_behavrs_local); if (!abnor_behavrsItem) { ogs_error("No abnor_behavrsItem"); - OpenAPI_list_free(abnor_behavrsList); goto end; } OpenAPI_list_add(abnor_behavrsList, abnor_behavrsItem); @@ -833,7 +841,6 @@ OpenAPI_network_perf_info_t *nw_perfsItem = OpenAPI_network_perf_info_parseFromJSON(nw_perfs_local); if (!nw_perfsItem) { ogs_error("No nw_perfsItem"); - OpenAPI_list_free(nw_perfsList); goto end; } OpenAPI_list_add(nw_perfsList, nw_perfsItem); @@ -858,7 +865,6 @@ OpenAPI_dn_perf_info_t *dn_perf_infosItem = OpenAPI_dn_perf_info_parseFromJSON(dn_perf_infos_local); if (!dn_perf_infosItem) { ogs_error("No dn_perf_infosItem"); - OpenAPI_list_free(dn_perf_infosList); goto end; } OpenAPI_list_add(dn_perf_infosList, dn_perf_infosItem); @@ -883,7 +889,6 @@ OpenAPI_dispersion_info_t *disper_infosItem = OpenAPI_dispersion_info_parseFromJSON(disper_infos_local); if (!disper_infosItem) { ogs_error("No disper_infosItem"); - OpenAPI_list_free(disper_infosList); goto end; } OpenAPI_list_add(disper_infosList, disper_infosItem); @@ -908,7 +913,6 @@ OpenAPI_redundant_transmission_exp_info_t *red_trans_infosItem = OpenAPI_redundant_transmission_exp_info_parseFromJSON(red_trans_infos_local); if (!red_trans_infosItem) { ogs_error("No red_trans_infosItem"); - OpenAPI_list_free(red_trans_infosList); goto end; } OpenAPI_list_add(red_trans_infosList, red_trans_infosItem); @@ -933,7 +937,6 @@ OpenAPI_wlan_performance_info_t *wlan_infosItem = OpenAPI_wlan_performance_info_parseFromJSON(wlan_infos_local); if (!wlan_infosItem) { ogs_error("No wlan_infosItem"); - OpenAPI_list_free(wlan_infosList); goto end; } OpenAPI_list_add(wlan_infosList, wlan_infosItem); @@ -958,7 +961,6 @@ OpenAPI_smcce_info_t *smcc_expsItem = OpenAPI_smcce_info_parseFromJSON(smcc_exps_local); if (!smcc_expsItem) { ogs_error("No smcc_expsItem"); - OpenAPI_list_free(smcc_expsList); goto end; } OpenAPI_list_add(smcc_expsList, smcc_expsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/event_reporting_requirement.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/event_reporting_requirement.c
Changed
@@ -232,6 +232,10 @@ accuracy = cJSON_GetObjectItemCaseSensitive(event_reporting_requirementJSON, "accuracy"); if (accuracy) { accuracy_local_nonprim = OpenAPI_accuracy_parseFromJSON(accuracy); + if (!accuracy_local_nonprim) { + ogs_error("OpenAPI_accuracy_parseFromJSON failed accuracy"); + goto end; + } } acc_per_subset = cJSON_GetObjectItemCaseSensitive(event_reporting_requirementJSON, "accPerSubset"); @@ -252,7 +256,6 @@ OpenAPI_accuracy_t *acc_per_subsetItem = OpenAPI_accuracy_parseFromJSON(acc_per_subset_local); if (!acc_per_subsetItem) { ogs_error("No acc_per_subsetItem"); - OpenAPI_list_free(acc_per_subsetList); goto end; } OpenAPI_list_add(acc_per_subsetList, acc_per_subsetItem); @@ -333,7 +336,6 @@ OpenAPI_analytics_metadata_t *ana_metaItem = OpenAPI_analytics_metadata_parseFromJSON(ana_meta_local); if (!ana_metaItem) { ogs_error("No ana_metaItem"); - OpenAPI_list_free(ana_metaList); goto end; } OpenAPI_list_add(ana_metaList, ana_metaItem); @@ -343,6 +345,10 @@ ana_meta_ind = cJSON_GetObjectItemCaseSensitive(event_reporting_requirementJSON, "anaMetaInd"); if (ana_meta_ind) { ana_meta_ind_local_nonprim = OpenAPI_analytics_metadata_indication_parseFromJSON(ana_meta_ind); + if (!ana_meta_ind_local_nonprim) { + ogs_error("OpenAPI_analytics_metadata_indication_parseFromJSON failed ana_meta_ind"); + goto end; + } } event_reporting_requirement_local_var = OpenAPI_event_reporting_requirement_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/event_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/event_subscription.c
Changed
@@ -1046,10 +1046,18 @@ goto end; } event_local_nonprim = OpenAPI_nwdaf_event_parseFromJSON(event); + if (!event_local_nonprim) { + ogs_error("OpenAPI_nwdaf_event_parseFromJSON failed event"); + goto end; + } extra_report_req = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "extraReportReq"); if (extra_report_req) { extra_report_req_local_nonprim = OpenAPI_event_reporting_requirement_parseFromJSON(extra_report_req); + if (!extra_report_req_local_nonprim) { + ogs_error("OpenAPI_event_reporting_requirement_parseFromJSON failed extra_report_req"); + goto end; + } } ladn_dnns = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "ladnDnns"); @@ -1084,11 +1092,19 @@ notification_method = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "notificationMethod"); if (notification_method) { notification_method_local_nonprim = OpenAPI_notification_method_parseFromJSON(notification_method); + if (!notification_method_local_nonprim) { + ogs_error("OpenAPI_notification_method_parseFromJSON failed notification_method"); + goto end; + } } matching_dir = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "matchingDir"); if (matching_dir) { matching_dir_local_nonprim = OpenAPI_matching_direction_parseFromJSON(matching_dir); + if (!matching_dir_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed matching_dir"); + goto end; + } } nf_load_lvl_thds = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "nfLoadLvlThds"); @@ -1109,7 +1125,6 @@ OpenAPI_threshold_level_t *nf_load_lvl_thdsItem = OpenAPI_threshold_level_parseFromJSON(nf_load_lvl_thds_local); if (!nf_load_lvl_thdsItem) { ogs_error("No nf_load_lvl_thdsItem"); - OpenAPI_list_free(nf_load_lvl_thdsList); goto end; } OpenAPI_list_add(nf_load_lvl_thdsList, nf_load_lvl_thdsItem); @@ -1180,6 +1195,10 @@ network_area = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "networkArea"); if (network_area) { network_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(network_area); + if (!network_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed network_area"); + goto end; + } } visited_areas = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "visitedAreas"); @@ -1200,7 +1219,6 @@ OpenAPI_network_area_info_t *visited_areasItem = OpenAPI_network_area_info_parseFromJSON(visited_areas_local); if (!visited_areasItem) { ogs_error("No visited_areasItem"); - OpenAPI_list_free(visited_areasList); goto end; } OpenAPI_list_add(visited_areasList, visited_areasItem); @@ -1241,7 +1259,6 @@ OpenAPI_nsi_id_info_t *nsi_id_infosItem = OpenAPI_nsi_id_info_parseFromJSON(nsi_id_infos_local); if (!nsi_id_infosItem) { ogs_error("No nsi_id_infosItem"); - OpenAPI_list_free(nsi_id_infosList); goto end; } OpenAPI_list_add(nsi_id_infosList, nsi_id_infosItem); @@ -1278,6 +1295,10 @@ qos_requ = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "qosRequ"); if (qos_requ) { qos_requ_local_nonprim = OpenAPI_qos_requirement_parseFromJSON(qos_requ); + if (!qos_requ_local_nonprim) { + ogs_error("OpenAPI_qos_requirement_parseFromJSON failed qos_requ"); + goto end; + } } qos_flow_ret_thds = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "qosFlowRetThds"); @@ -1298,7 +1319,6 @@ OpenAPI_retainability_threshold_t *qos_flow_ret_thdsItem = OpenAPI_retainability_threshold_parseFromJSON(qos_flow_ret_thds_local); if (!qos_flow_ret_thdsItem) { ogs_error("No qos_flow_ret_thdsItem"); - OpenAPI_list_free(qos_flow_ret_thdsList); goto end; } OpenAPI_list_add(qos_flow_ret_thdsList, qos_flow_ret_thdsItem); @@ -1352,7 +1372,6 @@ OpenAPI_snssai_t *snssaiaItem = OpenAPI_snssai_parseFromJSON(snssaia_local); if (!snssaiaItem) { ogs_error("No snssaiaItem"); - OpenAPI_list_free(snssaiaList); goto end; } OpenAPI_list_add(snssaiaList, snssaiaItem); @@ -1362,6 +1381,10 @@ tgt_ue = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "tgtUe"); if (tgt_ue) { tgt_ue_local_nonprim = OpenAPI_target_ue_information_parseFromJSON(tgt_ue); + if (!tgt_ue_local_nonprim) { + ogs_error("OpenAPI_target_ue_information_parseFromJSON failed tgt_ue"); + goto end; + } } cong_thresholds = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "congThresholds"); @@ -1382,7 +1405,6 @@ OpenAPI_threshold_level_t *cong_thresholdsItem = OpenAPI_threshold_level_parseFromJSON(cong_thresholds_local); if (!cong_thresholdsItem) { ogs_error("No cong_thresholdsItem"); - OpenAPI_list_free(cong_thresholdsList); goto end; } OpenAPI_list_add(cong_thresholdsList, cong_thresholdsItem); @@ -1407,7 +1429,6 @@ OpenAPI_network_perf_requirement_t *nw_perf_requsItem = OpenAPI_network_perf_requirement_parseFromJSON(nw_perf_requs_local); if (!nw_perf_requsItem) { ogs_error("No nw_perf_requsItem"); - OpenAPI_list_free(nw_perf_requsList); goto end; } OpenAPI_list_add(nw_perf_requsList, nw_perf_requsItem); @@ -1432,7 +1453,6 @@ OpenAPI_bw_requirement_t *bw_requsItem = OpenAPI_bw_requirement_parseFromJSON(bw_requs_local); if (!bw_requsItem) { ogs_error("No bw_requsItem"); - OpenAPI_list_free(bw_requsList); goto end; } OpenAPI_list_add(bw_requsList, bw_requsItem); @@ -1457,7 +1477,6 @@ OpenAPI_exception_t *excep_requsItem = OpenAPI_exception_parseFromJSON(excep_requs_local); if (!excep_requsItem) { ogs_error("No excep_requsItem"); - OpenAPI_list_free(excep_requsList); goto end; } OpenAPI_list_add(excep_requsList, excep_requsItem); @@ -1467,11 +1486,19 @@ expt_ana_type = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "exptAnaType"); if (expt_ana_type) { expt_ana_type_local_nonprim = OpenAPI_expected_analytics_type_parseFromJSON(expt_ana_type); + if (!expt_ana_type_local_nonprim) { + ogs_error("OpenAPI_expected_analytics_type_parseFromJSON failed expt_ana_type"); + goto end; + } } expt_ue_behav = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "exptUeBehav"); if (expt_ue_behav) { expt_ue_behav_local_nonprim = OpenAPI_expected_ue_behaviour_data_parseFromJSON(expt_ue_behav); + if (!expt_ue_behav_local_nonprim) { + ogs_error("OpenAPI_expected_ue_behaviour_data_parseFromJSON failed expt_ue_behav"); + goto end; + } } rat_freqs = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "ratFreqs"); @@ -1492,7 +1519,6 @@ OpenAPI_rat_freq_information_t *rat_freqsItem = OpenAPI_rat_freq_information_parseFromJSON(rat_freqs_local); if (!rat_freqsItem) { ogs_error("No rat_freqsItem"); - OpenAPI_list_free(rat_freqsList); goto end; } OpenAPI_list_add(rat_freqsList, rat_freqsItem); @@ -1517,7 +1543,6 @@ OpenAPI_analytics_subset_t *list_of_ana_subsetsItem = OpenAPI_analytics_subset_parseFromJSON(list_of_ana_subsets_local); if (!list_of_ana_subsetsItem) { ogs_error("No list_of_ana_subsetsItem"); - OpenAPI_list_free(list_of_ana_subsetsList); goto end; } OpenAPI_list_add(list_of_ana_subsetsList, list_of_ana_subsetsItem); @@ -1542,7 +1567,6 @@ OpenAPI_dispersion_requirement_t *disper_reqsItem = OpenAPI_dispersion_requirement_parseFromJSON(disper_reqs_local); if (!disper_reqsItem) { ogs_error("No disper_reqsItem"); - OpenAPI_list_free(disper_reqsList); goto end; } OpenAPI_list_add(disper_reqsList, disper_reqsItem); @@ -1567,7 +1591,6 @@ OpenAPI_redundant_transmission_exp_req_t *red_trans_reqsItem = OpenAPI_redundant_transmission_exp_req_parseFromJSON(red_trans_reqs_local); if (!red_trans_reqsItem) { ogs_error("No red_trans_reqsItem"); - OpenAPI_list_free(red_trans_reqsList); goto end; } OpenAPI_list_add(red_trans_reqsList, red_trans_reqsItem); @@ -1592,7 +1615,6 @@ OpenAPI_wlan_performance_req_t *wlan_reqsItem = OpenAPI_wlan_performance_req_parseFromJSON(wlan_reqs_local); if (!wlan_reqsItem) { ogs_error("No wlan_reqsItem"); - OpenAPI_list_free(wlan_reqsList); goto end; } OpenAPI_list_add(wlan_reqsList, wlan_reqsItem); @@ -1602,6 +1624,10 @@ upf_info = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "upfInfo"); if (upf_info) { upf_info_local_nonprim = OpenAPI_upf_information_parseFromJSON(upf_info); + if (!upf_info_local_nonprim) { + ogs_error("OpenAPI_upf_information_parseFromJSON failed upf_info"); + goto end; + } } app_server_addrs = cJSON_GetObjectItemCaseSensitive(event_subscriptionJSON, "appServerAddrs"); @@ -1622,7 +1648,6 @@ OpenAPI_addr_fqdn_t *app_server_addrsItem = OpenAPI_addr_fqdn_parseFromJSON(app_server_addrs_local); if (!app_server_addrsItem) { ogs_error("No app_server_addrsItem"); - OpenAPI_list_free(app_server_addrsList); goto end; } OpenAPI_list_add(app_server_addrsList, app_server_addrsItem); @@ -1647,7 +1672,6 @@ OpenAPI_dn_performance_req_t *dn_perf_reqsItem = OpenAPI_dn_performance_req_parseFromJSON(dn_perf_reqs_local); if (!dn_perf_reqsItem) { ogs_error("No dn_perf_reqsItem"); - OpenAPI_list_free(dn_perf_reqsList); goto end; } OpenAPI_list_add(dn_perf_reqsList, dn_perf_reqsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/events_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/events_notification.c
Changed
@@ -610,7 +610,6 @@ OpenAPI_app_detection_report_t *ad_reportsItem = OpenAPI_app_detection_report_parseFromJSON(ad_reports_local); if (!ad_reportsItem) { ogs_error("No ad_reportsItem"); - OpenAPI_list_free(ad_reportsList); goto end; } OpenAPI_list_add(ad_reportsList, ad_reportsItem); @@ -629,16 +628,28 @@ add_access_info = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "addAccessInfo"); if (add_access_info) { add_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(add_access_info); + if (!add_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed add_access_info"); + goto end; + } } rel_access_info = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "relAccessInfo"); if (rel_access_info) { rel_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(rel_access_info); + if (!rel_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed rel_access_info"); + goto end; + } } an_charg_addr = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "anChargAddr"); if (an_charg_addr) { an_charg_addr_local_nonprim = OpenAPI_acc_net_charging_address_parseFromJSON(an_charg_addr); + if (!an_charg_addr_local_nonprim) { + ogs_error("OpenAPI_acc_net_charging_address_parseFromJSON failed an_charg_addr"); + goto end; + } } an_charg_ids = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "anChargIds"); @@ -659,7 +670,6 @@ OpenAPI_access_net_charging_identifier_t *an_charg_idsItem = OpenAPI_access_net_charging_identifier_parseFromJSON(an_charg_ids_local); if (!an_charg_idsItem) { ogs_error("No an_charg_idsItem"); - OpenAPI_list_free(an_charg_idsList); goto end; } OpenAPI_list_add(an_charg_idsList, an_charg_idsItem); @@ -669,6 +679,10 @@ an_gw_addr = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "anGwAddr"); if (an_gw_addr) { an_gw_addr_local_nonprim = OpenAPI_an_gw_address_parseFromJSON(an_gw_addr); + if (!an_gw_addr_local_nonprim) { + ogs_error("OpenAPI_an_gw_address_parseFromJSON failed an_gw_addr"); + goto end; + } } ev_subs_uri = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "evSubsUri"); @@ -702,7 +716,6 @@ OpenAPI_af_event_notification_t *ev_notifsItem = OpenAPI_af_event_notification_parseFromJSON(ev_notifs_local); if (!ev_notifsItem) { ogs_error("No ev_notifsItem"); - OpenAPI_list_free(ev_notifsList); goto end; } OpenAPI_list_add(ev_notifsList, ev_notifsItem); @@ -726,7 +739,6 @@ OpenAPI_resources_allocation_info_t *failed_resourc_alloc_reportsItem = OpenAPI_resources_allocation_info_parseFromJSON(failed_resourc_alloc_reports_local); if (!failed_resourc_alloc_reportsItem) { ogs_error("No failed_resourc_alloc_reportsItem"); - OpenAPI_list_free(failed_resourc_alloc_reportsList); goto end; } OpenAPI_list_add(failed_resourc_alloc_reportsList, failed_resourc_alloc_reportsItem); @@ -751,7 +763,6 @@ OpenAPI_resources_allocation_info_t *succ_resourc_alloc_reportsItem = OpenAPI_resources_allocation_info_parseFromJSON(succ_resourc_alloc_reports_local); if (!succ_resourc_alloc_reportsItem) { ogs_error("No succ_resourc_alloc_reportsItem"); - OpenAPI_list_free(succ_resourc_alloc_reportsList); goto end; } OpenAPI_list_add(succ_resourc_alloc_reportsList, succ_resourc_alloc_reportsItem); @@ -785,7 +796,6 @@ OpenAPI_out_of_credit_information_t *out_of_cred_reportsItem = OpenAPI_out_of_credit_information_parseFromJSON(out_of_cred_reports_local); if (!out_of_cred_reportsItem) { ogs_error("No out_of_cred_reportsItem"); - OpenAPI_list_free(out_of_cred_reportsList); goto end; } OpenAPI_list_add(out_of_cred_reportsList, out_of_cred_reportsItem); @@ -795,6 +805,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed plmn_id"); + goto end; + } } qnc_reports = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "qncReports"); @@ -815,7 +829,6 @@ OpenAPI_qos_notification_control_info_t *qnc_reportsItem = OpenAPI_qos_notification_control_info_parseFromJSON(qnc_reports_local); if (!qnc_reportsItem) { ogs_error("No qnc_reportsItem"); - OpenAPI_list_free(qnc_reportsList); goto end; } OpenAPI_list_add(qnc_reportsList, qnc_reportsItem); @@ -840,7 +853,6 @@ OpenAPI_qos_monitoring_report_t *qos_mon_reportsItem = OpenAPI_qos_monitoring_report_parseFromJSON(qos_mon_reports_local); if (!qos_mon_reportsItem) { ogs_error("No qos_mon_reportsItem"); - OpenAPI_list_free(qos_mon_reportsList); goto end; } OpenAPI_list_add(qos_mon_reportsList, qos_mon_reportsItem); @@ -865,7 +877,6 @@ OpenAPI_ran_nas_rel_cause_t *ran_nas_rel_causesItem = OpenAPI_ran_nas_rel_cause_parseFromJSON(ran_nas_rel_causes_local); if (!ran_nas_rel_causesItem) { ogs_error("No ran_nas_rel_causesItem"); - OpenAPI_list_free(ran_nas_rel_causesList); goto end; } OpenAPI_list_add(ran_nas_rel_causesList, ran_nas_rel_causesItem); @@ -893,6 +904,10 @@ ue_loc = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "ueLoc"); if (ue_loc) { ue_loc_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_loc); + if (!ue_loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_loc"); + goto end; + } } ue_loc_time = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "ueLocTime"); @@ -914,16 +929,28 @@ usg_rep = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "usgRep"); if (usg_rep) { usg_rep_local_nonprim = OpenAPI_accumulated_usage_parseFromJSON(usg_rep); + if (!usg_rep_local_nonprim) { + ogs_error("OpenAPI_accumulated_usage_parseFromJSON failed usg_rep"); + goto end; + } } tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(events_notificationJSON, "tsnPortManContNwtts"); @@ -944,7 +971,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/events_subsc_put_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/events_subsc_put_data.c
Changed
@@ -793,7 +793,6 @@ OpenAPI_af_event_subscription_t *eventsItem = OpenAPI_af_event_subscription_parseFromJSON(events_local); if (!eventsItem) { ogs_error("No eventsItem"); - OpenAPI_list_free(eventsList); goto end; } OpenAPI_list_add(eventsList, eventsItem); @@ -829,6 +828,10 @@ qos_mon = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "qosMon"); if (qos_mon) { qos_mon_local_nonprim = OpenAPI_qos_monitoring_information_parseFromJSON(qos_mon); + if (!qos_mon_local_nonprim) { + ogs_error("OpenAPI_qos_monitoring_information_parseFromJSON failed qos_mon"); + goto end; + } } req_anis = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "reqAnis"); @@ -853,6 +856,10 @@ usg_thres = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "usgThres"); if (usg_thres) { usg_thres_local_nonprim = OpenAPI_usage_threshold_parseFromJSON(usg_thres); + if (!usg_thres_local_nonprim) { + ogs_error("OpenAPI_usage_threshold_parseFromJSON failed usg_thres"); + goto end; + } } notif_corre_id = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "notifCorreId"); @@ -910,7 +917,6 @@ OpenAPI_app_detection_report_t *ad_reportsItem = OpenAPI_app_detection_report_parseFromJSON(ad_reports_local); if (!ad_reportsItem) { ogs_error("No ad_reportsItem"); - OpenAPI_list_free(ad_reportsList); goto end; } OpenAPI_list_add(ad_reportsList, ad_reportsItem); @@ -929,16 +935,28 @@ add_access_info = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "addAccessInfo"); if (add_access_info) { add_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(add_access_info); + if (!add_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed add_access_info"); + goto end; + } } rel_access_info = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "relAccessInfo"); if (rel_access_info) { rel_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(rel_access_info); + if (!rel_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed rel_access_info"); + goto end; + } } an_charg_addr = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "anChargAddr"); if (an_charg_addr) { an_charg_addr_local_nonprim = OpenAPI_acc_net_charging_address_parseFromJSON(an_charg_addr); + if (!an_charg_addr_local_nonprim) { + ogs_error("OpenAPI_acc_net_charging_address_parseFromJSON failed an_charg_addr"); + goto end; + } } an_charg_ids = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "anChargIds"); @@ -959,7 +977,6 @@ OpenAPI_access_net_charging_identifier_t *an_charg_idsItem = OpenAPI_access_net_charging_identifier_parseFromJSON(an_charg_ids_local); if (!an_charg_idsItem) { ogs_error("No an_charg_idsItem"); - OpenAPI_list_free(an_charg_idsList); goto end; } OpenAPI_list_add(an_charg_idsList, an_charg_idsItem); @@ -969,6 +986,10 @@ an_gw_addr = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "anGwAddr"); if (an_gw_addr) { an_gw_addr_local_nonprim = OpenAPI_an_gw_address_parseFromJSON(an_gw_addr); + if (!an_gw_addr_local_nonprim) { + ogs_error("OpenAPI_an_gw_address_parseFromJSON failed an_gw_addr"); + goto end; + } } ev_subs_uri = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "evSubsUri"); @@ -1002,7 +1023,6 @@ OpenAPI_af_event_notification_t *ev_notifsItem = OpenAPI_af_event_notification_parseFromJSON(ev_notifs_local); if (!ev_notifsItem) { ogs_error("No ev_notifsItem"); - OpenAPI_list_free(ev_notifsList); goto end; } OpenAPI_list_add(ev_notifsList, ev_notifsItem); @@ -1026,7 +1046,6 @@ OpenAPI_resources_allocation_info_t *failed_resourc_alloc_reportsItem = OpenAPI_resources_allocation_info_parseFromJSON(failed_resourc_alloc_reports_local); if (!failed_resourc_alloc_reportsItem) { ogs_error("No failed_resourc_alloc_reportsItem"); - OpenAPI_list_free(failed_resourc_alloc_reportsList); goto end; } OpenAPI_list_add(failed_resourc_alloc_reportsList, failed_resourc_alloc_reportsItem); @@ -1051,7 +1070,6 @@ OpenAPI_resources_allocation_info_t *succ_resourc_alloc_reportsItem = OpenAPI_resources_allocation_info_parseFromJSON(succ_resourc_alloc_reports_local); if (!succ_resourc_alloc_reportsItem) { ogs_error("No succ_resourc_alloc_reportsItem"); - OpenAPI_list_free(succ_resourc_alloc_reportsList); goto end; } OpenAPI_list_add(succ_resourc_alloc_reportsList, succ_resourc_alloc_reportsItem); @@ -1085,7 +1103,6 @@ OpenAPI_out_of_credit_information_t *out_of_cred_reportsItem = OpenAPI_out_of_credit_information_parseFromJSON(out_of_cred_reports_local); if (!out_of_cred_reportsItem) { ogs_error("No out_of_cred_reportsItem"); - OpenAPI_list_free(out_of_cred_reportsList); goto end; } OpenAPI_list_add(out_of_cred_reportsList, out_of_cred_reportsItem); @@ -1095,6 +1112,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed plmn_id"); + goto end; + } } qnc_reports = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "qncReports"); @@ -1115,7 +1136,6 @@ OpenAPI_qos_notification_control_info_t *qnc_reportsItem = OpenAPI_qos_notification_control_info_parseFromJSON(qnc_reports_local); if (!qnc_reportsItem) { ogs_error("No qnc_reportsItem"); - OpenAPI_list_free(qnc_reportsList); goto end; } OpenAPI_list_add(qnc_reportsList, qnc_reportsItem); @@ -1140,7 +1160,6 @@ OpenAPI_qos_monitoring_report_t *qos_mon_reportsItem = OpenAPI_qos_monitoring_report_parseFromJSON(qos_mon_reports_local); if (!qos_mon_reportsItem) { ogs_error("No qos_mon_reportsItem"); - OpenAPI_list_free(qos_mon_reportsList); goto end; } OpenAPI_list_add(qos_mon_reportsList, qos_mon_reportsItem); @@ -1165,7 +1184,6 @@ OpenAPI_ran_nas_rel_cause_t *ran_nas_rel_causesItem = OpenAPI_ran_nas_rel_cause_parseFromJSON(ran_nas_rel_causes_local); if (!ran_nas_rel_causesItem) { ogs_error("No ran_nas_rel_causesItem"); - OpenAPI_list_free(ran_nas_rel_causesList); goto end; } OpenAPI_list_add(ran_nas_rel_causesList, ran_nas_rel_causesItem); @@ -1193,6 +1211,10 @@ ue_loc = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "ueLoc"); if (ue_loc) { ue_loc_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_loc); + if (!ue_loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_loc"); + goto end; + } } ue_loc_time = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "ueLocTime"); @@ -1214,16 +1236,28 @@ usg_rep = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "usgRep"); if (usg_rep) { usg_rep_local_nonprim = OpenAPI_accumulated_usage_parseFromJSON(usg_rep); + if (!usg_rep_local_nonprim) { + ogs_error("OpenAPI_accumulated_usage_parseFromJSON failed usg_rep"); + goto end; + } } tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(events_subsc_put_dataJSON, "tsnPortManContNwtts"); @@ -1244,7 +1278,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/events_subsc_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/events_subsc_req_data.c
Changed
@@ -244,7 +244,6 @@ OpenAPI_af_event_subscription_t *eventsItem = OpenAPI_af_event_subscription_parseFromJSON(events_local); if (!eventsItem) { ogs_error("No eventsItem"); - OpenAPI_list_free(eventsList); goto end; } OpenAPI_list_add(eventsList, eventsItem); @@ -280,6 +279,10 @@ qos_mon = cJSON_GetObjectItemCaseSensitive(events_subsc_req_dataJSON, "qosMon"); if (qos_mon) { qos_mon_local_nonprim = OpenAPI_qos_monitoring_information_parseFromJSON(qos_mon); + if (!qos_mon_local_nonprim) { + ogs_error("OpenAPI_qos_monitoring_information_parseFromJSON failed qos_mon"); + goto end; + } } req_anis = cJSON_GetObjectItemCaseSensitive(events_subsc_req_dataJSON, "reqAnis"); @@ -304,6 +307,10 @@ usg_thres = cJSON_GetObjectItemCaseSensitive(events_subsc_req_dataJSON, "usgThres"); if (usg_thres) { usg_thres_local_nonprim = OpenAPI_usage_threshold_parseFromJSON(usg_thres); + if (!usg_thres_local_nonprim) { + ogs_error("OpenAPI_usage_threshold_parseFromJSON failed usg_thres"); + goto end; + } } notif_corre_id = cJSON_GetObjectItemCaseSensitive(events_subsc_req_dataJSON, "notifCorreId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/events_subsc_req_data_rm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/events_subsc_req_data_rm.c
Changed
@@ -219,7 +219,6 @@ OpenAPI_af_event_subscription_t *eventsItem = OpenAPI_af_event_subscription_parseFromJSON(events_local); if (!eventsItem) { ogs_error("No eventsItem"); - OpenAPI_list_free(eventsList); goto end; } OpenAPI_list_add(eventsList, eventsItem); @@ -255,6 +254,10 @@ qos_mon = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "qosMon"); if (qos_mon) { qos_mon_local_nonprim = OpenAPI_qos_monitoring_information_rm_parseFromJSON(qos_mon); + if (!qos_mon_local_nonprim) { + ogs_error("OpenAPI_qos_monitoring_information_rm_parseFromJSON failed qos_mon"); + goto end; + } } req_anis = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "reqAnis"); @@ -279,6 +282,10 @@ usg_thres = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "usgThres"); if (usg_thres) { usg_thres_local_nonprim = OpenAPI_usage_threshold_rm_parseFromJSON(usg_thres); + if (!usg_thres_local_nonprim) { + ogs_error("OpenAPI_usage_threshold_rm_parseFromJSON failed usg_thres"); + goto end; + } } notif_corre_id = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "notifCorreId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/exception.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/exception.c
Changed
@@ -105,6 +105,10 @@ goto end; } excep_id_local_nonprim = OpenAPI_exception_id_parseFromJSON(excep_id); + if (!excep_id_local_nonprim) { + ogs_error("OpenAPI_exception_id_parseFromJSON failed excep_id"); + goto end; + } excep_level = cJSON_GetObjectItemCaseSensitive(exceptionJSON, "excepLevel"); if (excep_level) { @@ -117,6 +121,10 @@ excep_trend = cJSON_GetObjectItemCaseSensitive(exceptionJSON, "excepTrend"); if (excep_trend) { excep_trend_local_nonprim = OpenAPI_exception_trend_parseFromJSON(excep_trend); + if (!excep_trend_local_nonprim) { + ogs_error("OpenAPI_exception_trend_parseFromJSON failed excep_trend"); + goto end; + } } exception_local_var = OpenAPI_exception_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/expected_ue_behavior.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/expected_ue_behavior.c
Changed
@@ -109,7 +109,6 @@ OpenAPI_user_location_t *exp_move_trajectoryItem = OpenAPI_user_location_parseFromJSON(exp_move_trajectory_local); if (!exp_move_trajectoryItem) { ogs_error("No exp_move_trajectoryItem"); - OpenAPI_list_free(exp_move_trajectoryList); goto end; } OpenAPI_list_add(exp_move_trajectoryList, exp_move_trajectoryItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/expected_ue_behaviour.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/expected_ue_behaviour.c
Changed
@@ -274,6 +274,10 @@ stationary_indication = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "stationaryIndication"); if (stationary_indication) { stationary_indication_local_nonprim = OpenAPI_stationary_indication_rm_parseFromJSON(stationary_indication); + if (!stationary_indication_local_nonprim) { + ogs_error("OpenAPI_stationary_indication_rm_parseFromJSON failed stationary_indication"); + goto end; + } } communication_duration_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "communicationDurationTime"); @@ -287,6 +291,10 @@ scheduled_communication_type = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "scheduledCommunicationType"); if (scheduled_communication_type) { scheduled_communication_type_local_nonprim = OpenAPI_scheduled_communication_type_rm_parseFromJSON(scheduled_communication_type); + if (!scheduled_communication_type_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_type_rm_parseFromJSON failed scheduled_communication_type"); + goto end; + } } periodic_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "periodicTime"); @@ -300,6 +308,10 @@ scheduled_communication_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "scheduledCommunicationTime"); if (scheduled_communication_time) { scheduled_communication_time_local_nonprim = OpenAPI_scheduled_communication_time_rm_parseFromJSON(scheduled_communication_time); + if (!scheduled_communication_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_rm_parseFromJSON failed scheduled_communication_time"); + goto end; + } } expected_umts = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "expectedUmts"); @@ -320,7 +332,6 @@ OpenAPI_location_area_t *expected_umtsItem = OpenAPI_location_area_parseFromJSON(expected_umts_local); if (!expected_umtsItem) { ogs_error("No expected_umtsItem"); - OpenAPI_list_free(expected_umtsList); goto end; } OpenAPI_list_add(expected_umtsList, expected_umtsItem); @@ -330,11 +341,19 @@ traffic_profile = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "trafficProfile"); if (traffic_profile) { traffic_profile_local_nonprim = OpenAPI_traffic_profile_rm_parseFromJSON(traffic_profile); + if (!traffic_profile_local_nonprim) { + ogs_error("OpenAPI_traffic_profile_rm_parseFromJSON failed traffic_profile"); + goto end; + } } battery_indication = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "batteryIndication"); if (battery_indication) { battery_indication_local_nonprim = OpenAPI_battery_indication_rm_parseFromJSON(battery_indication); + if (!battery_indication_local_nonprim) { + ogs_error("OpenAPI_battery_indication_rm_parseFromJSON failed battery_indication"); + goto end; + } } validity_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "validityTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/expected_ue_behaviour_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/expected_ue_behaviour_data.c
Changed
@@ -211,6 +211,10 @@ scheduled_communication_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_dataJSON, "scheduledCommunicationTime"); if (scheduled_communication_time) { scheduled_communication_time_local_nonprim = OpenAPI_scheduled_communication_time_parseFromJSON(scheduled_communication_time); + if (!scheduled_communication_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_parseFromJSON failed scheduled_communication_time"); + goto end; + } } scheduled_communication_type = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_dataJSON, "scheduledCommunicationType"); @@ -240,7 +244,6 @@ OpenAPI_location_area_t *expected_umtsItem = OpenAPI_location_area_parseFromJSON(expected_umts_local); if (!expected_umtsItem) { ogs_error("No expected_umtsItem"); - OpenAPI_list_free(expected_umtsList); goto end; } OpenAPI_list_add(expected_umtsList, expected_umtsItem); @@ -259,6 +262,10 @@ battery_indication = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_dataJSON, "batteryIndication"); if (battery_indication) { battery_indication_local_nonprim = OpenAPI_battery_indication_parseFromJSON(battery_indication); + if (!battery_indication_local_nonprim) { + ogs_error("OpenAPI_battery_indication_parseFromJSON failed battery_indication"); + goto end; + } } validity_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_dataJSON, "validityTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/expected_ue_behaviour_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/expected_ue_behaviour_data_1.c
Changed
@@ -211,6 +211,10 @@ scheduled_communication_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_data_1JSON, "scheduledCommunicationTime"); if (scheduled_communication_time) { scheduled_communication_time_local_nonprim = OpenAPI_scheduled_communication_time_1_parseFromJSON(scheduled_communication_time); + if (!scheduled_communication_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_1_parseFromJSON failed scheduled_communication_time"); + goto end; + } } scheduled_communication_type = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_data_1JSON, "scheduledCommunicationType"); @@ -240,7 +244,6 @@ OpenAPI_location_area_1_t *expected_umtsItem = OpenAPI_location_area_1_parseFromJSON(expected_umts_local); if (!expected_umtsItem) { ogs_error("No expected_umtsItem"); - OpenAPI_list_free(expected_umtsList); goto end; } OpenAPI_list_add(expected_umtsList, expected_umtsItem); @@ -259,6 +262,10 @@ battery_indication = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_data_1JSON, "batteryIndication"); if (battery_indication) { battery_indication_local_nonprim = OpenAPI_battery_indication_parseFromJSON(battery_indication); + if (!battery_indication_local_nonprim) { + ogs_error("OpenAPI_battery_indication_parseFromJSON failed battery_indication"); + goto end; + } } validity_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviour_data_1JSON, "validityTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/exposure_data_change_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/exposure_data_change_notification.c
Changed
@@ -141,6 +141,10 @@ access_and_mobility_data = cJSON_GetObjectItemCaseSensitive(exposure_data_change_notificationJSON, "accessAndMobilityData"); if (access_and_mobility_data) { access_and_mobility_data_local_nonprim = OpenAPI_access_and_mobility_data_parseFromJSON(access_and_mobility_data); + if (!access_and_mobility_data_local_nonprim) { + ogs_error("OpenAPI_access_and_mobility_data_parseFromJSON failed access_and_mobility_data"); + goto end; + } } pdu_session_management_data = cJSON_GetObjectItemCaseSensitive(exposure_data_change_notificationJSON, "pduSessionManagementData"); @@ -161,7 +165,6 @@ OpenAPI_pdu_session_management_data_t *pdu_session_management_dataItem = OpenAPI_pdu_session_management_data_parseFromJSON(pdu_session_management_data_local); if (!pdu_session_management_dataItem) { ogs_error("No pdu_session_management_dataItem"); - OpenAPI_list_free(pdu_session_management_dataList); goto end; } OpenAPI_list_add(pdu_session_management_dataList, pdu_session_management_dataItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ext_amf_event_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ext_amf_event_subscription.c
Changed
@@ -478,7 +478,6 @@ OpenAPI_amf_event_t *event_listItem = OpenAPI_amf_event_parseFromJSON(event_list_local); if (!event_listItem) { ogs_error("No event_listItem"); - OpenAPI_list_free(event_listList); goto end; } OpenAPI_list_add(event_listList, event_listItem); @@ -657,6 +656,10 @@ options = cJSON_GetObjectItemCaseSensitive(ext_amf_event_subscriptionJSON, "options"); if (options) { options_local_nonprim = OpenAPI_amf_event_mode_parseFromJSON(options); + if (!options_local_nonprim) { + ogs_error("OpenAPI_amf_event_mode_parseFromJSON failed options"); + goto end; + } } source_nf_type = cJSON_GetObjectItemCaseSensitive(ext_amf_event_subscriptionJSON, "sourceNfType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ext_problem_details.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ext_problem_details.c
Changed
@@ -300,7 +300,6 @@ OpenAPI_invalid_param_t *invalid_paramsItem = OpenAPI_invalid_param_parseFromJSON(invalid_params_local); if (!invalid_paramsItem) { ogs_error("No invalid_paramsItem"); - OpenAPI_list_free(invalid_paramsList); goto end; } OpenAPI_list_add(invalid_paramsList, invalid_paramsItem); @@ -318,11 +317,19 @@ access_token_error = cJSON_GetObjectItemCaseSensitive(ext_problem_detailsJSON, "accessTokenError"); if (access_token_error) { access_token_error_local_nonprim = OpenAPI_access_token_err_parseFromJSON(access_token_error); + if (!access_token_error_local_nonprim) { + ogs_error("OpenAPI_access_token_err_parseFromJSON failed access_token_error"); + goto end; + } } access_token_request = cJSON_GetObjectItemCaseSensitive(ext_problem_detailsJSON, "accessTokenRequest"); if (access_token_request) { access_token_request_local_nonprim = OpenAPI_access_token_req_parseFromJSON(access_token_request); + if (!access_token_request_local_nonprim) { + ogs_error("OpenAPI_access_token_req_parseFromJSON failed access_token_request"); + goto end; + } } nrf_id = cJSON_GetObjectItemCaseSensitive(ext_problem_detailsJSON, "nrfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ext_snssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ext_snssai.c
Changed
@@ -162,7 +162,6 @@ OpenAPI_sd_range_t *sd_rangesItem = OpenAPI_sd_range_parseFromJSON(sd_ranges_local); if (!sd_rangesItem) { ogs_error("No sd_rangesItem"); - OpenAPI_list_free(sd_rangesList); goto end; } OpenAPI_list_add(sd_rangesList, sd_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/extended_problem_details.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/extended_problem_details.c
Changed
@@ -309,7 +309,6 @@ OpenAPI_invalid_param_t *invalid_paramsItem = OpenAPI_invalid_param_parseFromJSON(invalid_params_local); if (!invalid_paramsItem) { ogs_error("No invalid_paramsItem"); - OpenAPI_list_free(invalid_paramsList); goto end; } OpenAPI_list_add(invalid_paramsList, invalid_paramsItem); @@ -327,11 +326,19 @@ access_token_error = cJSON_GetObjectItemCaseSensitive(extended_problem_detailsJSON, "accessTokenError"); if (access_token_error) { access_token_error_local_nonprim = OpenAPI_access_token_err_parseFromJSON(access_token_error); + if (!access_token_error_local_nonprim) { + ogs_error("OpenAPI_access_token_err_parseFromJSON failed access_token_error"); + goto end; + } } access_token_request = cJSON_GetObjectItemCaseSensitive(extended_problem_detailsJSON, "accessTokenRequest"); if (access_token_request) { access_token_request_local_nonprim = OpenAPI_access_token_req_parseFromJSON(access_token_request); + if (!access_token_request_local_nonprim) { + ogs_error("OpenAPI_access_token_req_parseFromJSON failed access_token_request"); + goto end; + } } nrf_id = cJSON_GetObjectItemCaseSensitive(extended_problem_detailsJSON, "nrfId"); @@ -345,6 +352,10 @@ acceptable_serv_info = cJSON_GetObjectItemCaseSensitive(extended_problem_detailsJSON, "acceptableServInfo"); if (acceptable_serv_info) { acceptable_serv_info_local_nonprim = OpenAPI_acceptable_service_info_parseFromJSON(acceptable_serv_info); + if (!acceptable_serv_info_local_nonprim) { + ogs_error("OpenAPI_acceptable_service_info_parseFromJSON failed acceptable_serv_info"); + goto end; + } } extended_problem_details_local_var = OpenAPI_extended_problem_details_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/extended_problem_details_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/extended_problem_details_all_of.c
Changed
@@ -67,6 +67,10 @@ acceptable_serv_info = cJSON_GetObjectItemCaseSensitive(extended_problem_details_all_ofJSON, "acceptableServInfo"); if (acceptable_serv_info) { acceptable_serv_info_local_nonprim = OpenAPI_acceptable_service_info_parseFromJSON(acceptable_serv_info); + if (!acceptable_serv_info_local_nonprim) { + ogs_error("OpenAPI_acceptable_service_info_parseFromJSON failed acceptable_serv_info"); + goto end; + } } extended_problem_details_all_of_local_var = OpenAPI_extended_problem_details_all_of_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/extended_sm_subs_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/extended_sm_subs_data.c
Changed
@@ -138,7 +138,6 @@ OpenAPI_session_management_subscription_data_t *individual_sm_subs_dataItem = OpenAPI_session_management_subscription_data_parseFromJSON(individual_sm_subs_data_local); if (!individual_sm_subs_dataItem) { ogs_error("No individual_sm_subs_dataItem"); - OpenAPI_list_free(individual_sm_subs_dataList); goto end; } OpenAPI_list_add(individual_sm_subs_dataList, individual_sm_subs_dataItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/external_unrelated_class.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/external_unrelated_class.c
Changed
@@ -142,7 +142,6 @@ OpenAPI_lcs_client_external_t *lcs_client_externalsItem = OpenAPI_lcs_client_external_parseFromJSON(lcs_client_externals_local); if (!lcs_client_externalsItem) { ogs_error("No lcs_client_externalsItem"); - OpenAPI_list_free(lcs_client_externalsList); goto end; } OpenAPI_list_add(lcs_client_externalsList, lcs_client_externalsItem); @@ -167,7 +166,6 @@ OpenAPI_af_external_t *af_externalsItem = OpenAPI_af_external_parseFromJSON(af_externals_local); if (!af_externalsItem) { ogs_error("No af_externalsItem"); - OpenAPI_list_free(af_externalsList); goto end; } OpenAPI_list_add(af_externalsList, af_externalsItem); @@ -192,7 +190,6 @@ OpenAPI_lcs_client_group_external_t *lcs_client_group_externalsItem = OpenAPI_lcs_client_group_external_parseFromJSON(lcs_client_group_externals_local); if (!lcs_client_group_externalsItem) { ogs_error("No lcs_client_group_externalsItem"); - OpenAPI_list_free(lcs_client_group_externalsList); goto end; } OpenAPI_list_add(lcs_client_group_externalsList, lcs_client_group_externalsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/failure_event_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/failure_event_info.c
Changed
@@ -95,6 +95,10 @@ goto end; } event_local_nonprim = OpenAPI_nwdaf_event_parseFromJSON(event); + if (!event_local_nonprim) { + ogs_error("OpenAPI_nwdaf_event_parseFromJSON failed event"); + goto end; + } failure_code = cJSON_GetObjectItemCaseSensitive(failure_event_infoJSON, "failureCode"); if (!failure_code) { @@ -102,6 +106,10 @@ goto end; } failure_code_local_nonprim = OpenAPI_nwdaf_failure_code_parseFromJSON(failure_code); + if (!failure_code_local_nonprim) { + ogs_error("OpenAPI_nwdaf_failure_code_parseFromJSON failed failure_code"); + goto end; + } failure_event_info_local_var = OpenAPI_failure_event_info_create ( event_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/flow_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/flow_information.c
Changed
@@ -168,6 +168,10 @@ eth_flow_description = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "ethFlowDescription"); if (eth_flow_description) { eth_flow_description_local_nonprim = OpenAPI_eth_flow_description_parseFromJSON(eth_flow_description); + if (!eth_flow_description_local_nonprim) { + ogs_error("OpenAPI_eth_flow_description_parseFromJSON failed eth_flow_description"); + goto end; + } } pack_filt_id = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "packFiltId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/gad_shape.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/gad_shape.c
Changed
@@ -72,6 +72,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } gad_shape_local_var = OpenAPI_gad_shape_create ( shape_local_nonprim
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/gba_authentication_info_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/gba_authentication_info_request.c
Changed
@@ -105,6 +105,10 @@ resynchronization_info = cJSON_GetObjectItemCaseSensitive(gba_authentication_info_requestJSON, "resynchronizationInfo"); if (resynchronization_info) { resynchronization_info_local_nonprim = OpenAPI_resynchronization_info_1_parseFromJSON(resynchronization_info); + if (!resynchronization_info_local_nonprim) { + ogs_error("OpenAPI_resynchronization_info_1_parseFromJSON failed resynchronization_info"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(gba_authentication_info_requestJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/gba_authentication_info_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/gba_authentication_info_result.c
Changed
@@ -81,6 +81,10 @@ _3g_aka_av = cJSON_GetObjectItemCaseSensitive(gba_authentication_info_resultJSON, "3gAkaAv"); if (_3g_aka_av) { _3g_aka_av_local_nonprim = OpenAPI_model_3_g_aka_av_parseFromJSON(_3g_aka_av); + if (!_3g_aka_av_local_nonprim) { + ogs_error("OpenAPI_model_3_g_aka_av_parseFromJSON failed _3g_aka_av"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(gba_authentication_info_resultJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/gbr_qos_flow_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/gbr_qos_flow_information.c
Changed
@@ -252,7 +252,6 @@ OpenAPI_alternative_qos_profile_t *alternative_qos_profile_listItem = OpenAPI_alternative_qos_profile_parseFromJSON(alternative_qos_profile_list_local); if (!alternative_qos_profile_listItem) { ogs_error("No alternative_qos_profile_listItem"); - OpenAPI_list_free(alternative_qos_profile_listList); goto end; } OpenAPI_list_add(alternative_qos_profile_listList, alternative_qos_profile_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/geo_service_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/geo_service_area.c
Changed
@@ -115,7 +115,6 @@ OpenAPI_geographic_area_t *geographic_area_listItem = OpenAPI_geographic_area_parseFromJSON(geographic_area_list_local); if (!geographic_area_listItem) { ogs_error("No geographic_area_listItem"); - OpenAPI_list_free(geographic_area_listList); goto end; } OpenAPI_list_add(geographic_area_listList, geographic_area_listItem); @@ -140,7 +139,6 @@ OpenAPI_civic_address_t *civic_address_listItem = OpenAPI_civic_address_parseFromJSON(civic_address_list_local); if (!civic_address_listItem) { ogs_error("No civic_address_listItem"); - OpenAPI_list_free(civic_address_listList); goto end; } OpenAPI_list_add(civic_address_listList, civic_address_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/geo_service_area_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/geo_service_area_1.c
Changed
@@ -115,7 +115,6 @@ OpenAPI_geographic_area_t *geographic_area_listItem = OpenAPI_geographic_area_parseFromJSON(geographic_area_list_local); if (!geographic_area_listItem) { ogs_error("No geographic_area_listItem"); - OpenAPI_list_free(geographic_area_listList); goto end; } OpenAPI_list_add(geographic_area_listList, geographic_area_listItem); @@ -140,7 +139,6 @@ OpenAPI_civic_address_t *civic_address_listItem = OpenAPI_civic_address_parseFromJSON(civic_address_list_local); if (!civic_address_listItem) { ogs_error("No civic_address_listItem"); - OpenAPI_list_free(civic_address_listList); goto end; } OpenAPI_list_add(civic_address_listList, civic_address_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/geographic_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/geographic_area.c
Changed
@@ -211,6 +211,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(geographic_areaJSON, "point"); if (!point) { @@ -218,6 +222,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } uncertainty = cJSON_GetObjectItemCaseSensitive(geographic_areaJSON, "uncertainty"); if (!uncertainty) { @@ -235,6 +243,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(geographic_areaJSON, "confidence"); if (!confidence) { @@ -267,7 +279,6 @@ OpenAPI_geographical_coordinates_t *point_listItem = OpenAPI_geographical_coordinates_parseFromJSON(point_list_local); if (!point_listItem) { ogs_error("No point_listItem"); - OpenAPI_list_free(point_listList); goto end; } OpenAPI_list_add(point_listList, point_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/geographical_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/geographical_area.c
Changed
@@ -88,11 +88,19 @@ civic_address = cJSON_GetObjectItemCaseSensitive(geographical_areaJSON, "civicAddress"); if (civic_address) { civic_address_local_nonprim = OpenAPI_civic_address_parseFromJSON(civic_address); + if (!civic_address_local_nonprim) { + ogs_error("OpenAPI_civic_address_parseFromJSON failed civic_address"); + goto end; + } } shapes = cJSON_GetObjectItemCaseSensitive(geographical_areaJSON, "shapes"); if (shapes) { shapes_local_nonprim = OpenAPI_geographic_area_parseFromJSON(shapes); + if (!shapes_local_nonprim) { + ogs_error("OpenAPI_geographic_area_parseFromJSON failed shapes"); + goto end; + } } geographical_area_local_var = OpenAPI_geographical_area_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/gera_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/gera_location.c
Changed
@@ -234,21 +234,37 @@ cgi = cJSON_GetObjectItemCaseSensitive(gera_locationJSON, "cgi"); if (cgi) { cgi_local_nonprim = OpenAPI_cell_global_id_parseFromJSON(cgi); + if (!cgi_local_nonprim) { + ogs_error("OpenAPI_cell_global_id_parseFromJSON failed cgi"); + goto end; + } } rai = cJSON_GetObjectItemCaseSensitive(gera_locationJSON, "rai"); if (rai) { rai_local_nonprim = OpenAPI_routing_area_id_parseFromJSON(rai); + if (!rai_local_nonprim) { + ogs_error("OpenAPI_routing_area_id_parseFromJSON failed rai"); + goto end; + } } sai = cJSON_GetObjectItemCaseSensitive(gera_locationJSON, "sai"); if (sai) { sai_local_nonprim = OpenAPI_service_area_id_parseFromJSON(sai); + if (!sai_local_nonprim) { + ogs_error("OpenAPI_service_area_id_parseFromJSON failed sai"); + goto end; + } } lai = cJSON_GetObjectItemCaseSensitive(gera_locationJSON, "lai"); if (lai) { lai_local_nonprim = OpenAPI_location_area_id_parseFromJSON(lai); + if (!lai_local_nonprim) { + ogs_error("OpenAPI_location_area_id_parseFromJSON failed lai"); + goto end; + } } vlr_number = cJSON_GetObjectItemCaseSensitive(gera_locationJSON, "vlrNumber");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/global_ran_node_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/global_ran_node_id.c
Changed
@@ -177,6 +177,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } n3_iwf_id = cJSON_GetObjectItemCaseSensitive(global_ran_node_idJSON, "n3IwfId"); if (n3_iwf_id) { @@ -189,6 +193,10 @@ g_nb_id = cJSON_GetObjectItemCaseSensitive(global_ran_node_idJSON, "gNbId"); if (g_nb_id) { g_nb_id_local_nonprim = OpenAPI_gnb_id_parseFromJSON(g_nb_id); + if (!g_nb_id_local_nonprim) { + ogs_error("OpenAPI_gnb_id_parseFromJSON failed g_nb_id"); + goto end; + } } nge_nb_id = cJSON_GetObjectItemCaseSensitive(global_ran_node_idJSON, "ngeNbId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/global_ran_node_id_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/global_ran_node_id_1.c
Changed
@@ -177,6 +177,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } n3_iwf_id = cJSON_GetObjectItemCaseSensitive(global_ran_node_id_1JSON, "n3IwfId"); if (n3_iwf_id) { @@ -189,6 +193,10 @@ g_nb_id = cJSON_GetObjectItemCaseSensitive(global_ran_node_id_1JSON, "gNbId"); if (g_nb_id) { g_nb_id_local_nonprim = OpenAPI_gnb_id_parseFromJSON(g_nb_id); + if (!g_nb_id_local_nonprim) { + ogs_error("OpenAPI_gnb_id_parseFromJSON failed g_nb_id"); + goto end; + } } nge_nb_id = cJSON_GetObjectItemCaseSensitive(global_ran_node_id_1JSON, "ngeNbId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/gmlc_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/gmlc_info.c
Changed
@@ -113,7 +113,6 @@ OpenAPI_external_client_type_t *serving_client_typesItem = OpenAPI_external_client_type_parseFromJSON(serving_client_types_local); if (!serving_client_typesItem) { ogs_error("No serving_client_typesItem"); - OpenAPI_list_free(serving_client_typesList); goto end; } OpenAPI_list_add(serving_client_typesList, serving_client_typesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/group_identifiers.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/group_identifiers.c
Changed
@@ -132,7 +132,6 @@ OpenAPI_ue_id_t *ue_id_listItem = OpenAPI_ue_id_parseFromJSON(ue_id_list_local); if (!ue_id_listItem) { ogs_error("No ue_id_listItem"); - OpenAPI_list_free(ue_id_listList); goto end; } OpenAPI_list_add(ue_id_listList, ue_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/guami.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/guami.c
Changed
@@ -88,6 +88,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed plmn_id"); + goto end; + } amf_id = cJSON_GetObjectItemCaseSensitive(guamiJSON, "amfId"); if (!amf_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/guami_list_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/guami_list_cond.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hsmf_update_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hsmf_update_data.c
Changed
@@ -1174,21 +1174,37 @@ vcn_tunnel_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "vcnTunnelInfo"); if (vcn_tunnel_info) { vcn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(vcn_tunnel_info); + if (!vcn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed vcn_tunnel_info"); + goto end; + } } icn_tunnel_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "icnTunnelInfo"); if (icn_tunnel_info) { icn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(icn_tunnel_info); + if (!icn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed icn_tunnel_info"); + goto end; + } } additional_cn_tunnel_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "additionalCnTunnelInfo"); if (additional_cn_tunnel_info) { additional_cn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(additional_cn_tunnel_info); + if (!additional_cn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed additional_cn_tunnel_info"); + goto end; + } } serving_network = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } an_type = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "anType"); @@ -1221,6 +1237,10 @@ ue_location = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "ueTimeZone"); @@ -1234,6 +1254,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } pause_charging = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "pauseCharging"); @@ -1255,11 +1279,19 @@ n1_sm_info_from_ue = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "n1SmInfoFromUe"); if (n1_sm_info_from_ue) { n1_sm_info_from_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_from_ue); + if (!n1_sm_info_from_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_from_ue"); + goto end; + } } unknown_n1_sm_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "unknownN1SmInfo"); if (unknown_n1_sm_info) { unknown_n1_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(unknown_n1_sm_info); + if (!unknown_n1_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed unknown_n1_sm_info"); + goto end; + } } qos_flows_rel_notify_list = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "qosFlowsRelNotifyList"); @@ -1280,7 +1312,6 @@ OpenAPI_qos_flow_item_t *qos_flows_rel_notify_listItem = OpenAPI_qos_flow_item_parseFromJSON(qos_flows_rel_notify_list_local); if (!qos_flows_rel_notify_listItem) { ogs_error("No qos_flows_rel_notify_listItem"); - OpenAPI_list_free(qos_flows_rel_notify_listList); goto end; } OpenAPI_list_add(qos_flows_rel_notify_listList, qos_flows_rel_notify_listItem); @@ -1305,7 +1336,6 @@ OpenAPI_qos_flow_notify_item_t *qos_flows_notify_listItem = OpenAPI_qos_flow_notify_item_parseFromJSON(qos_flows_notify_list_local); if (!qos_flows_notify_listItem) { ogs_error("No qos_flows_notify_listItem"); - OpenAPI_list_free(qos_flows_notify_listList); goto end; } OpenAPI_list_add(qos_flows_notify_listList, qos_flows_notify_listItem); @@ -1330,7 +1360,6 @@ OpenAPI_pdu_session_notify_item_t *notify_listItem = OpenAPI_pdu_session_notify_item_parseFromJSON(notify_list_local); if (!notify_listItem) { ogs_error("No notify_listItem"); - OpenAPI_list_free(notify_listList); goto end; } OpenAPI_list_add(notify_listList, notify_listItem); @@ -1411,6 +1440,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } _5g_mm_cause_value = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "5gMmCauseValue"); @@ -1456,7 +1489,6 @@ OpenAPI_secondary_rat_usage_report_t *secondary_rat_usage_reportItem = OpenAPI_secondary_rat_usage_report_parseFromJSON(secondary_rat_usage_report_local); if (!secondary_rat_usage_reportItem) { ogs_error("No secondary_rat_usage_reportItem"); - OpenAPI_list_free(secondary_rat_usage_reportList); goto end; } OpenAPI_list_add(secondary_rat_usage_reportList, secondary_rat_usage_reportItem); @@ -1481,7 +1513,6 @@ OpenAPI_secondary_rat_usage_info_t *secondary_rat_usage_infoItem = OpenAPI_secondary_rat_usage_info_parseFromJSON(secondary_rat_usage_info_local); if (!secondary_rat_usage_infoItem) { ogs_error("No secondary_rat_usage_infoItem"); - OpenAPI_list_free(secondary_rat_usage_infoList); goto end; } OpenAPI_list_add(secondary_rat_usage_infoList, secondary_rat_usage_infoItem); @@ -1548,7 +1579,6 @@ OpenAPI_psa_information_t *psa_infoItem = OpenAPI_psa_information_parseFromJSON(psa_info_local); if (!psa_infoItem) { ogs_error("No psa_infoItem"); - OpenAPI_list_free(psa_infoList); goto end; } OpenAPI_list_add(psa_infoList, psa_infoItem); @@ -1558,21 +1588,37 @@ ulcl_bp_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "ulclBpInfo"); if (ulcl_bp_info) { ulcl_bp_info_local_nonprim = OpenAPI_ulcl_bp_information_parseFromJSON(ulcl_bp_info); + if (!ulcl_bp_info_local_nonprim) { + ogs_error("OpenAPI_ulcl_bp_information_parseFromJSON failed ulcl_bp_info"); + goto end; + } } n4_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } presence_in_ladn = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "presenceInLadn"); @@ -1672,26 +1718,46 @@ roaming_charging_profile = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "roamingChargingProfile"); if (roaming_charging_profile) { roaming_charging_profile_local_nonprim = OpenAPI_roaming_charging_profile_parseFromJSON(roaming_charging_profile); + if (!roaming_charging_profile_local_nonprim) { + ogs_error("OpenAPI_roaming_charging_profile_parseFromJSON failed roaming_charging_profile"); + goto end; + } } mo_exp_data_counter = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "moExpDataCounter"); if (mo_exp_data_counter) { mo_exp_data_counter_local_nonprim = OpenAPI_mo_exp_data_counter_parseFromJSON(mo_exp_data_counter); + if (!mo_exp_data_counter_local_nonprim) { + ogs_error("OpenAPI_mo_exp_data_counter_parseFromJSON failed mo_exp_data_counter"); + goto end; + } } vplmn_qos = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "vplmnQos"); if (vplmn_qos) { vplmn_qos_local_nonprim = OpenAPI_vplmn_qos_parseFromJSON(vplmn_qos); + if (!vplmn_qos_local_nonprim) { + ogs_error("OpenAPI_vplmn_qos_parseFromJSON failed vplmn_qos"); + goto end; + } } security_result = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "securityResult"); if (security_result) { security_result_local_nonprim = OpenAPI_security_result_parseFromJSON(security_result); + if (!security_result_local_nonprim) { + ogs_error("OpenAPI_security_result_parseFromJSON failed security_result"); + goto end; + } } up_security_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "upSecurityInfo"); if (up_security_info) { up_security_info_local_nonprim = OpenAPI_up_security_info_parseFromJSON(up_security_info); + if (!up_security_info_local_nonprim) { + ogs_error("OpenAPI_up_security_info_parseFromJSON failed up_security_info"); + goto end; + } } amf_nf_id = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "amfNfId"); @@ -1705,6 +1771,10 @@ guami = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } secondary_rat_usage_data_report_container = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "secondaryRatUsageDataReportContainer"); @@ -1740,6 +1810,10 @@ pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "pcfUeCallbackInfo"); if (pcf_ue_callback_info) { pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info); + if (!pcf_ue_callback_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_callback_info"); + goto end; + } } satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "satelliteBackhaulCat");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hsmf_update_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hsmf_update_error.c
Changed
@@ -145,6 +145,10 @@ goto end; } error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } pti = cJSON_GetObjectItemCaseSensitive(hsmf_update_errorJSON, "pti"); if (pti) { @@ -165,6 +169,10 @@ n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(hsmf_update_errorJSON, "n1SmInfoToUe"); if (n1_sm_info_to_ue) { n1_sm_info_to_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_to_ue); + if (!n1_sm_info_to_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_to_ue"); + goto end; + } } back_off_timer = cJSON_GetObjectItemCaseSensitive(hsmf_update_errorJSON, "backOffTimer");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hsmf_updated_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hsmf_updated_data.c
Changed
@@ -395,21 +395,37 @@ n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "n1SmInfoToUe"); if (n1_sm_info_to_ue) { n1_sm_info_to_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_to_ue); + if (!n1_sm_info_to_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_to_ue"); + goto end; + } } n4_info = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } dnai_list = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "dnaiList"); @@ -444,6 +460,10 @@ roaming_charging_profile = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "roamingChargingProfile"); if (roaming_charging_profile) { roaming_charging_profile_local_nonprim = OpenAPI_roaming_charging_profile_parseFromJSON(roaming_charging_profile); + if (!roaming_charging_profile_local_nonprim) { + ogs_error("OpenAPI_roaming_charging_profile_parseFromJSON failed roaming_charging_profile"); + goto end; + } } home_provided_charging_id = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "homeProvidedChargingId"); @@ -457,6 +477,10 @@ up_security = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "upSecurity"); if (up_security) { up_security_local_nonprim = OpenAPI_up_security_parseFromJSON(up_security); + if (!up_security_local_nonprim) { + ogs_error("OpenAPI_up_security_parseFromJSON failed up_security"); + goto end; + } } max_integrity_protected_data_rate_ul = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "maxIntegrityProtectedDataRateUl"); @@ -503,7 +527,6 @@ OpenAPI_qos_flow_setup_item_t *qos_flows_setup_listItem = OpenAPI_qos_flow_setup_item_parseFromJSON(qos_flows_setup_list_local); if (!qos_flows_setup_listItem) { ogs_error("No qos_flows_setup_listItem"); - OpenAPI_list_free(qos_flows_setup_listList); goto end; } OpenAPI_list_add(qos_flows_setup_listList, qos_flows_setup_listItem); @@ -513,11 +536,19 @@ session_ambr = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "sessionAmbr"); if (session_ambr) { session_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed session_ambr"); + goto end; + } } eps_pdn_cnx_info = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "epsPdnCnxInfo"); if (eps_pdn_cnx_info) { eps_pdn_cnx_info_local_nonprim = OpenAPI_eps_pdn_cnx_info_parseFromJSON(eps_pdn_cnx_info); + if (!eps_pdn_cnx_info_local_nonprim) { + ogs_error("OpenAPI_eps_pdn_cnx_info_parseFromJSON failed eps_pdn_cnx_info"); + goto end; + } } eps_bearer_info = cJSON_GetObjectItemCaseSensitive(hsmf_updated_dataJSON, "epsBearerInfo"); @@ -538,7 +569,6 @@ OpenAPI_eps_bearer_info_t *eps_bearer_infoItem = OpenAPI_eps_bearer_info_parseFromJSON(eps_bearer_info_local); if (!eps_bearer_infoItem) { ogs_error("No eps_bearer_infoItem"); - OpenAPI_list_free(eps_bearer_infoList); goto end; } OpenAPI_list_add(eps_bearer_infoList, eps_bearer_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hss_authentication_info_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hss_authentication_info_request.c
Changed
@@ -183,11 +183,19 @@ serving_network_id = cJSON_GetObjectItemCaseSensitive(hss_authentication_info_requestJSON, "servingNetworkId"); if (serving_network_id) { serving_network_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(serving_network_id); + if (!serving_network_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed serving_network_id"); + goto end; + } } resynchronization_info = cJSON_GetObjectItemCaseSensitive(hss_authentication_info_requestJSON, "resynchronizationInfo"); if (resynchronization_info) { resynchronization_info_local_nonprim = OpenAPI_resynchronization_info_parseFromJSON(resynchronization_info); + if (!resynchronization_info_local_nonprim) { + ogs_error("OpenAPI_resynchronization_info_parseFromJSON failed resynchronization_info"); + goto end; + } } an_id = cJSON_GetObjectItemCaseSensitive(hss_authentication_info_requestJSON, "anId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hss_authentication_info_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hss_authentication_info_result.c
Changed
@@ -94,6 +94,10 @@ goto end; } hss_authentication_vectors_local_nonprim = OpenAPI_hss_authentication_vectors_parseFromJSON(hss_authentication_vectors); + if (!hss_authentication_vectors_local_nonprim) { + ogs_error("OpenAPI_hss_authentication_vectors_parseFromJSON failed hss_authentication_vectors"); + goto end; + } hss_authentication_info_result_local_var = OpenAPI_hss_authentication_info_result_create ( supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hss_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hss_info.c
Changed
@@ -239,7 +239,6 @@ OpenAPI_imsi_range_t *imsi_rangesItem = OpenAPI_imsi_range_parseFromJSON(imsi_ranges_local); if (!imsi_rangesItem) { ogs_error("No imsi_rangesItem"); - OpenAPI_list_free(imsi_rangesList); goto end; } OpenAPI_list_add(imsi_rangesList, imsi_rangesItem); @@ -264,7 +263,6 @@ OpenAPI_identity_range_t *ims_private_identity_rangesItem = OpenAPI_identity_range_parseFromJSON(ims_private_identity_ranges_local); if (!ims_private_identity_rangesItem) { ogs_error("No ims_private_identity_rangesItem"); - OpenAPI_list_free(ims_private_identity_rangesList); goto end; } OpenAPI_list_add(ims_private_identity_rangesList, ims_private_identity_rangesItem); @@ -289,7 +287,6 @@ OpenAPI_identity_range_t *ims_public_identity_rangesItem = OpenAPI_identity_range_parseFromJSON(ims_public_identity_ranges_local); if (!ims_public_identity_rangesItem) { ogs_error("No ims_public_identity_rangesItem"); - OpenAPI_list_free(ims_public_identity_rangesList); goto end; } OpenAPI_list_add(ims_public_identity_rangesList, ims_public_identity_rangesItem); @@ -314,7 +311,6 @@ OpenAPI_identity_range_t *msisdn_rangesItem = OpenAPI_identity_range_parseFromJSON(msisdn_ranges_local); if (!msisdn_rangesItem) { ogs_error("No msisdn_rangesItem"); - OpenAPI_list_free(msisdn_rangesList); goto end; } OpenAPI_list_add(msisdn_rangesList, msisdn_rangesItem); @@ -339,7 +335,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -349,6 +344,10 @@ hss_diameter_address = cJSON_GetObjectItemCaseSensitive(hss_infoJSON, "hssDiameterAddress"); if (hss_diameter_address) { hss_diameter_address_local_nonprim = OpenAPI_network_node_diameter_address_parseFromJSON(hss_diameter_address); + if (!hss_diameter_address_local_nonprim) { + ogs_error("OpenAPI_network_node_diameter_address_parseFromJSON failed hss_diameter_address"); + goto end; + } } hss_info_local_var = OpenAPI_hss_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hss_subscription_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hss_subscription_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_hss_subscription_item_t *hss_subscription_listItem = OpenAPI_hss_subscription_item_parseFromJSON(hss_subscription_list_local); if (!hss_subscription_listItem) { ogs_error("No hss_subscription_listItem"); - OpenAPI_list_free(hss_subscription_listList); goto end; } OpenAPI_list_add(hss_subscription_listList, hss_subscription_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/hss_subscription_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/hss_subscription_item.c
Changed
@@ -119,6 +119,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(hss_subscription_itemJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } hss_subscription_item_local_var = OpenAPI_hss_subscription_item_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/immediate_mdt_conf.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/immediate_mdt_conf.c
Changed
@@ -496,6 +496,10 @@ area_scope = cJSON_GetObjectItemCaseSensitive(immediate_mdt_confJSON, "areaScope"); if (area_scope) { area_scope_local_nonprim = OpenAPI_area_scope_parseFromJSON(area_scope); + if (!area_scope_local_nonprim) { + ogs_error("OpenAPI_area_scope_parseFromJSON failed area_scope"); + goto end; + } } positioning_method = cJSON_GetObjectItemCaseSensitive(immediate_mdt_confJSON, "positioningMethod"); @@ -544,7 +548,6 @@ OpenAPI_plmn_id_t *mdt_allowed_plmn_id_listItem = OpenAPI_plmn_id_parseFromJSON(mdt_allowed_plmn_id_list_local); if (!mdt_allowed_plmn_id_listItem) { ogs_error("No mdt_allowed_plmn_id_listItem"); - OpenAPI_list_free(mdt_allowed_plmn_id_listList); goto end; } OpenAPI_list_add(mdt_allowed_plmn_id_listList, mdt_allowed_plmn_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/immediate_report.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/immediate_report.c
Changed
@@ -382,81 +382,145 @@ am_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "amData"); if (am_data) { am_data_local_nonprim = OpenAPI_access_and_mobility_subscription_data_parseFromJSON(am_data); + if (!am_data_local_nonprim) { + ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON failed am_data"); + goto end; + } } smf_sel_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "smfSelData"); if (smf_sel_data) { smf_sel_data_local_nonprim = OpenAPI_smf_selection_subscription_data_parseFromJSON(smf_sel_data); + if (!smf_sel_data_local_nonprim) { + ogs_error("OpenAPI_smf_selection_subscription_data_parseFromJSON failed smf_sel_data"); + goto end; + } } uec_amf_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "uecAmfData"); if (uec_amf_data) { uec_amf_data_local_nonprim = OpenAPI_ue_context_in_amf_data_parseFromJSON(uec_amf_data); + if (!uec_amf_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_amf_data_parseFromJSON failed uec_amf_data"); + goto end; + } } uec_smf_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "uecSmfData"); if (uec_smf_data) { uec_smf_data_local_nonprim = OpenAPI_ue_context_in_smf_data_parseFromJSON(uec_smf_data); + if (!uec_smf_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON failed uec_smf_data"); + goto end; + } } uec_smsf_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "uecSmsfData"); if (uec_smsf_data) { uec_smsf_data_local_nonprim = OpenAPI_ue_context_in_smsf_data_parseFromJSON(uec_smsf_data); + if (!uec_smsf_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smsf_data_parseFromJSON failed uec_smsf_data"); + goto end; + } } sms_subs_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "smsSubsData"); if (sms_subs_data) { sms_subs_data_local_nonprim = OpenAPI_sms_subscription_data_parseFromJSON(sms_subs_data); + if (!sms_subs_data_local_nonprim) { + ogs_error("OpenAPI_sms_subscription_data_parseFromJSON failed sms_subs_data"); + goto end; + } } sm_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "smData"); if (sm_data) { sm_data_local_nonprim = OpenAPI_sm_subs_data_parseFromJSON(sm_data); + if (!sm_data_local_nonprim) { + ogs_error("OpenAPI_sm_subs_data_parseFromJSON failed sm_data"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } sms_mng_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "smsMngData"); if (sms_mng_data) { sms_mng_data_local_nonprim = OpenAPI_sms_management_subscription_data_parseFromJSON(sms_mng_data); + if (!sms_mng_data_local_nonprim) { + ogs_error("OpenAPI_sms_management_subscription_data_parseFromJSON failed sms_mng_data"); + goto end; + } } lcs_privacy_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "lcsPrivacyData"); if (lcs_privacy_data) { lcs_privacy_data_local_nonprim = OpenAPI_lcs_privacy_data_parseFromJSON(lcs_privacy_data); + if (!lcs_privacy_data_local_nonprim) { + ogs_error("OpenAPI_lcs_privacy_data_parseFromJSON failed lcs_privacy_data"); + goto end; + } } lcs_mo_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "lcsMoData"); if (lcs_mo_data) { lcs_mo_data_local_nonprim = OpenAPI_lcs_mo_data_parseFromJSON(lcs_mo_data); + if (!lcs_mo_data_local_nonprim) { + ogs_error("OpenAPI_lcs_mo_data_parseFromJSON failed lcs_mo_data"); + goto end; + } } v2x_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "v2xData"); if (v2x_data) { v2x_data_local_nonprim = OpenAPI_v2x_subscription_data_parseFromJSON(v2x_data); + if (!v2x_data_local_nonprim) { + ogs_error("OpenAPI_v2x_subscription_data_parseFromJSON failed v2x_data"); + goto end; + } } lcs_broadcast_assistance_types_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "lcsBroadcastAssistanceTypesData"); if (lcs_broadcast_assistance_types_data) { lcs_broadcast_assistance_types_data_local_nonprim = OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON(lcs_broadcast_assistance_types_data); + if (!lcs_broadcast_assistance_types_data_local_nonprim) { + ogs_error("OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON failed lcs_broadcast_assistance_types_data"); + goto end; + } } prose_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "proseData"); if (prose_data) { prose_data_local_nonprim = OpenAPI_prose_subscription_data_parseFromJSON(prose_data); + if (!prose_data_local_nonprim) { + ogs_error("OpenAPI_prose_subscription_data_parseFromJSON failed prose_data"); + goto end; + } } mbs_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "mbsData"); if (mbs_data) { mbs_data_local_nonprim = OpenAPI_mbs_subscription_data_parseFromJSON(mbs_data); + if (!mbs_data_local_nonprim) { + ogs_error("OpenAPI_mbs_subscription_data_parseFromJSON failed mbs_data"); + goto end; + } } uc_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "ucData"); if (uc_data) { uc_data_local_nonprim = OpenAPI_uc_subscription_data_parseFromJSON(uc_data); + if (!uc_data_local_nonprim) { + ogs_error("OpenAPI_uc_subscription_data_parseFromJSON failed uc_data"); + goto end; + } } immediate_report_local_var = OpenAPI_immediate_report_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ip_eth_flow_description.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ip_eth_flow_description.c
Changed
@@ -89,6 +89,10 @@ eth_traffic_filter = cJSON_GetObjectItemCaseSensitive(ip_eth_flow_descriptionJSON, "ethTrafficFilter"); if (eth_traffic_filter) { eth_traffic_filter_local_nonprim = OpenAPI_eth_flow_description_parseFromJSON(eth_traffic_filter); + if (!eth_traffic_filter_local_nonprim) { + ogs_error("OpenAPI_eth_flow_description_parseFromJSON failed eth_traffic_filter"); + goto end; + } } ip_eth_flow_description_local_var = OpenAPI_ip_eth_flow_description_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ip_sm_gw_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ip_sm_gw_info.c
Changed
@@ -88,11 +88,19 @@ ip_sm_gw_registration = cJSON_GetObjectItemCaseSensitive(ip_sm_gw_infoJSON, "ipSmGwRegistration"); if (ip_sm_gw_registration) { ip_sm_gw_registration_local_nonprim = OpenAPI_ip_sm_gw_registration_parseFromJSON(ip_sm_gw_registration); + if (!ip_sm_gw_registration_local_nonprim) { + ogs_error("OpenAPI_ip_sm_gw_registration_parseFromJSON failed ip_sm_gw_registration"); + goto end; + } } ip_sm_gw_guidance = cJSON_GetObjectItemCaseSensitive(ip_sm_gw_infoJSON, "ipSmGwGuidance"); if (ip_sm_gw_guidance) { ip_sm_gw_guidance_local_nonprim = OpenAPI_ip_sm_gw_guidance_parseFromJSON(ip_sm_gw_guidance); + if (!ip_sm_gw_guidance_local_nonprim) { + ogs_error("OpenAPI_ip_sm_gw_guidance_parseFromJSON failed ip_sm_gw_guidance"); + goto end; + } } ip_sm_gw_info_local_var = OpenAPI_ip_sm_gw_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ip_sm_gw_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ip_sm_gw_registration.c
Changed
@@ -194,6 +194,10 @@ ip_sm_gw_diameter_address = cJSON_GetObjectItemCaseSensitive(ip_sm_gw_registrationJSON, "ipSmGwDiameterAddress"); if (ip_sm_gw_diameter_address) { ip_sm_gw_diameter_address_local_nonprim = OpenAPI_network_node_diameter_address_parseFromJSON(ip_sm_gw_diameter_address); + if (!ip_sm_gw_diameter_address_local_nonprim) { + ogs_error("OpenAPI_network_node_diameter_address_parseFromJSON failed ip_sm_gw_diameter_address"); + goto end; + } } ipsmgw_ipv4 = cJSON_GetObjectItemCaseSensitive(ip_sm_gw_registrationJSON, "ipsmgwIpv4");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/iptv_config_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/iptv_config_data.c
Changed
@@ -244,6 +244,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(iptv_config_dataJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } af_app_id = cJSON_GetObjectItemCaseSensitive(iptv_config_dataJSON, "afAppId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/iwmsc_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/iwmsc_info.c
Changed
@@ -156,7 +156,6 @@ OpenAPI_identity_range_t *msisdn_rangesItem = OpenAPI_identity_range_parseFromJSON(msisdn_ranges_local); if (!msisdn_rangesItem) { ogs_error("No msisdn_rangesItem"); - OpenAPI_list_free(msisdn_rangesList); goto end; } OpenAPI_list_add(msisdn_rangesList, msisdn_rangesItem); @@ -181,7 +180,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -206,7 +204,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lcs_client_external.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lcs_client_external.c
Changed
@@ -120,7 +120,6 @@ OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local); if (!allowed_geographic_areaItem) { ogs_error("No allowed_geographic_areaItem"); - OpenAPI_list_free(allowed_geographic_areaList); goto end; } OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem); @@ -139,6 +138,10 @@ valid_time_period = cJSON_GetObjectItemCaseSensitive(lcs_client_externalJSON, "validTimePeriod"); if (valid_time_period) { valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period); + if (!valid_time_period_local_nonprim) { + ogs_error("OpenAPI_valid_time_period_parseFromJSON failed valid_time_period"); + goto end; + } } lcs_client_external_local_var = OpenAPI_lcs_client_external_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lcs_client_group_external.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lcs_client_group_external.c
Changed
@@ -142,7 +142,6 @@ OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local); if (!allowed_geographic_areaItem) { ogs_error("No allowed_geographic_areaItem"); - OpenAPI_list_free(allowed_geographic_areaList); goto end; } OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem); @@ -161,6 +160,10 @@ valid_time_period = cJSON_GetObjectItemCaseSensitive(lcs_client_group_externalJSON, "validTimePeriod"); if (valid_time_period) { valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period); + if (!valid_time_period_local_nonprim) { + ogs_error("OpenAPI_valid_time_period_parseFromJSON failed valid_time_period"); + goto end; + } } lcs_client_group_external_local_var = OpenAPI_lcs_client_group_external_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lcs_mo_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lcs_mo_data.c
Changed
@@ -112,6 +112,10 @@ mo_assistance_data_types = cJSON_GetObjectItemCaseSensitive(lcs_mo_dataJSON, "moAssistanceDataTypes"); if (mo_assistance_data_types) { mo_assistance_data_types_local_nonprim = OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON(mo_assistance_data_types); + if (!mo_assistance_data_types_local_nonprim) { + ogs_error("OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON failed mo_assistance_data_types"); + goto end; + } } lcs_mo_data_local_var = OpenAPI_lcs_mo_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lcs_privacy.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lcs_privacy.c
Changed
@@ -123,6 +123,10 @@ lpi = cJSON_GetObjectItemCaseSensitive(lcs_privacyJSON, "lpi"); if (lpi) { lpi_local_nonprim = OpenAPI_lpi_parseFromJSON(lpi); + if (!lpi_local_nonprim) { + ogs_error("OpenAPI_lpi_parseFromJSON failed lpi"); + goto end; + } } mtc_provider_information = cJSON_GetObjectItemCaseSensitive(lcs_privacyJSON, "mtcProviderInformation");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lcs_privacy_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lcs_privacy_data.c
Changed
@@ -115,11 +115,19 @@ lpi = cJSON_GetObjectItemCaseSensitive(lcs_privacy_dataJSON, "lpi"); if (lpi) { lpi_local_nonprim = OpenAPI_lpi_parseFromJSON(lpi); + if (!lpi_local_nonprim) { + ogs_error("OpenAPI_lpi_parseFromJSON failed lpi"); + goto end; + } } unrelated_class = cJSON_GetObjectItemCaseSensitive(lcs_privacy_dataJSON, "unrelatedClass"); if (unrelated_class) { unrelated_class_local_nonprim = OpenAPI_unrelated_class_parseFromJSON(unrelated_class); + if (!unrelated_class_local_nonprim) { + ogs_error("OpenAPI_unrelated_class_parseFromJSON failed unrelated_class"); + goto end; + } } plmn_operator_classes = cJSON_GetObjectItemCaseSensitive(lcs_privacy_dataJSON, "plmnOperatorClasses"); @@ -140,7 +148,6 @@ OpenAPI_plmn_operator_class_t *plmn_operator_classesItem = OpenAPI_plmn_operator_class_parseFromJSON(plmn_operator_classes_local); if (!plmn_operator_classesItem) { ogs_error("No plmn_operator_classesItem"); - OpenAPI_list_free(plmn_operator_classesList); goto end; } OpenAPI_list_add(plmn_operator_classesList, plmn_operator_classesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lmf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lmf_info.c
Changed
@@ -249,7 +249,6 @@ OpenAPI_external_client_type_t *serving_client_typesItem = OpenAPI_external_client_type_parseFromJSON(serving_client_types_local); if (!serving_client_typesItem) { ogs_error("No serving_client_typesItem"); - OpenAPI_list_free(serving_client_typesList); goto end; } OpenAPI_list_add(serving_client_typesList, serving_client_typesItem); @@ -339,7 +338,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -364,7 +362,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -389,7 +386,6 @@ OpenAPI_supported_gad_shapes_t *supported_gad_shapesItem = OpenAPI_supported_gad_shapes_parseFromJSON(supported_gad_shapes_local); if (!supported_gad_shapesItem) { ogs_error("No supported_gad_shapesItem"); - OpenAPI_list_free(supported_gad_shapesList); goto end; } OpenAPI_list_add(supported_gad_shapesList, supported_gad_shapesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/local2d_point_uncertainty_ellipse.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/local2d_point_uncertainty_ellipse.c
Changed
@@ -149,6 +149,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } local_origin = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipseJSON, "localOrigin"); if (!local_origin) { @@ -156,6 +160,10 @@ goto end; } local_origin_local_nonprim = OpenAPI_local_origin_parseFromJSON(local_origin); + if (!local_origin_local_nonprim) { + ogs_error("OpenAPI_local_origin_parseFromJSON failed local_origin"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipseJSON, "point"); if (!point) { @@ -163,6 +171,10 @@ goto end; } point_local_nonprim = OpenAPI_relative_cartesian_location_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_relative_cartesian_location_parseFromJSON failed point"); + goto end; + } uncertainty_ellipse = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipseJSON, "uncertaintyEllipse"); if (!uncertainty_ellipse) { @@ -170,6 +182,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipseJSON, "confidence"); if (!confidence) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/local2d_point_uncertainty_ellipse_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/local2d_point_uncertainty_ellipse_all_of.c
Changed
@@ -126,6 +126,10 @@ goto end; } local_origin_local_nonprim = OpenAPI_local_origin_parseFromJSON(local_origin); + if (!local_origin_local_nonprim) { + ogs_error("OpenAPI_local_origin_parseFromJSON failed local_origin"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipse_all_ofJSON, "point"); if (!point) { @@ -133,6 +137,10 @@ goto end; } point_local_nonprim = OpenAPI_relative_cartesian_location_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_relative_cartesian_location_parseFromJSON failed point"); + goto end; + } uncertainty_ellipse = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipse_all_ofJSON, "uncertaintyEllipse"); if (!uncertainty_ellipse) { @@ -140,6 +148,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(local2d_point_uncertainty_ellipse_all_ofJSON, "confidence"); if (!confidence) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/local3d_point_uncertainty_ellipsoid.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/local3d_point_uncertainty_ellipsoid.c
Changed
@@ -149,6 +149,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } local_origin = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoidJSON, "localOrigin"); if (!local_origin) { @@ -156,6 +160,10 @@ goto end; } local_origin_local_nonprim = OpenAPI_local_origin_parseFromJSON(local_origin); + if (!local_origin_local_nonprim) { + ogs_error("OpenAPI_local_origin_parseFromJSON failed local_origin"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoidJSON, "point"); if (!point) { @@ -163,6 +171,10 @@ goto end; } point_local_nonprim = OpenAPI_relative_cartesian_location_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_relative_cartesian_location_parseFromJSON failed point"); + goto end; + } uncertainty_ellipsoid = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoidJSON, "uncertaintyEllipsoid"); if (!uncertainty_ellipsoid) { @@ -170,6 +182,10 @@ goto end; } uncertainty_ellipsoid_local_nonprim = OpenAPI_uncertainty_ellipsoid_parseFromJSON(uncertainty_ellipsoid); + if (!uncertainty_ellipsoid_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipsoid_parseFromJSON failed uncertainty_ellipsoid"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoidJSON, "confidence"); if (!confidence) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/local3d_point_uncertainty_ellipsoid_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/local3d_point_uncertainty_ellipsoid_all_of.c
Changed
@@ -126,6 +126,10 @@ goto end; } local_origin_local_nonprim = OpenAPI_local_origin_parseFromJSON(local_origin); + if (!local_origin_local_nonprim) { + ogs_error("OpenAPI_local_origin_parseFromJSON failed local_origin"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoid_all_ofJSON, "point"); if (!point) { @@ -133,6 +137,10 @@ goto end; } point_local_nonprim = OpenAPI_relative_cartesian_location_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_relative_cartesian_location_parseFromJSON failed point"); + goto end; + } uncertainty_ellipsoid = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoid_all_ofJSON, "uncertaintyEllipsoid"); if (!uncertainty_ellipsoid) { @@ -140,6 +148,10 @@ goto end; } uncertainty_ellipsoid_local_nonprim = OpenAPI_uncertainty_ellipsoid_parseFromJSON(uncertainty_ellipsoid); + if (!uncertainty_ellipsoid_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipsoid_parseFromJSON failed uncertainty_ellipsoid"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(local3d_point_uncertainty_ellipsoid_all_ofJSON, "confidence"); if (!confidence) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/local_origin.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/local_origin.c
Changed
@@ -89,6 +89,10 @@ point = cJSON_GetObjectItemCaseSensitive(local_originJSON, "point"); if (point) { point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } } local_origin_local_var = OpenAPI_local_origin_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/location_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/location_area.c
Changed
@@ -157,7 +157,6 @@ OpenAPI_geographic_area_t *geographic_areasItem = OpenAPI_geographic_area_parseFromJSON(geographic_areas_local); if (!geographic_areasItem) { ogs_error("No geographic_areasItem"); - OpenAPI_list_free(geographic_areasList); goto end; } OpenAPI_list_add(geographic_areasList, geographic_areasItem); @@ -182,7 +181,6 @@ OpenAPI_civic_address_t *civic_addressesItem = OpenAPI_civic_address_parseFromJSON(civic_addresses_local); if (!civic_addressesItem) { ogs_error("No civic_addressesItem"); - OpenAPI_list_free(civic_addressesList); goto end; } OpenAPI_list_add(civic_addressesList, civic_addressesItem); @@ -192,11 +190,19 @@ nw_area_info = cJSON_GetObjectItemCaseSensitive(location_areaJSON, "nwAreaInfo"); if (nw_area_info) { nw_area_info_local_nonprim = OpenAPI_network_area_info_1_parseFromJSON(nw_area_info); + if (!nw_area_info_local_nonprim) { + ogs_error("OpenAPI_network_area_info_1_parseFromJSON failed nw_area_info"); + goto end; + } } umt_time = cJSON_GetObjectItemCaseSensitive(location_areaJSON, "umtTime"); if (umt_time) { umt_time_local_nonprim = OpenAPI_umt_time_parseFromJSON(umt_time); + if (!umt_time_local_nonprim) { + ogs_error("OpenAPI_umt_time_parseFromJSON failed umt_time"); + goto end; + } } location_area_local_var = OpenAPI_location_area_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/location_area_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/location_area_1.c
Changed
@@ -157,7 +157,6 @@ OpenAPI_geographic_area_t *geographic_areasItem = OpenAPI_geographic_area_parseFromJSON(geographic_areas_local); if (!geographic_areasItem) { ogs_error("No geographic_areasItem"); - OpenAPI_list_free(geographic_areasList); goto end; } OpenAPI_list_add(geographic_areasList, geographic_areasItem); @@ -182,7 +181,6 @@ OpenAPI_civic_address_t *civic_addressesItem = OpenAPI_civic_address_parseFromJSON(civic_addresses_local); if (!civic_addressesItem) { ogs_error("No civic_addressesItem"); - OpenAPI_list_free(civic_addressesList); goto end; } OpenAPI_list_add(civic_addressesList, civic_addressesItem); @@ -192,11 +190,19 @@ nw_area_info = cJSON_GetObjectItemCaseSensitive(location_area_1JSON, "nwAreaInfo"); if (nw_area_info) { nw_area_info_local_nonprim = OpenAPI_network_area_info_1_parseFromJSON(nw_area_info); + if (!nw_area_info_local_nonprim) { + ogs_error("OpenAPI_network_area_info_1_parseFromJSON failed nw_area_info"); + goto end; + } } umt_time = cJSON_GetObjectItemCaseSensitive(location_area_1JSON, "umtTime"); if (umt_time) { umt_time_local_nonprim = OpenAPI_umt_time_1_parseFromJSON(umt_time); + if (!umt_time_local_nonprim) { + ogs_error("OpenAPI_umt_time_1_parseFromJSON failed umt_time"); + goto end; + } } location_area_1_local_var = OpenAPI_location_area_1_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/location_area_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/location_area_id.c
Changed
@@ -88,6 +88,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } lac = cJSON_GetObjectItemCaseSensitive(location_area_idJSON, "lac"); if (!lac) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/location_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/location_info.c
Changed
@@ -96,6 +96,10 @@ goto end; } loc_local_nonprim = OpenAPI_user_location_parseFromJSON(loc); + if (!loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed loc"); + goto end; + } ratio = cJSON_GetObjectItemCaseSensitive(location_infoJSON, "ratio"); if (ratio) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/location_reporting_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/location_reporting_configuration.c
Changed
@@ -126,11 +126,19 @@ accuracy = cJSON_GetObjectItemCaseSensitive(location_reporting_configurationJSON, "accuracy"); if (accuracy) { accuracy_local_nonprim = OpenAPI_location_accuracy_parseFromJSON(accuracy); + if (!accuracy_local_nonprim) { + ogs_error("OpenAPI_location_accuracy_parseFromJSON failed accuracy"); + goto end; + } } n3gpp_accuracy = cJSON_GetObjectItemCaseSensitive(location_reporting_configurationJSON, "n3gppAccuracy"); if (n3gpp_accuracy) { n3gpp_accuracy_local_nonprim = OpenAPI_location_accuracy_parseFromJSON(n3gpp_accuracy); + if (!n3gpp_accuracy_local_nonprim) { + ogs_error("OpenAPI_location_accuracy_parseFromJSON failed n3gpp_accuracy"); + goto end; + } } location_reporting_configuration_local_var = OpenAPI_location_reporting_configuration_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/location_reporting_configuration_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/location_reporting_configuration_1.c
Changed
@@ -126,11 +126,19 @@ accuracy = cJSON_GetObjectItemCaseSensitive(location_reporting_configuration_1JSON, "accuracy"); if (accuracy) { accuracy_local_nonprim = OpenAPI_location_accuracy_parseFromJSON(accuracy); + if (!accuracy_local_nonprim) { + ogs_error("OpenAPI_location_accuracy_parseFromJSON failed accuracy"); + goto end; + } } n3gpp_accuracy = cJSON_GetObjectItemCaseSensitive(location_reporting_configuration_1JSON, "n3gppAccuracy"); if (n3gpp_accuracy) { n3gpp_accuracy_local_nonprim = OpenAPI_location_accuracy_parseFromJSON(n3gpp_accuracy); + if (!n3gpp_accuracy_local_nonprim) { + ogs_error("OpenAPI_location_accuracy_parseFromJSON failed n3gpp_accuracy"); + goto end; + } } location_reporting_configuration_1_local_var = OpenAPI_location_reporting_configuration_1_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/lpi.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/lpi.c
Changed
@@ -91,6 +91,10 @@ valid_time_period = cJSON_GetObjectItemCaseSensitive(lpiJSON, "validTimePeriod"); if (valid_time_period) { valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period); + if (!valid_time_period_local_nonprim) { + ogs_error("OpenAPI_valid_time_period_parseFromJSON failed valid_time_period"); + goto end; + } } lpi_local_var = OpenAPI_lpi_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mapping_of_snssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mapping_of_snssai.c
Changed
@@ -95,6 +95,10 @@ goto end; } serving_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(serving_snssai); + if (!serving_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed serving_snssai"); + goto end; + } home_snssai = cJSON_GetObjectItemCaseSensitive(mapping_of_snssaiJSON, "homeSnssai"); if (!home_snssai) { @@ -102,6 +106,10 @@ goto end; } home_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(home_snssai); + if (!home_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed home_snssai"); + goto end; + } mapping_of_snssai_local_var = OpenAPI_mapping_of_snssai_create ( serving_snssai_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mb_smf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mb_smf_info.c
Changed
@@ -275,7 +275,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -300,7 +299,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mb_upf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mb_upf_info.c
Changed
@@ -225,7 +225,6 @@ OpenAPI_snssai_upf_info_item_t *s_nssai_mb_upf_info_listItem = OpenAPI_snssai_upf_info_item_parseFromJSON(s_nssai_mb_upf_info_list_local); if (!s_nssai_mb_upf_info_listItem) { ogs_error("No s_nssai_mb_upf_info_listItem"); - OpenAPI_list_free(s_nssai_mb_upf_info_listList); goto end; } OpenAPI_list_add(s_nssai_mb_upf_info_listList, s_nssai_mb_upf_info_listItem); @@ -270,7 +269,6 @@ OpenAPI_interface_upf_info_item_t *interface_mb_upf_info_listItem = OpenAPI_interface_upf_info_item_parseFromJSON(interface_mb_upf_info_list_local); if (!interface_mb_upf_info_listItem) { ogs_error("No interface_mb_upf_info_listItem"); - OpenAPI_list_free(interface_mb_upf_info_listList); goto end; } OpenAPI_list_add(interface_mb_upf_info_listList, interface_mb_upf_info_listItem); @@ -295,7 +293,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -320,7 +317,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_binding_resp.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_binding_resp.c
Changed
@@ -110,7 +110,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_ext_problem_details.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_ext_problem_details.c
Changed
@@ -329,7 +329,6 @@ OpenAPI_invalid_param_t *invalid_paramsItem = OpenAPI_invalid_param_parseFromJSON(invalid_params_local); if (!invalid_paramsItem) { ogs_error("No invalid_paramsItem"); - OpenAPI_list_free(invalid_paramsList); goto end; } OpenAPI_list_add(invalid_paramsList, invalid_paramsItem); @@ -347,11 +346,19 @@ access_token_error = cJSON_GetObjectItemCaseSensitive(mbs_ext_problem_detailsJSON, "accessTokenError"); if (access_token_error) { access_token_error_local_nonprim = OpenAPI_access_token_err_parseFromJSON(access_token_error); + if (!access_token_error_local_nonprim) { + ogs_error("OpenAPI_access_token_err_parseFromJSON failed access_token_error"); + goto end; + } } access_token_request = cJSON_GetObjectItemCaseSensitive(mbs_ext_problem_detailsJSON, "accessTokenRequest"); if (access_token_request) { access_token_request_local_nonprim = OpenAPI_access_token_req_parseFromJSON(access_token_request); + if (!access_token_request_local_nonprim) { + ogs_error("OpenAPI_access_token_req_parseFromJSON failed access_token_request"); + goto end; + } } nrf_id = cJSON_GetObjectItemCaseSensitive(mbs_ext_problem_detailsJSON, "nrfId"); @@ -388,7 +395,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_service_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_service_area.c
Changed
@@ -115,7 +115,6 @@ OpenAPI_ncgi_tai_t *ncgi_listItem = OpenAPI_ncgi_tai_parseFromJSON(ncgi_list_local); if (!ncgi_listItem) { ogs_error("No ncgi_listItem"); - OpenAPI_list_free(ncgi_listList); goto end; } OpenAPI_list_add(ncgi_listList, ncgi_listItem); @@ -140,7 +139,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_service_area_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_service_area_info.c
Changed
@@ -90,6 +90,10 @@ goto end; } mbs_service_area_local_nonprim = OpenAPI_mbs_service_area_parseFromJSON(mbs_service_area); + if (!mbs_service_area_local_nonprim) { + ogs_error("OpenAPI_mbs_service_area_parseFromJSON failed mbs_service_area"); + goto end; + } mbs_service_area_info_local_var = OpenAPI_mbs_service_area_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_session.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_session.c
Changed
@@ -108,6 +108,10 @@ goto end; } mbs_session_id_local_nonprim = OpenAPI_mbs_session_id_parseFromJSON(mbs_session_id); + if (!mbs_session_id_local_nonprim) { + ogs_error("OpenAPI_mbs_session_id_parseFromJSON failed mbs_session_id"); + goto end; + } mbs_area_sessions = cJSON_GetObjectItemCaseSensitive(mbs_sessionJSON, "mbsAreaSessions"); if (mbs_area_sessions) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_session_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_session_id.c
Changed
@@ -102,11 +102,19 @@ tmgi = cJSON_GetObjectItemCaseSensitive(mbs_session_idJSON, "tmgi"); if (tmgi) { tmgi_local_nonprim = OpenAPI_tmgi_parseFromJSON(tmgi); + if (!tmgi_local_nonprim) { + ogs_error("OpenAPI_tmgi_parseFromJSON failed tmgi"); + goto end; + } } ssm = cJSON_GetObjectItemCaseSensitive(mbs_session_idJSON, "ssm"); if (ssm) { ssm_local_nonprim = OpenAPI_ssm_parseFromJSON(ssm); + if (!ssm_local_nonprim) { + ogs_error("OpenAPI_ssm_parseFromJSON failed ssm"); + goto end; + } } nid = cJSON_GetObjectItemCaseSensitive(mbs_session_idJSON, "nid");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_session_id_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_session_id_1.c
Changed
@@ -102,11 +102,19 @@ tmgi = cJSON_GetObjectItemCaseSensitive(mbs_session_id_1JSON, "tmgi"); if (tmgi) { tmgi_local_nonprim = OpenAPI_tmgi_1_parseFromJSON(tmgi); + if (!tmgi_local_nonprim) { + ogs_error("OpenAPI_tmgi_1_parseFromJSON failed tmgi"); + goto end; + } } ssm = cJSON_GetObjectItemCaseSensitive(mbs_session_id_1JSON, "ssm"); if (ssm) { ssm_local_nonprim = OpenAPI_ssm_1_parseFromJSON(ssm); + if (!ssm_local_nonprim) { + ogs_error("OpenAPI_ssm_1_parseFromJSON failed ssm"); + goto end; + } } nid = cJSON_GetObjectItemCaseSensitive(mbs_session_id_1JSON, "nid");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_subscription_data.c
Changed
@@ -108,7 +108,6 @@ OpenAPI_mbs_session_id_t *mbs_session_id_listItem = OpenAPI_mbs_session_id_parseFromJSON(mbs_session_id_list_local); if (!mbs_session_id_listItem) { ogs_error("No mbs_session_id_listItem"); - OpenAPI_list_free(mbs_session_id_listList); goto end; } OpenAPI_list_add(mbs_session_id_listList, mbs_session_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mbs_subscription_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mbs_subscription_data_1.c
Changed
@@ -108,7 +108,6 @@ OpenAPI_mbs_session_id_1_t *mbs_session_id_listItem = OpenAPI_mbs_session_id_1_parseFromJSON(mbs_session_id_list_local); if (!mbs_session_id_listItem) { ogs_error("No mbs_session_id_listItem"); - OpenAPI_list_free(mbs_session_id_listList); goto end; } OpenAPI_list_add(mbs_session_id_listList, mbs_session_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mdt_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mdt_configuration.c
Changed
@@ -493,6 +493,10 @@ area_scope = cJSON_GetObjectItemCaseSensitive(mdt_configurationJSON, "areaScope"); if (area_scope) { area_scope_local_nonprim = OpenAPI_area_scope_parseFromJSON(area_scope); + if (!area_scope_local_nonprim) { + ogs_error("OpenAPI_area_scope_parseFromJSON failed area_scope"); + goto end; + } } measurement_lte_list = cJSON_GetObjectItemCaseSensitive(mdt_configurationJSON, "measurementLteList"); @@ -758,7 +762,6 @@ OpenAPI_plmn_id_t *mdt_allowed_plmn_id_listItem = OpenAPI_plmn_id_parseFromJSON(mdt_allowed_plmn_id_list_local); if (!mdt_allowed_plmn_id_listItem) { ogs_error("No mdt_allowed_plmn_id_listItem"); - OpenAPI_list_free(mdt_allowed_plmn_id_listList); goto end; } OpenAPI_list_add(mdt_allowed_plmn_id_listList, mdt_allowed_plmn_id_listItem); @@ -783,7 +786,6 @@ OpenAPI_mbsfn_area_t *mbsfn_area_listItem = OpenAPI_mbsfn_area_parseFromJSON(mbsfn_area_list_local); if (!mbsfn_area_listItem) { ogs_error("No mbsfn_area_listItem"); - OpenAPI_list_free(mbsfn_area_listList); goto end; } OpenAPI_list_add(mbsfn_area_listList, mbsfn_area_listItem); @@ -808,7 +810,6 @@ OpenAPI_inter_freq_target_info_t *inter_freq_target_listItem = OpenAPI_inter_freq_target_info_parseFromJSON(inter_freq_target_list_local); if (!inter_freq_target_listItem) { ogs_error("No inter_freq_target_listItem"); - OpenAPI_list_free(inter_freq_target_listList); goto end; } OpenAPI_list_add(inter_freq_target_listList, inter_freq_target_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mdt_configuration_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mdt_configuration_1.c
Changed
@@ -493,6 +493,10 @@ area_scope = cJSON_GetObjectItemCaseSensitive(mdt_configuration_1JSON, "areaScope"); if (area_scope) { area_scope_local_nonprim = OpenAPI_area_scope_parseFromJSON(area_scope); + if (!area_scope_local_nonprim) { + ogs_error("OpenAPI_area_scope_parseFromJSON failed area_scope"); + goto end; + } } measurement_lte_list = cJSON_GetObjectItemCaseSensitive(mdt_configuration_1JSON, "measurementLteList"); @@ -758,7 +762,6 @@ OpenAPI_plmn_id_1_t *mdt_allowed_plmn_id_listItem = OpenAPI_plmn_id_1_parseFromJSON(mdt_allowed_plmn_id_list_local); if (!mdt_allowed_plmn_id_listItem) { ogs_error("No mdt_allowed_plmn_id_listItem"); - OpenAPI_list_free(mdt_allowed_plmn_id_listList); goto end; } OpenAPI_list_add(mdt_allowed_plmn_id_listList, mdt_allowed_plmn_id_listItem); @@ -783,7 +786,6 @@ OpenAPI_mbsfn_area_t *mbsfn_area_listItem = OpenAPI_mbsfn_area_parseFromJSON(mbsfn_area_list_local); if (!mbsfn_area_listItem) { ogs_error("No mbsfn_area_listItem"); - OpenAPI_list_free(mbsfn_area_listList); goto end; } OpenAPI_list_add(mbsfn_area_listList, mbsfn_area_listItem); @@ -808,7 +810,6 @@ OpenAPI_inter_freq_target_info_1_t *inter_freq_target_listItem = OpenAPI_inter_freq_target_info_1_parseFromJSON(inter_freq_target_list_local); if (!inter_freq_target_listItem) { ogs_error("No inter_freq_target_listItem"); - OpenAPI_list_free(inter_freq_target_listList); goto end; } OpenAPI_list_add(inter_freq_target_listList, inter_freq_target_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/media_component.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/media_component.c
Changed
@@ -615,6 +615,10 @@ af_rout_req = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "afRoutReq"); if (af_rout_req) { af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_parseFromJSON(af_rout_req); + if (!af_rout_req_local_nonprim) { + ogs_error("OpenAPI_af_routing_requirement_parseFromJSON failed af_rout_req"); + goto end; + } } qos_reference = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "qosReference"); @@ -672,7 +676,6 @@ OpenAPI_alternative_service_requirements_data_t *alt_ser_reqs_dataItem = OpenAPI_alternative_service_requirements_data_parseFromJSON(alt_ser_reqs_data_local); if (!alt_ser_reqs_dataItem) { ogs_error("No alt_ser_reqs_dataItem"); - OpenAPI_list_free(alt_ser_reqs_dataList); goto end; } OpenAPI_list_add(alt_ser_reqs_dataList, alt_ser_reqs_dataItem); @@ -937,16 +940,28 @@ tsn_qos = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tsnQos"); if (tsn_qos) { tsn_qos_local_nonprim = OpenAPI_tsn_qos_container_parseFromJSON(tsn_qos); + if (!tsn_qos_local_nonprim) { + ogs_error("OpenAPI_tsn_qos_container_parseFromJSON failed tsn_qos"); + goto end; + } } tscai_input_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiInputDl"); if (tscai_input_dl) { tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl); + if (!tscai_input_dl_local_nonprim) { + ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed tscai_input_dl"); + goto end; + } } tscai_input_ul = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiInputUl"); if (tscai_input_ul) { tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul); + if (!tscai_input_ul_local_nonprim) { + ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed tscai_input_ul"); + goto end; + } } tscai_time_dom = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiTimeDom");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/media_component_rm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/media_component_rm.c
Changed
@@ -635,6 +635,10 @@ af_rout_req = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "afRoutReq"); if (af_rout_req) { af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_rm_parseFromJSON(af_rout_req); + if (!af_rout_req_local_nonprim) { + ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON failed af_rout_req"); + goto end; + } } qos_reference = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "qosReference"); @@ -684,7 +688,6 @@ OpenAPI_alternative_service_requirements_data_t *alt_ser_reqs_dataItem = OpenAPI_alternative_service_requirements_data_parseFromJSON(alt_ser_reqs_data_local); if (!alt_ser_reqs_dataItem) { ogs_error("No alt_ser_reqs_dataItem"); - OpenAPI_list_free(alt_ser_reqs_dataList); goto end; } OpenAPI_list_add(alt_ser_reqs_dataList, alt_ser_reqs_dataItem); @@ -889,11 +892,19 @@ preempt_cap = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "preemptCap"); if (preempt_cap) { preempt_cap_local_nonprim = OpenAPI_preemption_capability_rm_parseFromJSON(preempt_cap); + if (!preempt_cap_local_nonprim) { + ogs_error("OpenAPI_preemption_capability_rm_parseFromJSON failed preempt_cap"); + goto end; + } } preempt_vuln = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "preemptVuln"); if (preempt_vuln) { preempt_vuln_local_nonprim = OpenAPI_preemption_vulnerability_rm_parseFromJSON(preempt_vuln); + if (!preempt_vuln_local_nonprim) { + ogs_error("OpenAPI_preemption_vulnerability_rm_parseFromJSON failed preempt_vuln"); + goto end; + } } prio_sharing_ind = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "prioSharingInd"); @@ -949,16 +960,28 @@ tsn_qos = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tsnQos"); if (tsn_qos) { tsn_qos_local_nonprim = OpenAPI_tsn_qos_container_rm_parseFromJSON(tsn_qos); + if (!tsn_qos_local_nonprim) { + ogs_error("OpenAPI_tsn_qos_container_rm_parseFromJSON failed tsn_qos"); + goto end; + } } tscai_input_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiInputDl"); if (tscai_input_dl) { tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl); + if (!tscai_input_dl_local_nonprim) { + ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed tscai_input_dl"); + goto end; + } } tscai_input_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiInputUl"); if (tscai_input_ul) { tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul); + if (!tscai_input_ul_local_nonprim) { + ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed tscai_input_ul"); + goto end; + } } tscai_time_dom = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiTimeDom");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/media_sub_component.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/media_sub_component.c
Changed
@@ -205,7 +205,6 @@ OpenAPI_eth_flow_description_t *ethf_descsItem = OpenAPI_eth_flow_description_parseFromJSON(ethf_descs_local); if (!ethf_descsItem) { ogs_error("No ethf_descsItem"); - OpenAPI_list_free(ethf_descsList); goto end; } OpenAPI_list_add(ethf_descsList, ethf_descsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/media_sub_component_rm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/media_sub_component_rm.c
Changed
@@ -205,7 +205,6 @@ OpenAPI_eth_flow_description_t *ethf_descsItem = OpenAPI_eth_flow_description_parseFromJSON(ethf_descs_local); if (!ethf_descsItem) { ogs_error("No ethf_descsItem"); - OpenAPI_list_free(ethf_descsList); goto end; } OpenAPI_list_add(ethf_descsList, ethf_descsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/message_waiting_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/message_waiting_data.c
Changed
@@ -88,7 +88,6 @@ OpenAPI_smsc_data_t *mwd_listItem = OpenAPI_smsc_data_parseFromJSON(mwd_list_local); if (!mwd_listItem) { ogs_error("No mwd_listItem"); - OpenAPI_list_free(mwd_listList); goto end; } OpenAPI_list_add(mwd_listList, mwd_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mfaf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mfaf_info.c
Changed
@@ -202,7 +202,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -227,7 +226,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ml_analytics_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ml_analytics_info.c
Changed
@@ -142,7 +142,6 @@ OpenAPI_nwdaf_event_t *ml_analytics_idsItem = OpenAPI_nwdaf_event_parseFromJSON(ml_analytics_ids_local); if (!ml_analytics_idsItem) { ogs_error("No ml_analytics_idsItem"); - OpenAPI_list_free(ml_analytics_idsList); goto end; } OpenAPI_list_add(ml_analytics_idsList, ml_analytics_idsItem); @@ -167,7 +166,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem); @@ -192,7 +190,6 @@ OpenAPI_tai_t *tracking_area_listItem = OpenAPI_tai_parseFromJSON(tracking_area_list_local); if (!tracking_area_listItem) { ogs_error("No tracking_area_listItem"); - OpenAPI_list_free(tracking_area_listList); goto end; } OpenAPI_list_add(tracking_area_listList, tracking_area_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mm_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mm_context.c
Changed
@@ -494,11 +494,19 @@ nas_security_mode = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "nasSecurityMode"); if (nas_security_mode) { nas_security_mode_local_nonprim = OpenAPI_nas_security_mode_parseFromJSON(nas_security_mode); + if (!nas_security_mode_local_nonprim) { + ogs_error("OpenAPI_nas_security_mode_parseFromJSON failed nas_security_mode"); + goto end; + } } eps_nas_security_mode = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "epsNasSecurityMode"); if (eps_nas_security_mode) { eps_nas_security_mode_local_nonprim = OpenAPI_eps_nas_security_mode_parseFromJSON(eps_nas_security_mode); + if (!eps_nas_security_mode_local_nonprim) { + ogs_error("OpenAPI_eps_nas_security_mode_parseFromJSON failed eps_nas_security_mode"); + goto end; + } } nas_downlink_count = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "nasDownlinkCount"); @@ -551,7 +559,6 @@ OpenAPI_snssai_t *allowed_nssaiItem = OpenAPI_snssai_parseFromJSON(allowed_nssai_local); if (!allowed_nssaiItem) { ogs_error("No allowed_nssaiItem"); - OpenAPI_list_free(allowed_nssaiList); goto end; } OpenAPI_list_add(allowed_nssaiList, allowed_nssaiItem); @@ -576,7 +583,6 @@ OpenAPI_nssai_mapping_t *nssai_mapping_listItem = OpenAPI_nssai_mapping_parseFromJSON(nssai_mapping_list_local); if (!nssai_mapping_listItem) { ogs_error("No nssai_mapping_listItem"); - OpenAPI_list_free(nssai_mapping_listList); goto end; } OpenAPI_list_add(nssai_mapping_listList, nssai_mapping_listItem); @@ -601,7 +607,6 @@ OpenAPI_snssai_t *allowed_home_nssaiItem = OpenAPI_snssai_parseFromJSON(allowed_home_nssai_local); if (!allowed_home_nssaiItem) { ogs_error("No allowed_home_nssaiItem"); - OpenAPI_list_free(allowed_home_nssaiList); goto end; } OpenAPI_list_add(allowed_home_nssaiList, allowed_home_nssaiItem); @@ -632,11 +637,19 @@ expected_u_ebehavior = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "expectedUEbehavior"); if (expected_u_ebehavior) { expected_u_ebehavior_local_nonprim = OpenAPI_expected_ue_behavior_parseFromJSON(expected_u_ebehavior); + if (!expected_u_ebehavior_local_nonprim) { + ogs_error("OpenAPI_expected_ue_behavior_parseFromJSON failed expected_u_ebehavior"); + goto end; + } } ue_differentiation_info = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "ueDifferentiationInfo"); if (ue_differentiation_info) { ue_differentiation_info_local_nonprim = OpenAPI_ue_differentiation_info_parseFromJSON(ue_differentiation_info); + if (!ue_differentiation_info_local_nonprim) { + ogs_error("OpenAPI_ue_differentiation_info_parseFromJSON failed ue_differentiation_info"); + goto end; + } } plmn_assi_ue_radio_cap_id = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "plmnAssiUeRadioCapId"); @@ -666,16 +679,28 @@ n3_iwf_id = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "n3IwfId"); if (n3_iwf_id) { n3_iwf_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(n3_iwf_id); + if (!n3_iwf_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed n3_iwf_id"); + goto end; + } } wagf_id = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "wagfId"); if (wagf_id) { wagf_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(wagf_id); + if (!wagf_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed wagf_id"); + goto end; + } } tngf_id = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "tngfId"); if (tngf_id) { tngf_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(tngf_id); + if (!tngf_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed tngf_id"); + goto end; + } } an_n2_ap_id = cJSON_GetObjectItemCaseSensitive(mm_contextJSON, "anN2ApId"); @@ -704,7 +729,6 @@ OpenAPI_nssaa_status_t *nssaa_status_listItem = OpenAPI_nssaa_status_parseFromJSON(nssaa_status_list_local); if (!nssaa_status_listItem) { ogs_error("No nssaa_status_listItem"); - OpenAPI_list_free(nssaa_status_listList); goto end; } OpenAPI_list_add(nssaa_status_listList, nssaa_status_listItem); @@ -729,7 +753,6 @@ OpenAPI_nssai_mapping_t *pending_nssai_mapping_listItem = OpenAPI_nssai_mapping_parseFromJSON(pending_nssai_mapping_list_local); if (!pending_nssai_mapping_listItem) { ogs_error("No pending_nssai_mapping_listItem"); - OpenAPI_list_free(pending_nssai_mapping_listList); goto end; } OpenAPI_list_add(pending_nssai_mapping_listList, pending_nssai_mapping_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/mnpf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/mnpf_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_identity_range_t *msisdn_rangesItem = OpenAPI_identity_range_parseFromJSON(msisdn_ranges_local); if (!msisdn_rangesItem) { ogs_error("No msisdn_rangesItem"); - OpenAPI_list_free(msisdn_rangesList); goto end; } OpenAPI_list_add(msisdn_rangesList, msisdn_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/model_5_g_ddnmf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/model_5_g_ddnmf_info.c
Changed
@@ -72,6 +72,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } model_5_g_ddnmf_info_local_var = OpenAPI_model_5_g_ddnmf_info_create ( plmn_id_local_nonprim
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/model_5_gvn_group_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/model_5_gvn_group_configuration.c
Changed
@@ -146,6 +146,10 @@ _5g_vn_group_data = cJSON_GetObjectItemCaseSensitive(model_5_gvn_group_configurationJSON, "5gVnGroupData"); if (_5g_vn_group_data) { _5g_vn_group_data_local_nonprim = OpenAPI_model_5_gvn_group_data_parseFromJSON(_5g_vn_group_data); + if (!_5g_vn_group_data_local_nonprim) { + ogs_error("OpenAPI_model_5_gvn_group_data_parseFromJSON failed _5g_vn_group_data"); + goto end; + } } members = cJSON_GetObjectItemCaseSensitive(model_5_gvn_group_configurationJSON, "members");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/model_5_gvn_group_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/model_5_gvn_group_data.c
Changed
@@ -233,6 +233,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } pdu_session_types = cJSON_GetObjectItemCaseSensitive(model_5_gvn_group_dataJSON, "pduSessionTypes"); if (pdu_session_types) { @@ -271,7 +275,6 @@ OpenAPI_app_descriptor_t *app_descriptorsItem = OpenAPI_app_descriptor_parseFromJSON(app_descriptors_local); if (!app_descriptorsItem) { ogs_error("No app_descriptorsItem"); - OpenAPI_list_free(app_descriptorsList); goto end; } OpenAPI_list_add(app_descriptorsList, app_descriptorsItem); @@ -297,6 +300,10 @@ dn_aaa_address = cJSON_GetObjectItemCaseSensitive(model_5_gvn_group_dataJSON, "dnAaaAddress"); if (dn_aaa_address) { dn_aaa_address_local_nonprim = OpenAPI_ip_address_1_parseFromJSON(dn_aaa_address); + if (!dn_aaa_address_local_nonprim) { + ogs_error("OpenAPI_ip_address_1_parseFromJSON failed dn_aaa_address"); + goto end; + } } additional_dn_aaa_addresses = cJSON_GetObjectItemCaseSensitive(model_5_gvn_group_dataJSON, "additionalDnAaaAddresses"); @@ -317,7 +324,6 @@ OpenAPI_ip_address_1_t *additional_dn_aaa_addressesItem = OpenAPI_ip_address_1_parseFromJSON(additional_dn_aaa_addresses_local); if (!additional_dn_aaa_addressesItem) { ogs_error("No additional_dn_aaa_addressesItem"); - OpenAPI_list_free(additional_dn_aaa_addressesList); goto end; } OpenAPI_list_add(additional_dn_aaa_addressesList, additional_dn_aaa_addressesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/model_5_mbs_authorization_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/model_5_mbs_authorization_info.c
Changed
@@ -88,7 +88,6 @@ OpenAPI_mbs_session_id_t *_5mbs_session_idsItem = OpenAPI_mbs_session_id_parseFromJSON(_5mbs_session_ids_local); if (!_5mbs_session_idsItem) { ogs_error("No _5mbs_session_idsItem"); - OpenAPI_list_free(_5mbs_session_idsList); goto end; } OpenAPI_list_add(_5mbs_session_idsList, _5mbs_session_idsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/modification_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/modification_notification.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_notify_item_t *notify_itemsItem = OpenAPI_notify_item_parseFromJSON(notify_items_local); if (!notify_itemsItem) { ogs_error("No notify_itemsItem"); - OpenAPI_list_free(notify_itemsList); goto end; } OpenAPI_list_add(notify_itemsList, notify_itemsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/modify_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/modify_200_response.c
Changed
@@ -428,6 +428,10 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "dnn"); @@ -449,6 +453,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } immediate_report = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "immediateReport"); @@ -480,7 +488,6 @@ OpenAPI_report_item_t *reportItem = OpenAPI_report_item_parseFromJSON(report_local); if (!reportItem) { ogs_error("No reportItem"); - OpenAPI_list_free(reportList); goto end; } OpenAPI_list_add(reportList, reportItem); @@ -497,6 +504,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } nf_change_filter = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "nfChangeFilter"); @@ -539,6 +550,10 @@ ue_con_smf_data_sub_filter = cJSON_GetObjectItemCaseSensitive(modify_200_responseJSON, "ueConSmfDataSubFilter"); if (ue_con_smf_data_sub_filter) { ue_con_smf_data_sub_filter_local_nonprim = OpenAPI_ue_context_in_smf_data_sub_filter_parseFromJSON(ue_con_smf_data_sub_filter); + if (!ue_con_smf_data_sub_filter_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smf_data_sub_filter_parseFromJSON failed ue_con_smf_data_sub_filter"); + goto end; + } } modify_200_response_local_var = OpenAPI_modify_200_response_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/modifysubscription_data_subscription_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/modifysubscription_data_subscription_200_response.c
Changed
@@ -260,7 +260,6 @@ OpenAPI_report_item_t *reportItem = OpenAPI_report_item_parseFromJSON(report_local); if (!reportItem) { ogs_error("No reportItem"); - OpenAPI_list_free(reportList); goto end; } OpenAPI_list_add(reportList, reportItem); @@ -326,11 +325,19 @@ sdm_subscription = cJSON_GetObjectItemCaseSensitive(modifysubscription_data_subscription_200_responseJSON, "sdmSubscription"); if (sdm_subscription) { sdm_subscription_local_nonprim = OpenAPI_sdm_subscription_1_parseFromJSON(sdm_subscription); + if (!sdm_subscription_local_nonprim) { + ogs_error("OpenAPI_sdm_subscription_1_parseFromJSON failed sdm_subscription"); + goto end; + } } hss_subscription_info = cJSON_GetObjectItemCaseSensitive(modifysubscription_data_subscription_200_responseJSON, "hssSubscriptionInfo"); if (hss_subscription_info) { hss_subscription_info_local_nonprim = OpenAPI_hss_subscription_info_parseFromJSON(hss_subscription_info); + if (!hss_subscription_info_local_nonprim) { + ogs_error("OpenAPI_hss_subscription_info_parseFromJSON failed hss_subscription_info"); + goto end; + } } subscription_id = cJSON_GetObjectItemCaseSensitive(modifysubscription_data_subscription_200_responseJSON, "subscriptionId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/monitoring_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/monitoring_configuration.c
Changed
@@ -342,6 +342,10 @@ goto end; } event_type_local_nonprim = OpenAPI_event_type_parseFromJSON(event_type); + if (!event_type_local_nonprim) { + ogs_error("OpenAPI_event_type_parseFromJSON failed event_type"); + goto end; + } immediate_flag = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "immediateFlag"); if (immediate_flag) { @@ -354,21 +358,37 @@ location_reporting_configuration = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "locationReportingConfiguration"); if (location_reporting_configuration) { location_reporting_configuration_local_nonprim = OpenAPI_location_reporting_configuration_parseFromJSON(location_reporting_configuration); + if (!location_reporting_configuration_local_nonprim) { + ogs_error("OpenAPI_location_reporting_configuration_parseFromJSON failed location_reporting_configuration"); + goto end; + } } association_type = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "associationType"); if (association_type) { association_type_local_nonprim = OpenAPI_association_type_parseFromJSON(association_type); + if (!association_type_local_nonprim) { + ogs_error("OpenAPI_association_type_parseFromJSON failed association_type"); + goto end; + } } datalink_report_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "datalinkReportCfg"); if (datalink_report_cfg) { datalink_report_cfg_local_nonprim = OpenAPI_datalink_reporting_configuration_parseFromJSON(datalink_report_cfg); + if (!datalink_report_cfg_local_nonprim) { + ogs_error("OpenAPI_datalink_reporting_configuration_parseFromJSON failed datalink_report_cfg"); + goto end; + } } loss_connectivity_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "lossConnectivityCfg"); if (loss_connectivity_cfg) { loss_connectivity_cfg_local_nonprim = OpenAPI_loss_connectivity_cfg_parseFromJSON(loss_connectivity_cfg); + if (!loss_connectivity_cfg_local_nonprim) { + ogs_error("OpenAPI_loss_connectivity_cfg_parseFromJSON failed loss_connectivity_cfg"); + goto end; + } } maximum_latency = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "maximumLatency"); @@ -406,16 +426,28 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } pdu_session_status_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "pduSessionStatusCfg"); if (pdu_session_status_cfg) { pdu_session_status_cfg_local_nonprim = OpenAPI_pdu_session_status_cfg_parseFromJSON(pdu_session_status_cfg); + if (!pdu_session_status_cfg_local_nonprim) { + ogs_error("OpenAPI_pdu_session_status_cfg_parseFromJSON failed pdu_session_status_cfg"); + goto end; + } } reachability_for_sms_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "reachabilityForSmsCfg"); if (reachability_for_sms_cfg) { reachability_for_sms_cfg_local_nonprim = OpenAPI_reachability_for_sms_configuration_parseFromJSON(reachability_for_sms_cfg); + if (!reachability_for_sms_cfg_local_nonprim) { + ogs_error("OpenAPI_reachability_for_sms_configuration_parseFromJSON failed reachability_for_sms_cfg"); + goto end; + } } mtc_provider_information = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "mtcProviderInformation"); @@ -437,6 +469,10 @@ reachability_for_data_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "reachabilityForDataCfg"); if (reachability_for_data_cfg) { reachability_for_data_cfg_local_nonprim = OpenAPI_reachability_for_data_configuration_parseFromJSON(reachability_for_data_cfg); + if (!reachability_for_data_cfg_local_nonprim) { + ogs_error("OpenAPI_reachability_for_data_configuration_parseFromJSON failed reachability_for_data_cfg"); + goto end; + } } idle_status_ind = cJSON_GetObjectItemCaseSensitive(monitoring_configurationJSON, "idleStatusInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/monitoring_configuration_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/monitoring_configuration_1.c
Changed
@@ -342,6 +342,10 @@ goto end; } event_type_local_nonprim = OpenAPI_event_type_parseFromJSON(event_type); + if (!event_type_local_nonprim) { + ogs_error("OpenAPI_event_type_parseFromJSON failed event_type"); + goto end; + } immediate_flag = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "immediateFlag"); if (immediate_flag) { @@ -354,21 +358,37 @@ location_reporting_configuration = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "locationReportingConfiguration"); if (location_reporting_configuration) { location_reporting_configuration_local_nonprim = OpenAPI_location_reporting_configuration_1_parseFromJSON(location_reporting_configuration); + if (!location_reporting_configuration_local_nonprim) { + ogs_error("OpenAPI_location_reporting_configuration_1_parseFromJSON failed location_reporting_configuration"); + goto end; + } } association_type = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "associationType"); if (association_type) { association_type_local_nonprim = OpenAPI_association_type_parseFromJSON(association_type); + if (!association_type_local_nonprim) { + ogs_error("OpenAPI_association_type_parseFromJSON failed association_type"); + goto end; + } } datalink_report_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "datalinkReportCfg"); if (datalink_report_cfg) { datalink_report_cfg_local_nonprim = OpenAPI_datalink_reporting_configuration_1_parseFromJSON(datalink_report_cfg); + if (!datalink_report_cfg_local_nonprim) { + ogs_error("OpenAPI_datalink_reporting_configuration_1_parseFromJSON failed datalink_report_cfg"); + goto end; + } } loss_connectivity_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "lossConnectivityCfg"); if (loss_connectivity_cfg) { loss_connectivity_cfg_local_nonprim = OpenAPI_loss_connectivity_cfg_1_parseFromJSON(loss_connectivity_cfg); + if (!loss_connectivity_cfg_local_nonprim) { + ogs_error("OpenAPI_loss_connectivity_cfg_1_parseFromJSON failed loss_connectivity_cfg"); + goto end; + } } maximum_latency = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "maximumLatency"); @@ -406,16 +426,28 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } pdu_session_status_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "pduSessionStatusCfg"); if (pdu_session_status_cfg) { pdu_session_status_cfg_local_nonprim = OpenAPI_pdu_session_status_cfg_1_parseFromJSON(pdu_session_status_cfg); + if (!pdu_session_status_cfg_local_nonprim) { + ogs_error("OpenAPI_pdu_session_status_cfg_1_parseFromJSON failed pdu_session_status_cfg"); + goto end; + } } reachability_for_sms_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "reachabilityForSmsCfg"); if (reachability_for_sms_cfg) { reachability_for_sms_cfg_local_nonprim = OpenAPI_reachability_for_sms_configuration_parseFromJSON(reachability_for_sms_cfg); + if (!reachability_for_sms_cfg_local_nonprim) { + ogs_error("OpenAPI_reachability_for_sms_configuration_parseFromJSON failed reachability_for_sms_cfg"); + goto end; + } } mtc_provider_information = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "mtcProviderInformation"); @@ -437,6 +469,10 @@ reachability_for_data_cfg = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "reachabilityForDataCfg"); if (reachability_for_data_cfg) { reachability_for_data_cfg_local_nonprim = OpenAPI_reachability_for_data_configuration_1_parseFromJSON(reachability_for_data_cfg); + if (!reachability_for_data_cfg_local_nonprim) { + ogs_error("OpenAPI_reachability_for_data_configuration_1_parseFromJSON failed reachability_for_data_cfg"); + goto end; + } } idle_status_ind = cJSON_GetObjectItemCaseSensitive(monitoring_configuration_1JSON, "idleStatusInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/multicast_access_control.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/multicast_access_control.c
Changed
@@ -160,6 +160,10 @@ goto end; } acc_status_local_nonprim = OpenAPI_access_right_status_parseFromJSON(acc_status); + if (!acc_status_local_nonprim) { + ogs_error("OpenAPI_access_right_status_parseFromJSON failed acc_status"); + goto end; + } multicast_access_control_local_var = OpenAPI_multicast_access_control_create ( src_ipv4_addr && !cJSON_IsNull(src_ipv4_addr) ? ogs_strdup(src_ipv4_addr->valuestring) : NULL,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n1_message_container.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n1_message_container.c
Changed
@@ -124,6 +124,10 @@ goto end; } n1_message_content_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_message_content); + if (!n1_message_content_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_message_content"); + goto end; + } nf_id = cJSON_GetObjectItemCaseSensitive(n1_message_containerJSON, "nfId"); if (nf_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n1_message_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n1_message_notification.c
Changed
@@ -218,6 +218,10 @@ goto end; } n1_message_container_local_nonprim = OpenAPI_n1_message_container_parseFromJSON(n1_message_container); + if (!n1_message_container_local_nonprim) { + ogs_error("OpenAPI_n1_message_container_parseFromJSON failed n1_message_container"); + goto end; + } lcs_correlation_id = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "lcsCorrelationId"); if (lcs_correlation_id) { @@ -230,6 +234,10 @@ registration_ctxt_container = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "registrationCtxtContainer"); if (registration_ctxt_container) { registration_ctxt_container_local_nonprim = OpenAPI_registration_context_container_parseFromJSON(registration_ctxt_container); + if (!registration_ctxt_container_local_nonprim) { + ogs_error("OpenAPI_registration_context_container_parseFromJSON failed registration_ctxt_container"); + goto end; + } } new_lmf_identification = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "newLmfIdentification"); @@ -243,6 +251,10 @@ guami = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } c_io_t5_gs_optimisation = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "cIoT5GSOptimisation"); @@ -256,11 +268,19 @@ ecgi = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "ecgi"); if (ecgi) { ecgi_local_nonprim = OpenAPI_ecgi_parseFromJSON(ecgi); + if (!ecgi_local_nonprim) { + ogs_error("OpenAPI_ecgi_parseFromJSON failed ecgi"); + goto end; + } } ncgi = cJSON_GetObjectItemCaseSensitive(n1_message_notificationJSON, "ncgi"); if (ncgi) { ncgi_local_nonprim = OpenAPI_ncgi_parseFromJSON(ncgi); + if (!ncgi_local_nonprim) { + ogs_error("OpenAPI_ncgi_parseFromJSON failed ncgi"); + goto end; + } } n1_message_notification_local_var = OpenAPI_n1_message_notification_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n1_n2_message_transfer_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n1_n2_message_transfer_error.c
Changed
@@ -93,10 +93,18 @@ goto end; } error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } err_info = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_errorJSON, "errInfo"); if (err_info) { err_info_local_nonprim = OpenAPI_n1_n2_msg_txfr_err_detail_parseFromJSON(err_info); + if (!err_info_local_nonprim) { + ogs_error("OpenAPI_n1_n2_msg_txfr_err_detail_parseFromJSON failed err_info"); + goto end; + } } n1_n2_message_transfer_error_local_var = OpenAPI_n1_n2_message_transfer_error_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c
Changed
@@ -335,16 +335,28 @@ n1_message_container = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "n1MessageContainer"); if (n1_message_container) { n1_message_container_local_nonprim = OpenAPI_n1_message_container_parseFromJSON(n1_message_container); + if (!n1_message_container_local_nonprim) { + ogs_error("OpenAPI_n1_message_container_parseFromJSON failed n1_message_container"); + goto end; + } } n2_info_container = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "n2InfoContainer"); if (n2_info_container) { n2_info_container_local_nonprim = OpenAPI_n2_info_container_parseFromJSON(n2_info_container); + if (!n2_info_container_local_nonprim) { + ogs_error("OpenAPI_n2_info_container_parseFromJSON failed n2_info_container"); + goto end; + } } mt_data = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "mtData"); if (mt_data) { mt_data_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(mt_data); + if (!mt_data_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed mt_data"); + goto end; + } } skip_ind = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "skipInd"); @@ -390,6 +402,10 @@ arp = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "arp"); if (arp) { arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } } _5qi = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "5qi"); @@ -419,6 +435,10 @@ area_of_validity = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "areaOfValidity"); if (area_of_validity) { area_of_validity_local_nonprim = OpenAPI_area_of_validity_parseFromJSON(area_of_validity); + if (!area_of_validity_local_nonprim) { + ogs_error("OpenAPI_area_of_validity_parseFromJSON failed area_of_validity"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "supportedFeatures"); @@ -432,6 +452,10 @@ old_guami = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "oldGuami"); if (old_guami) { old_guami_local_nonprim = OpenAPI_guami_parseFromJSON(old_guami); + if (!old_guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed old_guami"); + goto end; + } } ma_accepted_ind = cJSON_GetObjectItemCaseSensitive(n1_n2_message_transfer_req_dataJSON, "maAcceptedInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n1_n2_msg_txfr_err_detail.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n1_n2_msg_txfr_err_detail.c
Changed
@@ -99,6 +99,10 @@ highest_prio_arp = cJSON_GetObjectItemCaseSensitive(n1_n2_msg_txfr_err_detailJSON, "highestPrioArp"); if (highest_prio_arp) { highest_prio_arp_local_nonprim = OpenAPI_arp_parseFromJSON(highest_prio_arp); + if (!highest_prio_arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed highest_prio_arp"); + goto end; + } } max_waiting_time = cJSON_GetObjectItemCaseSensitive(n1_n2_msg_txfr_err_detailJSON, "maxWaitingTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_info_container.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_info_container.c
Changed
@@ -196,31 +196,55 @@ sm_info = cJSON_GetObjectItemCaseSensitive(n2_info_containerJSON, "smInfo"); if (sm_info) { sm_info_local_nonprim = OpenAPI_n2_sm_information_parseFromJSON(sm_info); + if (!sm_info_local_nonprim) { + ogs_error("OpenAPI_n2_sm_information_parseFromJSON failed sm_info"); + goto end; + } } ran_info = cJSON_GetObjectItemCaseSensitive(n2_info_containerJSON, "ranInfo"); if (ran_info) { ran_info_local_nonprim = OpenAPI_n2_ran_information_parseFromJSON(ran_info); + if (!ran_info_local_nonprim) { + ogs_error("OpenAPI_n2_ran_information_parseFromJSON failed ran_info"); + goto end; + } } nrppa_info = cJSON_GetObjectItemCaseSensitive(n2_info_containerJSON, "nrppaInfo"); if (nrppa_info) { nrppa_info_local_nonprim = OpenAPI_nrppa_information_parseFromJSON(nrppa_info); + if (!nrppa_info_local_nonprim) { + ogs_error("OpenAPI_nrppa_information_parseFromJSON failed nrppa_info"); + goto end; + } } pws_info = cJSON_GetObjectItemCaseSensitive(n2_info_containerJSON, "pwsInfo"); if (pws_info) { pws_info_local_nonprim = OpenAPI_pws_information_parseFromJSON(pws_info); + if (!pws_info_local_nonprim) { + ogs_error("OpenAPI_pws_information_parseFromJSON failed pws_info"); + goto end; + } } v2x_info = cJSON_GetObjectItemCaseSensitive(n2_info_containerJSON, "v2xInfo"); if (v2x_info) { v2x_info_local_nonprim = OpenAPI_v2x_information_parseFromJSON(v2x_info); + if (!v2x_info_local_nonprim) { + ogs_error("OpenAPI_v2x_information_parseFromJSON failed v2x_info"); + goto end; + } } prose_info = cJSON_GetObjectItemCaseSensitive(n2_info_containerJSON, "proseInfo"); if (prose_info) { prose_info_local_nonprim = OpenAPI_pro_se_information_parseFromJSON(prose_info); + if (!prose_info_local_nonprim) { + ogs_error("OpenAPI_pro_se_information_parseFromJSON failed prose_info"); + goto end; + } } n2_info_container_local_var = OpenAPI_n2_info_container_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_info_content.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_info_content.c
Changed
@@ -112,6 +112,10 @@ goto end; } ngap_data_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(ngap_data); + if (!ngap_data_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed ngap_data"); + goto end; + } n2_info_content_local_var = OpenAPI_n2_info_content_create ( ngap_message_type ? true : false,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_info_notification_rsp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_info_notification_rsp_data.c
Changed
@@ -88,7 +88,6 @@ OpenAPI_n2_sm_information_t *sec_rat_data_usage_listItem = OpenAPI_n2_sm_information_parseFromJSON(sec_rat_data_usage_list_local); if (!sec_rat_data_usage_listItem) { ogs_error("No sec_rat_data_usage_listItem"); - OpenAPI_list_free(sec_rat_data_usage_listList); goto end; } OpenAPI_list_add(sec_rat_data_usage_listList, sec_rat_data_usage_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_info_notify_handover_complete_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_info_notify_handover_complete_200_response.c
Changed
@@ -339,6 +339,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(n2_info_notify_handover_complete_200_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_n2_info_notification_rsp_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_n2_info_notification_rsp_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information_ext1 = cJSON_GetObjectItemCaseSensitive(n2_info_notify_handover_complete_200_responseJSON, "binaryDataN2InformationExt1");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_info_notify_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_info_notify_request.c
Changed
@@ -101,6 +101,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(n2_info_notify_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_n2_information_notification_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_n2_information_notification_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_message = cJSON_GetObjectItemCaseSensitive(n2_info_notify_requestJSON, "binaryDataN1Message");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_information_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_information_notification.c
Changed
@@ -266,6 +266,10 @@ n2_info_container = cJSON_GetObjectItemCaseSensitive(n2_information_notificationJSON, "n2InfoContainer"); if (n2_info_container) { n2_info_container_local_nonprim = OpenAPI_n2_info_container_parseFromJSON(n2_info_container); + if (!n2_info_container_local_nonprim) { + ogs_error("OpenAPI_n2_info_container_parseFromJSON failed n2_info_container"); + goto end; + } } to_release_session_list = cJSON_GetObjectItemCaseSensitive(n2_information_notificationJSON, "toReleaseSessionList"); @@ -330,7 +334,6 @@ OpenAPI_smf_change_info_t *smf_change_info_listItem = OpenAPI_smf_change_info_parseFromJSON(smf_change_info_list_local); if (!smf_change_info_listItem) { ogs_error("No smf_change_info_listItem"); - OpenAPI_list_free(smf_change_info_listList); goto end; } OpenAPI_list_add(smf_change_info_listList, smf_change_info_listItem); @@ -340,6 +343,10 @@ ran_node_id = cJSON_GetObjectItemCaseSensitive(n2_information_notificationJSON, "ranNodeId"); if (ran_node_id) { ran_node_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(ran_node_id); + if (!ran_node_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed ran_node_id"); + goto end; + } } initial_amf_name = cJSON_GetObjectItemCaseSensitive(n2_information_notificationJSON, "initialAmfName"); @@ -369,6 +376,10 @@ guami = cJSON_GetObjectItemCaseSensitive(n2_information_notificationJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } notify_source_ng_ran = cJSON_GetObjectItemCaseSensitive(n2_information_notificationJSON, "notifySourceNgRan");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_information_transfer_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_information_transfer_error.c
Changed
@@ -93,10 +93,18 @@ goto end; } error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } pws_error_info = cJSON_GetObjectItemCaseSensitive(n2_information_transfer_errorJSON, "pwsErrorInfo"); if (pws_error_info) { pws_error_info_local_nonprim = OpenAPI_pws_error_data_parseFromJSON(pws_error_info); + if (!pws_error_info_local_nonprim) { + ogs_error("OpenAPI_pws_error_data_parseFromJSON failed pws_error_info"); + goto end; + } } n2_information_transfer_error_local_var = OpenAPI_n2_information_transfer_error_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_information_transfer_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_information_transfer_req_data.c
Changed
@@ -163,7 +163,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -197,7 +196,6 @@ OpenAPI_global_ran_node_id_t *global_ran_node_listItem = OpenAPI_global_ran_node_id_parseFromJSON(global_ran_node_list_local); if (!global_ran_node_listItem) { ogs_error("No global_ran_node_listItem"); - OpenAPI_list_free(global_ran_node_listList); goto end; } OpenAPI_list_add(global_ran_node_listList, global_ran_node_listItem); @@ -210,6 +208,10 @@ goto end; } n2_information_local_nonprim = OpenAPI_n2_info_container_parseFromJSON(n2_information); + if (!n2_information_local_nonprim) { + ogs_error("OpenAPI_n2_info_container_parseFromJSON failed n2_information"); + goto end; + } supported_features = cJSON_GetObjectItemCaseSensitive(n2_information_transfer_req_dataJSON, "supportedFeatures"); if (supported_features) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c
Changed
@@ -105,6 +105,10 @@ pws_rsp_data = cJSON_GetObjectItemCaseSensitive(n2_information_transfer_rsp_dataJSON, "pwsRspData"); if (pws_rsp_data) { pws_rsp_data_local_nonprim = OpenAPI_pws_response_data_parseFromJSON(pws_rsp_data); + if (!pws_rsp_data_local_nonprim) { + ogs_error("OpenAPI_pws_response_data_parseFromJSON failed pws_rsp_data"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(n2_information_transfer_rsp_dataJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_ran_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_ran_information.c
Changed
@@ -72,6 +72,10 @@ goto end; } n2_info_content_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(n2_info_content); + if (!n2_info_content_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed n2_info_content"); + goto end; + } n2_ran_information_local_var = OpenAPI_n2_ran_information_create ( n2_info_content_local_nonprim
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n2_sm_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n2_sm_information.c
Changed
@@ -160,21 +160,37 @@ n2_info_content = cJSON_GetObjectItemCaseSensitive(n2_sm_informationJSON, "n2InfoContent"); if (n2_info_content) { n2_info_content_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(n2_info_content); + if (!n2_info_content_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed n2_info_content"); + goto end; + } } s_nssai = cJSON_GetObjectItemCaseSensitive(n2_sm_informationJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } home_plmn_snssai = cJSON_GetObjectItemCaseSensitive(n2_sm_informationJSON, "homePlmnSnssai"); if (home_plmn_snssai) { home_plmn_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(home_plmn_snssai); + if (!home_plmn_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed home_plmn_snssai"); + goto end; + } } iwk_snssai = cJSON_GetObjectItemCaseSensitive(n2_sm_informationJSON, "iwkSnssai"); if (iwk_snssai) { iwk_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(iwk_snssai); + if (!iwk_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed iwk_snssai"); + goto end; + } } subject_to_ho = cJSON_GetObjectItemCaseSensitive(n2_sm_informationJSON, "subjectToHo");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n32f_error_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n32f_error_info.c
Changed
@@ -187,7 +187,6 @@ OpenAPI_failed_modification_info_t *failed_modification_listItem = OpenAPI_failed_modification_info_parseFromJSON(failed_modification_list_local); if (!failed_modification_listItem) { ogs_error("No failed_modification_listItem"); - OpenAPI_list_free(failed_modification_listList); goto end; } OpenAPI_list_add(failed_modification_listList, failed_modification_listItem); @@ -212,7 +211,6 @@ OpenAPI_n32f_error_detail_t *error_details_listItem = OpenAPI_n32f_error_detail_parseFromJSON(error_details_list_local); if (!error_details_listItem) { ogs_error("No error_details_listItem"); - OpenAPI_list_free(error_details_listList); goto end; } OpenAPI_list_add(error_details_listList, error_details_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n3ga_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n3ga_location.c
Changed
@@ -234,6 +234,10 @@ n3gpp_tai = cJSON_GetObjectItemCaseSensitive(n3ga_locationJSON, "n3gppTai"); if (n3gpp_tai) { n3gpp_tai_local_nonprim = OpenAPI_tai_parseFromJSON(n3gpp_tai); + if (!n3gpp_tai_local_nonprim) { + ogs_error("OpenAPI_tai_parseFromJSON failed n3gpp_tai"); + goto end; + } } n3_iwf_id = cJSON_GetObjectItemCaseSensitive(n3ga_locationJSON, "n3IwfId"); @@ -280,16 +284,28 @@ tnap_id = cJSON_GetObjectItemCaseSensitive(n3ga_locationJSON, "tnapId"); if (tnap_id) { tnap_id_local_nonprim = OpenAPI_tnap_id_parseFromJSON(tnap_id); + if (!tnap_id_local_nonprim) { + ogs_error("OpenAPI_tnap_id_parseFromJSON failed tnap_id"); + goto end; + } } twap_id = cJSON_GetObjectItemCaseSensitive(n3ga_locationJSON, "twapId"); if (twap_id) { twap_id_local_nonprim = OpenAPI_twap_id_parseFromJSON(twap_id); + if (!twap_id_local_nonprim) { + ogs_error("OpenAPI_twap_id_parseFromJSON failed twap_id"); + goto end; + } } hfc_node_id = cJSON_GetObjectItemCaseSensitive(n3ga_locationJSON, "hfcNodeId"); if (hfc_node_id) { hfc_node_id_local_nonprim = OpenAPI_hfc_node_id_parseFromJSON(hfc_node_id); + if (!hfc_node_id_local_nonprim) { + ogs_error("OpenAPI_hfc_node_id_parseFromJSON failed hfc_node_id"); + goto end; + } } gli = cJSON_GetObjectItemCaseSensitive(n3ga_locationJSON, "gli");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/n4_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/n4_information.c
Changed
@@ -170,10 +170,18 @@ goto end; } n4_message_payload_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n4_message_payload); + if (!n4_message_payload_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n4_message_payload"); + goto end; + } n4_dnai_info = cJSON_GetObjectItemCaseSensitive(n4_informationJSON, "n4DnaiInfo"); if (n4_dnai_info) { n4_dnai_info_local_nonprim = OpenAPI_dnai_information_parseFromJSON(n4_dnai_info); + if (!n4_dnai_info_local_nonprim) { + ogs_error("OpenAPI_dnai_information_parseFromJSON failed n4_dnai_info"); + goto end; + } } psa_upf_id = cJSON_GetObjectItemCaseSensitive(n4_informationJSON, "psaUpfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/namf_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/namf_subscription_data.c
Changed
@@ -114,7 +114,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ncgi.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ncgi.c
Changed
@@ -102,6 +102,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } nr_cell_id = cJSON_GetObjectItemCaseSensitive(ncgiJSON, "nrCellId"); if (!nr_cell_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ncgi_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ncgi_1.c
Changed
@@ -102,6 +102,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } nr_cell_id = cJSON_GetObjectItemCaseSensitive(ncgi_1JSON, "nrCellId"); if (!nr_cell_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ncgi_tai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ncgi_tai.c
Changed
@@ -101,6 +101,10 @@ goto end; } tai_local_nonprim = OpenAPI_tai_parseFromJSON(tai); + if (!tai_local_nonprim) { + ogs_error("OpenAPI_tai_parseFromJSON failed tai"); + goto end; + } cell_list = cJSON_GetObjectItemCaseSensitive(ncgi_taiJSON, "cellList"); if (!cell_list) { @@ -123,7 +127,6 @@ OpenAPI_ncgi_t *cell_listItem = OpenAPI_ncgi_parseFromJSON(cell_list_local); if (!cell_listItem) { ogs_error("No cell_listItem"); - OpenAPI_list_free(cell_listList); goto end; } OpenAPI_list_add(cell_listList, cell_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nef_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nef_cond.c
Changed
@@ -276,7 +276,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem); @@ -286,6 +285,10 @@ pfd_data = cJSON_GetObjectItemCaseSensitive(nef_condJSON, "pfdData"); if (pfd_data) { pfd_data_local_nonprim = OpenAPI_pfd_data_parseFromJSON(pfd_data); + if (!pfd_data_local_nonprim) { + ogs_error("OpenAPI_pfd_data_parseFromJSON failed pfd_data"); + goto end; + } } gpsi_ranges = cJSON_GetObjectItemCaseSensitive(nef_condJSON, "gpsiRanges"); @@ -306,7 +309,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -331,7 +333,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nef_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nef_info.c
Changed
@@ -307,11 +307,19 @@ pfd_data = cJSON_GetObjectItemCaseSensitive(nef_infoJSON, "pfdData"); if (pfd_data) { pfd_data_local_nonprim = OpenAPI_pfd_data_parseFromJSON(pfd_data); + if (!pfd_data_local_nonprim) { + ogs_error("OpenAPI_pfd_data_parseFromJSON failed pfd_data"); + goto end; + } } af_ee_data = cJSON_GetObjectItemCaseSensitive(nef_infoJSON, "afEeData"); if (af_ee_data) { af_ee_data_local_nonprim = OpenAPI_af_event_exposure_data_parseFromJSON(af_ee_data); + if (!af_ee_data_local_nonprim) { + ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON failed af_ee_data"); + goto end; + } } gpsi_ranges = cJSON_GetObjectItemCaseSensitive(nef_infoJSON, "gpsiRanges"); @@ -332,7 +340,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -357,7 +364,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -403,7 +409,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -428,7 +433,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -474,7 +478,6 @@ OpenAPI_un_trust_af_info_t *un_trust_af_info_listItem = OpenAPI_un_trust_af_info_parseFromJSON(un_trust_af_info_list_local); if (!un_trust_af_info_listItem) { ogs_error("No un_trust_af_info_listItem"); - OpenAPI_list_free(un_trust_af_info_listList); goto end; } OpenAPI_list_add(un_trust_af_info_listList, un_trust_af_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/network_area_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/network_area_info.c
Changed
@@ -169,7 +169,6 @@ OpenAPI_ecgi_t *ecgisItem = OpenAPI_ecgi_parseFromJSON(ecgis_local); if (!ecgisItem) { ogs_error("No ecgisItem"); - OpenAPI_list_free(ecgisList); goto end; } OpenAPI_list_add(ecgisList, ecgisItem); @@ -194,7 +193,6 @@ OpenAPI_ncgi_t *ncgisItem = OpenAPI_ncgi_parseFromJSON(ncgis_local); if (!ncgisItem) { ogs_error("No ncgisItem"); - OpenAPI_list_free(ncgisList); goto end; } OpenAPI_list_add(ncgisList, ncgisItem); @@ -219,7 +217,6 @@ OpenAPI_global_ran_node_id_t *g_ran_node_idsItem = OpenAPI_global_ran_node_id_parseFromJSON(g_ran_node_ids_local); if (!g_ran_node_idsItem) { ogs_error("No g_ran_node_idsItem"); - OpenAPI_list_free(g_ran_node_idsList); goto end; } OpenAPI_list_add(g_ran_node_idsList, g_ran_node_idsItem); @@ -244,7 +241,6 @@ OpenAPI_tai_t *taisItem = OpenAPI_tai_parseFromJSON(tais_local); if (!taisItem) { ogs_error("No taisItem"); - OpenAPI_list_free(taisList); goto end; } OpenAPI_list_add(taisList, taisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/network_area_info_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/network_area_info_1.c
Changed
@@ -169,7 +169,6 @@ OpenAPI_ecgi_t *ecgisItem = OpenAPI_ecgi_parseFromJSON(ecgis_local); if (!ecgisItem) { ogs_error("No ecgisItem"); - OpenAPI_list_free(ecgisList); goto end; } OpenAPI_list_add(ecgisList, ecgisItem); @@ -194,7 +193,6 @@ OpenAPI_ncgi_t *ncgisItem = OpenAPI_ncgi_parseFromJSON(ncgis_local); if (!ncgisItem) { ogs_error("No ncgisItem"); - OpenAPI_list_free(ncgisList); goto end; } OpenAPI_list_add(ncgisList, ncgisItem); @@ -219,7 +217,6 @@ OpenAPI_global_ran_node_id_t *g_ran_node_idsItem = OpenAPI_global_ran_node_id_parseFromJSON(g_ran_node_ids_local); if (!g_ran_node_idsItem) { ogs_error("No g_ran_node_idsItem"); - OpenAPI_list_free(g_ran_node_idsList); goto end; } OpenAPI_list_add(g_ran_node_idsList, g_ran_node_idsItem); @@ -244,7 +241,6 @@ OpenAPI_tai_t *taisItem = OpenAPI_tai_parseFromJSON(tais_local); if (!taisItem) { ogs_error("No taisItem"); - OpenAPI_list_free(taisList); goto end; } OpenAPI_list_add(taisList, taisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/network_area_info_2.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/network_area_info_2.c
Changed
@@ -169,7 +169,6 @@ OpenAPI_ecgi_1_t *ecgisItem = OpenAPI_ecgi_1_parseFromJSON(ecgis_local); if (!ecgisItem) { ogs_error("No ecgisItem"); - OpenAPI_list_free(ecgisList); goto end; } OpenAPI_list_add(ecgisList, ecgisItem); @@ -194,7 +193,6 @@ OpenAPI_ncgi_1_t *ncgisItem = OpenAPI_ncgi_1_parseFromJSON(ncgis_local); if (!ncgisItem) { ogs_error("No ncgisItem"); - OpenAPI_list_free(ncgisList); goto end; } OpenAPI_list_add(ncgisList, ncgisItem); @@ -219,7 +217,6 @@ OpenAPI_global_ran_node_id_1_t *g_ran_node_idsItem = OpenAPI_global_ran_node_id_1_parseFromJSON(g_ran_node_ids_local); if (!g_ran_node_idsItem) { ogs_error("No g_ran_node_idsItem"); - OpenAPI_list_free(g_ran_node_idsList); goto end; } OpenAPI_list_add(g_ran_node_idsList, g_ran_node_idsItem); @@ -244,7 +241,6 @@ OpenAPI_tai_1_t *taisItem = OpenAPI_tai_1_parseFromJSON(tais_local); if (!taisItem) { ogs_error("No taisItem"); - OpenAPI_list_free(taisList); goto end; } OpenAPI_list_add(taisList, taisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/network_perf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/network_perf_info.c
Changed
@@ -124,11 +124,19 @@ network_area = cJSON_GetObjectItemCaseSensitive(network_perf_infoJSON, "networkArea"); if (network_area) { network_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(network_area); + if (!network_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed network_area"); + goto end; + } } nw_perf_type = cJSON_GetObjectItemCaseSensitive(network_perf_infoJSON, "nwPerfType"); if (nw_perf_type) { nw_perf_type_local_nonprim = OpenAPI_network_perf_type_parseFromJSON(nw_perf_type); + if (!nw_perf_type_local_nonprim) { + ogs_error("OpenAPI_network_perf_type_parseFromJSON failed nw_perf_type"); + goto end; + } } relative_ratio = cJSON_GetObjectItemCaseSensitive(network_perf_infoJSON, "relativeRatio");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/network_perf_requirement.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/network_perf_requirement.c
Changed
@@ -96,6 +96,10 @@ goto end; } nw_perf_type_local_nonprim = OpenAPI_network_perf_type_parseFromJSON(nw_perf_type); + if (!nw_perf_type_local_nonprim) { + ogs_error("OpenAPI_network_perf_type_parseFromJSON failed nw_perf_type"); + goto end; + } relative_ratio = cJSON_GetObjectItemCaseSensitive(network_perf_requirementJSON, "relativeRatio"); if (relative_ratio) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/network_slice_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/network_slice_cond.c
Changed
@@ -118,7 +118,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nf_instance_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nf_instance_info.c
Changed
@@ -121,6 +121,10 @@ preferred_search = cJSON_GetObjectItemCaseSensitive(nf_instance_infoJSON, "preferredSearch"); if (preferred_search) { preferred_search_local_nonprim = OpenAPI_preferred_search_parseFromJSON(preferred_search); + if (!preferred_search_local_nonprim) { + ogs_error("OpenAPI_preferred_search_parseFromJSON failed preferred_search"); + goto end; + } } nrf_altered_priorities = cJSON_GetObjectItemCaseSensitive(nf_instance_infoJSON, "nrfAlteredPriorities");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nf_load_level_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nf_load_level_information.c
Changed
@@ -236,6 +236,10 @@ nf_status = cJSON_GetObjectItemCaseSensitive(nf_load_level_informationJSON, "nfStatus"); if (nf_status) { nf_status_local_nonprim = OpenAPI_nnwdaf_nf_status_parseFromJSON(nf_status); + if (!nf_status_local_nonprim) { + ogs_error("OpenAPI_nnwdaf_nf_status_parseFromJSON failed nf_status"); + goto end; + } } nf_cpu_usage = cJSON_GetObjectItemCaseSensitive(nf_load_level_informationJSON, "nfCpuUsage"); @@ -289,6 +293,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(nf_load_level_informationJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } confidence = cJSON_GetObjectItemCaseSensitive(nf_load_level_informationJSON, "confidence");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nf_profile.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nf_profile.c
Changed
@@ -2178,7 +2178,6 @@ OpenAPI_collocated_nf_instance_t *collocated_nf_instancesItem = OpenAPI_collocated_nf_instance_parseFromJSON(collocated_nf_instances_local); if (!collocated_nf_instancesItem) { ogs_error("No collocated_nf_instancesItem"); - OpenAPI_list_free(collocated_nf_instancesList); goto end; } OpenAPI_list_add(collocated_nf_instancesList, collocated_nf_instancesItem); @@ -2211,7 +2210,6 @@ OpenAPI_plmn_id_t *plmn_listItem = OpenAPI_plmn_id_parseFromJSON(plmn_list_local); if (!plmn_listItem) { ogs_error("No plmn_listItem"); - OpenAPI_list_free(plmn_listList); goto end; } OpenAPI_list_add(plmn_listList, plmn_listItem); @@ -2236,7 +2234,6 @@ OpenAPI_plmn_id_nid_t *snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(snpn_list_local); if (!snpn_listItem) { ogs_error("No snpn_listItem"); - OpenAPI_list_free(snpn_listList); goto end; } OpenAPI_list_add(snpn_listList, snpn_listItem); @@ -2261,7 +2258,6 @@ OpenAPI_ext_snssai_t *s_nssaisItem = OpenAPI_ext_snssai_parseFromJSON(s_nssais_local); if (!s_nssaisItem) { ogs_error("No s_nssaisItem"); - OpenAPI_list_free(s_nssaisList); goto end; } OpenAPI_list_add(s_nssaisList, s_nssaisItem); @@ -2286,7 +2282,6 @@ OpenAPI_plmn_snssai_t *per_plmn_snssai_listItem = OpenAPI_plmn_snssai_parseFromJSON(per_plmn_snssai_list_local); if (!per_plmn_snssai_listItem) { ogs_error("No per_plmn_snssai_listItem"); - OpenAPI_list_free(per_plmn_snssai_listList); goto end; } OpenAPI_list_add(per_plmn_snssai_listList, per_plmn_snssai_listItem); @@ -2390,7 +2385,6 @@ OpenAPI_plmn_id_t *allowed_plmnsItem = OpenAPI_plmn_id_parseFromJSON(allowed_plmns_local); if (!allowed_plmnsItem) { ogs_error("No allowed_plmnsItem"); - OpenAPI_list_free(allowed_plmnsList); goto end; } OpenAPI_list_add(allowed_plmnsList, allowed_plmnsItem); @@ -2415,7 +2409,6 @@ OpenAPI_plmn_id_nid_t *allowed_snpnsItem = OpenAPI_plmn_id_nid_parseFromJSON(allowed_snpns_local); if (!allowed_snpnsItem) { ogs_error("No allowed_snpnsItem"); - OpenAPI_list_free(allowed_snpnsList); goto end; } OpenAPI_list_add(allowed_snpnsList, allowed_snpnsItem); @@ -2480,7 +2473,6 @@ OpenAPI_ext_snssai_t *allowed_nssaisItem = OpenAPI_ext_snssai_parseFromJSON(allowed_nssais_local); if (!allowed_nssaisItem) { ogs_error("No allowed_nssaisItem"); - OpenAPI_list_free(allowed_nssaisList); goto end; } OpenAPI_list_add(allowed_nssaisList, allowed_nssaisItem); @@ -2530,6 +2522,10 @@ udr_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "udrInfo"); if (udr_info) { udr_info_local_nonprim = OpenAPI_udr_info_parseFromJSON(udr_info); + if (!udr_info_local_nonprim) { + ogs_error("OpenAPI_udr_info_parseFromJSON failed udr_info"); + goto end; + } } udr_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "udrInfoList"); @@ -2561,6 +2557,10 @@ udm_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "udmInfo"); if (udm_info) { udm_info_local_nonprim = OpenAPI_udm_info_parseFromJSON(udm_info); + if (!udm_info_local_nonprim) { + ogs_error("OpenAPI_udm_info_parseFromJSON failed udm_info"); + goto end; + } } udm_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "udmInfoList"); @@ -2592,6 +2592,10 @@ ausf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "ausfInfo"); if (ausf_info) { ausf_info_local_nonprim = OpenAPI_ausf_info_parseFromJSON(ausf_info); + if (!ausf_info_local_nonprim) { + ogs_error("OpenAPI_ausf_info_parseFromJSON failed ausf_info"); + goto end; + } } ausf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "ausfInfoList"); @@ -2623,6 +2627,10 @@ amf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "amfInfo"); if (amf_info) { amf_info_local_nonprim = OpenAPI_amf_info_parseFromJSON(amf_info); + if (!amf_info_local_nonprim) { + ogs_error("OpenAPI_amf_info_parseFromJSON failed amf_info"); + goto end; + } } amf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "amfInfoList"); @@ -2654,6 +2662,10 @@ smf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "smfInfo"); if (smf_info) { smf_info_local_nonprim = OpenAPI_smf_info_parseFromJSON(smf_info); + if (!smf_info_local_nonprim) { + ogs_error("OpenAPI_smf_info_parseFromJSON failed smf_info"); + goto end; + } } smf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "smfInfoList"); @@ -2685,6 +2697,10 @@ upf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "upfInfo"); if (upf_info) { upf_info_local_nonprim = OpenAPI_upf_info_parseFromJSON(upf_info); + if (!upf_info_local_nonprim) { + ogs_error("OpenAPI_upf_info_parseFromJSON failed upf_info"); + goto end; + } } upf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "upfInfoList"); @@ -2716,6 +2732,10 @@ pcf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "pcfInfo"); if (pcf_info) { pcf_info_local_nonprim = OpenAPI_pcf_info_parseFromJSON(pcf_info); + if (!pcf_info_local_nonprim) { + ogs_error("OpenAPI_pcf_info_parseFromJSON failed pcf_info"); + goto end; + } } pcf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "pcfInfoList"); @@ -2747,6 +2767,10 @@ bsf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "bsfInfo"); if (bsf_info) { bsf_info_local_nonprim = OpenAPI_bsf_info_parseFromJSON(bsf_info); + if (!bsf_info_local_nonprim) { + ogs_error("OpenAPI_bsf_info_parseFromJSON failed bsf_info"); + goto end; + } } bsf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "bsfInfoList"); @@ -2778,6 +2802,10 @@ chf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "chfInfo"); if (chf_info) { chf_info_local_nonprim = OpenAPI_chf_info_parseFromJSON(chf_info); + if (!chf_info_local_nonprim) { + ogs_error("OpenAPI_chf_info_parseFromJSON failed chf_info"); + goto end; + } } chf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "chfInfoList"); @@ -2809,16 +2837,28 @@ nef_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nefInfo"); if (nef_info) { nef_info_local_nonprim = OpenAPI_nef_info_parseFromJSON(nef_info); + if (!nef_info_local_nonprim) { + ogs_error("OpenAPI_nef_info_parseFromJSON failed nef_info"); + goto end; + } } nrf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nrfInfo"); if (nrf_info) { nrf_info_local_nonprim = OpenAPI_nrf_info_parseFromJSON(nrf_info); + if (!nrf_info_local_nonprim) { + ogs_error("OpenAPI_nrf_info_parseFromJSON failed nrf_info"); + goto end; + } } udsf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "udsfInfo"); if (udsf_info) { udsf_info_local_nonprim = OpenAPI_udsf_info_parseFromJSON(udsf_info); + if (!udsf_info_local_nonprim) { + ogs_error("OpenAPI_udsf_info_parseFromJSON failed udsf_info"); + goto end; + } } udsf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "udsfInfoList"); @@ -2850,6 +2890,10 @@ nwdaf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nwdafInfo"); if (nwdaf_info) { nwdaf_info_local_nonprim = OpenAPI_nwdaf_info_parseFromJSON(nwdaf_info); + if (!nwdaf_info_local_nonprim) { + ogs_error("OpenAPI_nwdaf_info_parseFromJSON failed nwdaf_info"); + goto end; + } } nwdaf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nwdafInfoList"); @@ -2973,7 +3017,6 @@ OpenAPI_nf_service_t *nf_servicesItem = OpenAPI_nf_service_parseFromJSON(nf_services_local); if (!nf_servicesItem) { ogs_error("No nf_servicesItem"); - OpenAPI_list_free(nf_servicesList); goto end; } OpenAPI_list_add(nf_servicesList, nf_servicesItem); @@ -3040,7 +3083,6 @@ OpenAPI_default_notification_subscription_t *default_notification_subscriptionsItem = OpenAPI_default_notification_subscription_parseFromJSON(default_notification_subscriptions_local); if (!default_notification_subscriptionsItem) { ogs_error("No default_notification_subscriptionsItem"); - OpenAPI_list_free(default_notification_subscriptionsList); goto end; } OpenAPI_list_add(default_notification_subscriptionsList, default_notification_subscriptionsItem); @@ -3050,11 +3092,19 @@ lmf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "lmfInfo"); if (lmf_info) { lmf_info_local_nonprim = OpenAPI_lmf_info_parseFromJSON(lmf_info); + if (!lmf_info_local_nonprim) { + ogs_error("OpenAPI_lmf_info_parseFromJSON failed lmf_info"); + goto end; + } } gmlc_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "gmlcInfo"); if (gmlc_info) { gmlc_info_local_nonprim = OpenAPI_gmlc_info_parseFromJSON(gmlc_info); + if (!gmlc_info_local_nonprim) { + ogs_error("OpenAPI_gmlc_info_parseFromJSON failed gmlc_info"); + goto end; + } } nf_set_id_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nfSetIdList"); @@ -3177,11 +3227,19 @@ scp_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "scpInfo"); if (scp_info) { scp_info_local_nonprim = OpenAPI_scp_info_parseFromJSON(scp_info); + if (!scp_info_local_nonprim) { + ogs_error("OpenAPI_scp_info_parseFromJSON failed scp_info"); + goto end; + } } sepp_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "seppInfo"); if (sepp_info) { sepp_info_local_nonprim = OpenAPI_sepp_info_parseFromJSON(sepp_info); + if (!sepp_info_local_nonprim) { + ogs_error("OpenAPI_sepp_info_parseFromJSON failed sepp_info"); + goto end; + } } vendor_id = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "vendorId"); @@ -3249,11 +3307,19 @@ _5g_ddnmf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "5gDdnmfInfo"); if (_5g_ddnmf_info) { _5g_ddnmf_info_local_nonprim = OpenAPI_model_5_g_ddnmf_info_parseFromJSON(_5g_ddnmf_info); + if (!_5g_ddnmf_info_local_nonprim) { + ogs_error("OpenAPI_model_5_g_ddnmf_info_parseFromJSON failed _5g_ddnmf_info"); + goto end; + } } mfaf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "mfafInfo"); if (mfaf_info) { mfaf_info_local_nonprim = OpenAPI_mfaf_info_parseFromJSON(mfaf_info); + if (!mfaf_info_local_nonprim) { + ogs_error("OpenAPI_mfaf_info_parseFromJSON failed mfaf_info"); + goto end; + } } easdf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "easdfInfoList"); @@ -3285,6 +3351,10 @@ dccf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "dccfInfo"); if (dccf_info) { dccf_info_local_nonprim = OpenAPI_dccf_info_parseFromJSON(dccf_info); + if (!dccf_info_local_nonprim) { + ogs_error("OpenAPI_dccf_info_parseFromJSON failed dccf_info"); + goto end; + } } nsacf_info_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nsacfInfoList"); @@ -3394,11 +3464,19 @@ trust_af_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "trustAfInfo"); if (trust_af_info) { trust_af_info_local_nonprim = OpenAPI_trust_af_info_parseFromJSON(trust_af_info); + if (!trust_af_info_local_nonprim) { + ogs_error("OpenAPI_trust_af_info_parseFromJSON failed trust_af_info"); + goto end; + } } nssaaf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "nssaafInfo"); if (nssaaf_info) { nssaaf_info_local_nonprim = OpenAPI_nssaaf_info_parseFromJSON(nssaaf_info); + if (!nssaaf_info_local_nonprim) { + ogs_error("OpenAPI_nssaaf_info_parseFromJSON failed nssaaf_info"); + goto end; + } } hni_list = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "hniList"); @@ -3425,11 +3503,19 @@ iwmsc_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "iwmscInfo"); if (iwmsc_info) { iwmsc_info_local_nonprim = OpenAPI_iwmsc_info_parseFromJSON(iwmsc_info); + if (!iwmsc_info_local_nonprim) { + ogs_error("OpenAPI_iwmsc_info_parseFromJSON failed iwmsc_info"); + goto end; + } } mnpf_info = cJSON_GetObjectItemCaseSensitive(nf_profileJSON, "mnpfInfo"); if (mnpf_info) { mnpf_info_local_nonprim = OpenAPI_mnpf_info_parseFromJSON(mnpf_info); + if (!mnpf_info_local_nonprim) { + ogs_error("OpenAPI_mnpf_info_parseFromJSON failed mnpf_info"); + goto end; + } } nf_profile_local_var = OpenAPI_nf_profile_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nf_service.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nf_service.c
Changed
@@ -691,7 +691,6 @@ OpenAPI_nf_service_version_t *versionsItem = OpenAPI_nf_service_version_parseFromJSON(versions_local); if (!versionsItem) { ogs_error("No versionsItem"); - OpenAPI_list_free(versionsList); goto end; } OpenAPI_list_add(versionsList, versionsItem); @@ -753,7 +752,6 @@ OpenAPI_ip_end_point_t *ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(ip_end_points_local); if (!ip_end_pointsItem) { ogs_error("No ip_end_pointsItem"); - OpenAPI_list_free(ip_end_pointsList); goto end; } OpenAPI_list_add(ip_end_pointsList, ip_end_pointsItem); @@ -786,7 +784,6 @@ OpenAPI_default_notification_subscription_t *default_notification_subscriptionsItem = OpenAPI_default_notification_subscription_parseFromJSON(default_notification_subscriptions_local); if (!default_notification_subscriptionsItem) { ogs_error("No default_notification_subscriptionsItem"); - OpenAPI_list_free(default_notification_subscriptionsList); goto end; } OpenAPI_list_add(default_notification_subscriptionsList, default_notification_subscriptionsItem); @@ -811,7 +808,6 @@ OpenAPI_plmn_id_t *allowed_plmnsItem = OpenAPI_plmn_id_parseFromJSON(allowed_plmns_local); if (!allowed_plmnsItem) { ogs_error("No allowed_plmnsItem"); - OpenAPI_list_free(allowed_plmnsList); goto end; } OpenAPI_list_add(allowed_plmnsList, allowed_plmnsItem); @@ -836,7 +832,6 @@ OpenAPI_plmn_id_nid_t *allowed_snpnsItem = OpenAPI_plmn_id_nid_parseFromJSON(allowed_snpns_local); if (!allowed_snpnsItem) { ogs_error("No allowed_snpnsItem"); - OpenAPI_list_free(allowed_snpnsList); goto end; } OpenAPI_list_add(allowed_snpnsList, allowed_snpnsItem); @@ -901,7 +896,6 @@ OpenAPI_ext_snssai_t *allowed_nssaisItem = OpenAPI_ext_snssai_parseFromJSON(allowed_nssais_local); if (!allowed_nssaisItem) { ogs_error("No allowed_nssaisItem"); - OpenAPI_list_free(allowed_nssaisList); goto end; } OpenAPI_list_add(allowed_nssaisList, allowed_nssaisItem); @@ -1033,7 +1027,6 @@ OpenAPI_ext_snssai_t *s_nssaisItem = OpenAPI_ext_snssai_parseFromJSON(s_nssais_local); if (!s_nssaisItem) { ogs_error("No s_nssaisItem"); - OpenAPI_list_free(s_nssaisList); goto end; } OpenAPI_list_add(s_nssaisList, s_nssaisItem); @@ -1058,7 +1051,6 @@ OpenAPI_plmn_snssai_t *per_plmn_snssai_listItem = OpenAPI_plmn_snssai_parseFromJSON(per_plmn_snssai_list_local); if (!per_plmn_snssai_listItem) { ogs_error("No per_plmn_snssai_listItem"); - OpenAPI_list_free(per_plmn_snssai_listList); goto end; } OpenAPI_list_add(per_plmn_snssai_listList, per_plmn_snssai_listItem); @@ -1112,6 +1104,10 @@ per_plmn_oauth2_req_list = cJSON_GetObjectItemCaseSensitive(nf_serviceJSON, "perPlmnOauth2ReqList"); if (per_plmn_oauth2_req_list) { per_plmn_oauth2_req_list_local_nonprim = OpenAPI_plmn_oauth2_parseFromJSON(per_plmn_oauth2_req_list); + if (!per_plmn_oauth2_req_list_local_nonprim) { + ogs_error("OpenAPI_plmn_oauth2_parseFromJSON failed per_plmn_oauth2_req_list"); + goto end; + } } nf_service_local_var = OpenAPI_nf_service_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ng_ran_target_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ng_ran_target_id.c
Changed
@@ -95,6 +95,10 @@ goto end; } ran_node_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(ran_node_id); + if (!ran_node_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed ran_node_id"); + goto end; + } tai = cJSON_GetObjectItemCaseSensitive(ng_ran_target_idJSON, "tai"); if (!tai) { @@ -102,6 +106,10 @@ goto end; } tai_local_nonprim = OpenAPI_tai_parseFromJSON(tai); + if (!tai_local_nonprim) { + ogs_error("OpenAPI_tai_parseFromJSON failed tai"); + goto end; + } ng_ran_target_id_local_var = OpenAPI_ng_ran_target_id_create ( ran_node_id_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nidd_authorization_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nidd_authorization_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_authorization_info_t *nidd_authorization_listItem = OpenAPI_authorization_info_parseFromJSON(nidd_authorization_list_local); if (!nidd_authorization_listItem) { ogs_error("No nidd_authorization_listItem"); - OpenAPI_list_free(nidd_authorization_listList); goto end; } OpenAPI_list_add(nidd_authorization_listList, nidd_authorization_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nnwdaf_events_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nnwdaf_events_subscription.c
Changed
@@ -252,7 +252,6 @@ OpenAPI_event_subscription_t *event_subscriptionsItem = OpenAPI_event_subscription_parseFromJSON(event_subscriptions_local); if (!event_subscriptionsItem) { ogs_error("No event_subscriptionsItem"); - OpenAPI_list_free(event_subscriptionsList); goto end; } OpenAPI_list_add(event_subscriptionsList, event_subscriptionsItem); @@ -261,6 +260,10 @@ evt_req = cJSON_GetObjectItemCaseSensitive(nnwdaf_events_subscriptionJSON, "evtReq"); if (evt_req) { evt_req_local_nonprim = OpenAPI_reporting_information_parseFromJSON(evt_req); + if (!evt_req_local_nonprim) { + ogs_error("OpenAPI_reporting_information_parseFromJSON failed evt_req"); + goto end; + } } notification_uri = cJSON_GetObjectItemCaseSensitive(nnwdaf_events_subscriptionJSON, "notificationURI"); @@ -305,7 +308,6 @@ OpenAPI_event_notification_t *event_notificationsItem = OpenAPI_event_notification_parseFromJSON(event_notifications_local); if (!event_notificationsItem) { ogs_error("No event_notificationsItem"); - OpenAPI_list_free(event_notificationsList); goto end; } OpenAPI_list_add(event_notificationsList, event_notificationsItem); @@ -330,7 +332,6 @@ OpenAPI_failure_event_info_t *fail_event_reportsItem = OpenAPI_failure_event_info_parseFromJSON(fail_event_reports_local); if (!fail_event_reportsItem) { ogs_error("No fail_event_reportsItem"); - OpenAPI_list_free(fail_event_reportsList); goto end; } OpenAPI_list_add(fail_event_reportsList, fail_event_reportsItem); @@ -340,11 +341,19 @@ prev_sub = cJSON_GetObjectItemCaseSensitive(nnwdaf_events_subscriptionJSON, "prevSub"); if (prev_sub) { prev_sub_local_nonprim = OpenAPI_prev_sub_info_parseFromJSON(prev_sub); + if (!prev_sub_local_nonprim) { + ogs_error("OpenAPI_prev_sub_info_parseFromJSON failed prev_sub"); + goto end; + } } cons_nf_info = cJSON_GetObjectItemCaseSensitive(nnwdaf_events_subscriptionJSON, "consNfInfo"); if (cons_nf_info) { cons_nf_info_local_nonprim = OpenAPI_consumer_nf_information_parseFromJSON(cons_nf_info); + if (!cons_nf_info_local_nonprim) { + ogs_error("OpenAPI_consumer_nf_information_parseFromJSON failed cons_nf_info"); + goto end; + } } nnwdaf_events_subscription_local_var = OpenAPI_nnwdaf_events_subscription_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/no_profile_match_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/no_profile_match_info.c
Changed
@@ -99,6 +99,10 @@ goto end; } reason_local_nonprim = OpenAPI_no_profile_match_reason_parseFromJSON(reason); + if (!reason_local_nonprim) { + ogs_error("OpenAPI_no_profile_match_reason_parseFromJSON failed reason"); + goto end; + } query_param_combination_list = cJSON_GetObjectItemCaseSensitive(no_profile_match_infoJSON, "queryParamCombinationList"); if (query_param_combination_list) { @@ -118,7 +122,6 @@ OpenAPI_query_param_combination_t *query_param_combination_listItem = OpenAPI_query_param_combination_parseFromJSON(query_param_combination_list_local); if (!query_param_combination_listItem) { ogs_error("No query_param_combination_listItem"); - OpenAPI_list_free(query_param_combination_listList); goto end; } OpenAPI_list_add(query_param_combination_listList, query_param_combination_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/non_ue_n2_info_notify_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/non_ue_n2_info_notify_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(non_ue_n2_info_notify_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_n2_information_notification_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_n2_information_notification_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(non_ue_n2_info_notify_requestJSON, "binaryDataN2Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c
Changed
@@ -167,7 +167,6 @@ OpenAPI_global_ran_node_id_t *global_ran_node_listItem = OpenAPI_global_ran_node_id_parseFromJSON(global_ran_node_list_local); if (!global_ran_node_listItem) { ogs_error("No global_ran_node_listItem"); - OpenAPI_list_free(global_ran_node_listList); goto end; } OpenAPI_list_add(global_ran_node_listList, global_ran_node_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/non_ue_n2_message_transfer_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/non_ue_n2_message_transfer_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(non_ue_n2_message_transfer_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_n2_information_transfer_req_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_n2_information_transfer_req_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(non_ue_n2_message_transfer_requestJSON, "binaryDataN2Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/notification_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/notification_data.c
Changed
@@ -176,6 +176,10 @@ nf_profile = cJSON_GetObjectItemCaseSensitive(notification_dataJSON, "nfProfile"); if (nf_profile) { nf_profile_local_nonprim = OpenAPI_nf_profile_parseFromJSON(nf_profile); + if (!nf_profile_local_nonprim) { + ogs_error("OpenAPI_nf_profile_parseFromJSON failed nf_profile"); + goto end; + } } profile_changes = cJSON_GetObjectItemCaseSensitive(notification_dataJSON, "profileChanges"); @@ -196,7 +200,6 @@ OpenAPI_change_item_t *profile_changesItem = OpenAPI_change_item_parseFromJSON(profile_changes_local); if (!profile_changesItem) { ogs_error("No profile_changesItem"); - OpenAPI_list_free(profile_changesList); goto end; } OpenAPI_list_add(profile_changesList, profile_changesItem); @@ -215,6 +218,10 @@ subscription_context = cJSON_GetObjectItemCaseSensitive(notification_dataJSON, "subscriptionContext"); if (subscription_context) { subscription_context_local_nonprim = OpenAPI_subscription_context_parseFromJSON(subscription_context); + if (!subscription_context_local_nonprim) { + ogs_error("OpenAPI_subscription_context_parseFromJSON failed subscription_context"); + goto end; + } } notification_data_local_var = OpenAPI_notification_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/notification_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/notification_item.c
Changed
@@ -119,7 +119,6 @@ OpenAPI_updated_item_t *notif_itemsItem = OpenAPI_updated_item_parseFromJSON(notif_items_local); if (!notif_itemsItem) { ogs_error("No notif_itemsItem"); - OpenAPI_list_free(notif_itemsList); goto end; } OpenAPI_list_add(notif_itemsList, notif_itemsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/notify_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/notify_item.c
Changed
@@ -119,7 +119,6 @@ OpenAPI_change_item_t *changesItem = OpenAPI_change_item_parseFromJSON(changes_local); if (!changesItem) { ogs_error("No changesItem"); - OpenAPI_list_free(changesList); goto end; } OpenAPI_list_add(changesList, changesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nr_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nr_location.c
Changed
@@ -182,6 +182,10 @@ goto end; } tai_local_nonprim = OpenAPI_tai_parseFromJSON(tai); + if (!tai_local_nonprim) { + ogs_error("OpenAPI_tai_parseFromJSON failed tai"); + goto end; + } ncgi = cJSON_GetObjectItemCaseSensitive(nr_locationJSON, "ncgi"); if (!ncgi) { @@ -189,6 +193,10 @@ goto end; } ncgi_local_nonprim = OpenAPI_ncgi_parseFromJSON(ncgi); + if (!ncgi_local_nonprim) { + ogs_error("OpenAPI_ncgi_parseFromJSON failed ncgi"); + goto end; + } ignore_ncgi = cJSON_GetObjectItemCaseSensitive(nr_locationJSON, "ignoreNcgi"); if (ignore_ncgi) { @@ -233,6 +241,10 @@ global_gnb_id = cJSON_GetObjectItemCaseSensitive(nr_locationJSON, "globalGnbId"); if (global_gnb_id) { global_gnb_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(global_gnb_id); + if (!global_gnb_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed global_gnb_id"); + goto end; + } } nr_location_local_var = OpenAPI_nr_location_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_amf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_amf_info_value.c
Changed
@@ -286,7 +286,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem); @@ -310,7 +309,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -335,7 +333,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -360,7 +357,6 @@ OpenAPI_guami_t *backup_info_amf_failureItem = OpenAPI_guami_parseFromJSON(backup_info_amf_failure_local); if (!backup_info_amf_failureItem) { ogs_error("No backup_info_amf_failureItem"); - OpenAPI_list_free(backup_info_amf_failureList); goto end; } OpenAPI_list_add(backup_info_amf_failureList, backup_info_amf_failureItem); @@ -385,7 +381,6 @@ OpenAPI_guami_t *backup_info_amf_removalItem = OpenAPI_guami_parseFromJSON(backup_info_amf_removal_local); if (!backup_info_amf_removalItem) { ogs_error("No backup_info_amf_removalItem"); - OpenAPI_list_free(backup_info_amf_removalList); goto end; } OpenAPI_list_add(backup_info_amf_removalList, backup_info_amf_removalItem); @@ -395,6 +390,10 @@ n2_interface_amf_info = cJSON_GetObjectItemCaseSensitive(nrf_info_served_amf_info_valueJSON, "n2InterfaceAmfInfo"); if (n2_interface_amf_info) { n2_interface_amf_info_local_nonprim = OpenAPI_n2_interface_amf_info_parseFromJSON(n2_interface_amf_info); + if (!n2_interface_amf_info_local_nonprim) { + ogs_error("OpenAPI_n2_interface_amf_info_parseFromJSON failed n2_interface_amf_info"); + goto end; + } } amf_onboarding_capability = cJSON_GetObjectItemCaseSensitive(nrf_info_served_amf_info_valueJSON, "amfOnboardingCapability");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_ausf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_ausf_info_value.c
Changed
@@ -162,7 +162,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -208,7 +207,6 @@ OpenAPI_suci_info_t *suci_infosItem = OpenAPI_suci_info_parseFromJSON(suci_infos_local); if (!suci_infosItem) { ogs_error("No suci_infosItem"); - OpenAPI_list_free(suci_infosList); goto end; } OpenAPI_list_add(suci_infosList, suci_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_bsf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_bsf_info_value.c
Changed
@@ -303,7 +303,6 @@ OpenAPI_ipv4_address_range_t *ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_address_ranges_local); if (!ipv4_address_rangesItem) { ogs_error("No ipv4_address_rangesItem"); - OpenAPI_list_free(ipv4_address_rangesList); goto end; } OpenAPI_list_add(ipv4_address_rangesList, ipv4_address_rangesItem); @@ -328,7 +327,6 @@ OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local); if (!ipv6_prefix_rangesItem) { ogs_error("No ipv6_prefix_rangesItem"); - OpenAPI_list_free(ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem); @@ -377,7 +375,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -402,7 +399,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_chf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_chf_info_value.c
Changed
@@ -184,7 +184,6 @@ OpenAPI_supi_range_t *supi_range_listItem = OpenAPI_supi_range_parseFromJSON(supi_range_list_local); if (!supi_range_listItem) { ogs_error("No supi_range_listItem"); - OpenAPI_list_free(supi_range_listList); goto end; } OpenAPI_list_add(supi_range_listList, supi_range_listItem); @@ -209,7 +208,6 @@ OpenAPI_identity_range_t *gpsi_range_listItem = OpenAPI_identity_range_parseFromJSON(gpsi_range_list_local); if (!gpsi_range_listItem) { ogs_error("No gpsi_range_listItem"); - OpenAPI_list_free(gpsi_range_listList); goto end; } OpenAPI_list_add(gpsi_range_listList, gpsi_range_listItem); @@ -234,7 +232,6 @@ OpenAPI_plmn_range_t *plmn_range_listItem = OpenAPI_plmn_range_parseFromJSON(plmn_range_list_local); if (!plmn_range_listItem) { ogs_error("No plmn_range_listItem"); - OpenAPI_list_free(plmn_range_listList); goto end; } OpenAPI_list_add(plmn_range_listList, plmn_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_gmlc_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_gmlc_info_value.c
Changed
@@ -113,7 +113,6 @@ OpenAPI_external_client_type_t *serving_client_typesItem = OpenAPI_external_client_type_parseFromJSON(serving_client_types_local); if (!serving_client_typesItem) { ogs_error("No serving_client_typesItem"); - OpenAPI_list_free(serving_client_typesList); goto end; } OpenAPI_list_add(serving_client_typesList, serving_client_typesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_hss_info_list_value_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_hss_info_list_value_value.c
Changed
@@ -239,7 +239,6 @@ OpenAPI_imsi_range_t *imsi_rangesItem = OpenAPI_imsi_range_parseFromJSON(imsi_ranges_local); if (!imsi_rangesItem) { ogs_error("No imsi_rangesItem"); - OpenAPI_list_free(imsi_rangesList); goto end; } OpenAPI_list_add(imsi_rangesList, imsi_rangesItem); @@ -264,7 +263,6 @@ OpenAPI_identity_range_t *ims_private_identity_rangesItem = OpenAPI_identity_range_parseFromJSON(ims_private_identity_ranges_local); if (!ims_private_identity_rangesItem) { ogs_error("No ims_private_identity_rangesItem"); - OpenAPI_list_free(ims_private_identity_rangesList); goto end; } OpenAPI_list_add(ims_private_identity_rangesList, ims_private_identity_rangesItem); @@ -289,7 +287,6 @@ OpenAPI_identity_range_t *ims_public_identity_rangesItem = OpenAPI_identity_range_parseFromJSON(ims_public_identity_ranges_local); if (!ims_public_identity_rangesItem) { ogs_error("No ims_public_identity_rangesItem"); - OpenAPI_list_free(ims_public_identity_rangesList); goto end; } OpenAPI_list_add(ims_public_identity_rangesList, ims_public_identity_rangesItem); @@ -314,7 +311,6 @@ OpenAPI_identity_range_t *msisdn_rangesItem = OpenAPI_identity_range_parseFromJSON(msisdn_ranges_local); if (!msisdn_rangesItem) { ogs_error("No msisdn_rangesItem"); - OpenAPI_list_free(msisdn_rangesList); goto end; } OpenAPI_list_add(msisdn_rangesList, msisdn_rangesItem); @@ -339,7 +335,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -349,6 +344,10 @@ hss_diameter_address = cJSON_GetObjectItemCaseSensitive(nrf_info_served_hss_info_list_value_valueJSON, "hssDiameterAddress"); if (hss_diameter_address) { hss_diameter_address_local_nonprim = OpenAPI_network_node_diameter_address_parseFromJSON(hss_diameter_address); + if (!hss_diameter_address_local_nonprim) { + ogs_error("OpenAPI_network_node_diameter_address_parseFromJSON failed hss_diameter_address"); + goto end; + } } nrf_info_served_hss_info_list_value_value_local_var = OpenAPI_nrf_info_served_hss_info_list_value_value_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_lmf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_lmf_info_value.c
Changed
@@ -249,7 +249,6 @@ OpenAPI_external_client_type_t *serving_client_typesItem = OpenAPI_external_client_type_parseFromJSON(serving_client_types_local); if (!serving_client_typesItem) { ogs_error("No serving_client_typesItem"); - OpenAPI_list_free(serving_client_typesList); goto end; } OpenAPI_list_add(serving_client_typesList, serving_client_typesItem); @@ -339,7 +338,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -364,7 +362,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -389,7 +386,6 @@ OpenAPI_supported_gad_shapes_t *supported_gad_shapesItem = OpenAPI_supported_gad_shapes_parseFromJSON(supported_gad_shapes_local); if (!supported_gad_shapesItem) { ogs_error("No supported_gad_shapesItem"); - OpenAPI_list_free(supported_gad_shapesList); goto end; } OpenAPI_list_add(supported_gad_shapesList, supported_gad_shapesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_mb_smf_info_list_value_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_mb_smf_info_list_value_value.c
Changed
@@ -275,7 +275,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -300,7 +299,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_nef_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_nef_info_value.c
Changed
@@ -307,11 +307,19 @@ pfd_data = cJSON_GetObjectItemCaseSensitive(nrf_info_served_nef_info_valueJSON, "pfdData"); if (pfd_data) { pfd_data_local_nonprim = OpenAPI_pfd_data_parseFromJSON(pfd_data); + if (!pfd_data_local_nonprim) { + ogs_error("OpenAPI_pfd_data_parseFromJSON failed pfd_data"); + goto end; + } } af_ee_data = cJSON_GetObjectItemCaseSensitive(nrf_info_served_nef_info_valueJSON, "afEeData"); if (af_ee_data) { af_ee_data_local_nonprim = OpenAPI_af_event_exposure_data_parseFromJSON(af_ee_data); + if (!af_ee_data_local_nonprim) { + ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON failed af_ee_data"); + goto end; + } } gpsi_ranges = cJSON_GetObjectItemCaseSensitive(nrf_info_served_nef_info_valueJSON, "gpsiRanges"); @@ -332,7 +340,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -357,7 +364,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -403,7 +409,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -428,7 +433,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -474,7 +478,6 @@ OpenAPI_un_trust_af_info_t *un_trust_af_info_listItem = OpenAPI_un_trust_af_info_parseFromJSON(un_trust_af_info_list_local); if (!un_trust_af_info_listItem) { ogs_error("No un_trust_af_info_listItem"); - OpenAPI_list_free(un_trust_af_info_listList); goto end; } OpenAPI_list_add(un_trust_af_info_listList, un_trust_af_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_nwdaf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_nwdaf_info_value.c
Changed
@@ -276,7 +276,6 @@ OpenAPI_event_id_t *event_idsItem = OpenAPI_event_id_parseFromJSON(event_ids_local); if (!event_idsItem) { ogs_error("No event_idsItem"); - OpenAPI_list_free(event_idsList); goto end; } OpenAPI_list_add(event_idsList, event_idsItem); @@ -301,7 +300,6 @@ OpenAPI_nwdaf_event_t *nwdaf_eventsItem = OpenAPI_nwdaf_event_parseFromJSON(nwdaf_events_local); if (!nwdaf_eventsItem) { ogs_error("No nwdaf_eventsItem"); - OpenAPI_list_free(nwdaf_eventsList); goto end; } OpenAPI_list_add(nwdaf_eventsList, nwdaf_eventsItem); @@ -326,7 +324,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -351,7 +348,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -361,6 +357,10 @@ nwdaf_capability = cJSON_GetObjectItemCaseSensitive(nrf_info_served_nwdaf_info_valueJSON, "nwdafCapability"); if (nwdaf_capability) { nwdaf_capability_local_nonprim = OpenAPI_nwdaf_capability_parseFromJSON(nwdaf_capability); + if (!nwdaf_capability_local_nonprim) { + ogs_error("OpenAPI_nwdaf_capability_parseFromJSON failed nwdaf_capability"); + goto end; + } } analytics_delay = cJSON_GetObjectItemCaseSensitive(nrf_info_served_nwdaf_info_valueJSON, "analyticsDelay"); @@ -429,7 +429,6 @@ OpenAPI_ml_analytics_info_t *ml_analytics_listItem = OpenAPI_ml_analytics_info_parseFromJSON(ml_analytics_list_local); if (!ml_analytics_listItem) { ogs_error("No ml_analytics_listItem"); - OpenAPI_list_free(ml_analytics_listList); goto end; } OpenAPI_list_add(ml_analytics_listList, ml_analytics_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_pcf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_pcf_info_value.c
Changed
@@ -277,7 +277,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -302,7 +301,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -344,11 +342,19 @@ prose_capability = cJSON_GetObjectItemCaseSensitive(nrf_info_served_pcf_info_valueJSON, "proseCapability"); if (prose_capability) { prose_capability_local_nonprim = OpenAPI_pro_se_capability_parseFromJSON(prose_capability); + if (!prose_capability_local_nonprim) { + ogs_error("OpenAPI_pro_se_capability_parseFromJSON failed prose_capability"); + goto end; + } } v2x_capability = cJSON_GetObjectItemCaseSensitive(nrf_info_served_pcf_info_valueJSON, "v2xCapability"); if (v2x_capability) { v2x_capability_local_nonprim = OpenAPI_v2x_capability_parseFromJSON(v2x_capability); + if (!v2x_capability_local_nonprim) { + ogs_error("OpenAPI_v2x_capability_parseFromJSON failed v2x_capability"); + goto end; + } } nrf_info_served_pcf_info_value_local_var = OpenAPI_nrf_info_served_pcf_info_value_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_pcscf_info_list_value_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_pcscf_info_list_value_value.c
Changed
@@ -430,7 +430,6 @@ OpenAPI_ipv4_address_range_t *served_ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(served_ipv4_address_ranges_local); if (!served_ipv4_address_rangesItem) { ogs_error("No served_ipv4_address_rangesItem"); - OpenAPI_list_free(served_ipv4_address_rangesList); goto end; } OpenAPI_list_add(served_ipv4_address_rangesList, served_ipv4_address_rangesItem); @@ -455,7 +454,6 @@ OpenAPI_ipv6_prefix_range_t *served_ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(served_ipv6_prefix_ranges_local); if (!served_ipv6_prefix_rangesItem) { ogs_error("No served_ipv6_prefix_rangesItem"); - OpenAPI_list_free(served_ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(served_ipv6_prefix_rangesList, served_ipv6_prefix_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_scp_info_list_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_scp_info_list_value.c
Changed
@@ -511,7 +511,6 @@ OpenAPI_ipv4_address_range_t *ipv4_addr_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_addr_ranges_local); if (!ipv4_addr_rangesItem) { ogs_error("No ipv4_addr_rangesItem"); - OpenAPI_list_free(ipv4_addr_rangesList); goto end; } OpenAPI_list_add(ipv4_addr_rangesList, ipv4_addr_rangesItem); @@ -536,7 +535,6 @@ OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local); if (!ipv6_prefix_rangesItem) { ogs_error("No ipv6_prefix_rangesItem"); - OpenAPI_list_free(ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem); @@ -582,7 +580,6 @@ OpenAPI_plmn_id_t *remote_plmn_listItem = OpenAPI_plmn_id_parseFromJSON(remote_plmn_list_local); if (!remote_plmn_listItem) { ogs_error("No remote_plmn_listItem"); - OpenAPI_list_free(remote_plmn_listList); goto end; } OpenAPI_list_add(remote_plmn_listList, remote_plmn_listItem); @@ -607,7 +604,6 @@ OpenAPI_plmn_id_nid_t *remote_snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(remote_snpn_list_local); if (!remote_snpn_listItem) { ogs_error("No remote_snpn_listItem"); - OpenAPI_list_free(remote_snpn_listList); goto end; } OpenAPI_list_add(remote_snpn_listList, remote_snpn_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_sepp_info_list_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_sepp_info_list_value.c
Changed
@@ -199,7 +199,6 @@ OpenAPI_plmn_id_t *remote_plmn_listItem = OpenAPI_plmn_id_parseFromJSON(remote_plmn_list_local); if (!remote_plmn_listItem) { ogs_error("No remote_plmn_listItem"); - OpenAPI_list_free(remote_plmn_listList); goto end; } OpenAPI_list_add(remote_plmn_listList, remote_plmn_listItem); @@ -224,7 +223,6 @@ OpenAPI_plmn_id_nid_t *remote_snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(remote_snpn_list_local); if (!remote_snpn_listItem) { ogs_error("No remote_snpn_listItem"); - OpenAPI_list_free(remote_snpn_listList); goto end; } OpenAPI_list_add(remote_snpn_listList, remote_snpn_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_smf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_smf_info_value.c
Changed
@@ -295,7 +295,6 @@ OpenAPI_snssai_smf_info_item_t *s_nssai_smf_info_listItem = OpenAPI_snssai_smf_info_item_parseFromJSON(s_nssai_smf_info_list_local); if (!s_nssai_smf_info_listItem) { ogs_error("No s_nssai_smf_info_listItem"); - OpenAPI_list_free(s_nssai_smf_info_listList); goto end; } OpenAPI_list_add(s_nssai_smf_info_listList, s_nssai_smf_info_listItem); @@ -319,7 +318,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -344,7 +342,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -377,7 +374,6 @@ OpenAPI_ip_addr_t *pgw_ip_addr_listItem = OpenAPI_ip_addr_parseFromJSON(pgw_ip_addr_list_local); if (!pgw_ip_addr_listItem) { ogs_error("No pgw_ip_addr_listItem"); - OpenAPI_list_free(pgw_ip_addr_listList); goto end; } OpenAPI_list_add(pgw_ip_addr_listList, pgw_ip_addr_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_udm_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_udm_info_value.c
Changed
@@ -243,7 +243,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -268,7 +267,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -293,7 +291,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -339,7 +336,6 @@ OpenAPI_internal_group_id_range_t *internal_group_identifiers_rangesItem = OpenAPI_internal_group_id_range_parseFromJSON(internal_group_identifiers_ranges_local); if (!internal_group_identifiers_rangesItem) { ogs_error("No internal_group_identifiers_rangesItem"); - OpenAPI_list_free(internal_group_identifiers_rangesList); goto end; } OpenAPI_list_add(internal_group_identifiers_rangesList, internal_group_identifiers_rangesItem); @@ -364,7 +360,6 @@ OpenAPI_suci_info_t *suci_infosItem = OpenAPI_suci_info_parseFromJSON(suci_infos_local); if (!suci_infosItem) { ogs_error("No suci_infosItem"); - OpenAPI_list_free(suci_infosList); goto end; } OpenAPI_list_add(suci_infosList, suci_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_udr_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_udr_info_value.c
Changed
@@ -213,7 +213,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -238,7 +237,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -263,7 +261,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -307,7 +304,6 @@ OpenAPI_shared_data_id_range_t *shared_data_id_rangesItem = OpenAPI_shared_data_id_range_parseFromJSON(shared_data_id_ranges_local); if (!shared_data_id_rangesItem) { ogs_error("No shared_data_id_rangesItem"); - OpenAPI_list_free(shared_data_id_rangesList); goto end; } OpenAPI_list_add(shared_data_id_rangesList, shared_data_id_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_udsf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_udsf_info_value.c
Changed
@@ -146,7 +146,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrf_info_served_upf_info_value.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrf_info_served_upf_info_value.c
Changed
@@ -391,7 +391,6 @@ OpenAPI_snssai_upf_info_item_t *s_nssai_upf_info_listItem = OpenAPI_snssai_upf_info_item_parseFromJSON(s_nssai_upf_info_list_local); if (!s_nssai_upf_info_listItem) { ogs_error("No s_nssai_upf_info_listItem"); - OpenAPI_list_free(s_nssai_upf_info_listList); goto end; } OpenAPI_list_add(s_nssai_upf_info_listList, s_nssai_upf_info_listItem); @@ -436,7 +435,6 @@ OpenAPI_interface_upf_info_item_t *interface_upf_info_listItem = OpenAPI_interface_upf_info_item_parseFromJSON(interface_upf_info_list_local); if (!interface_upf_info_listItem) { ogs_error("No interface_upf_info_listItem"); - OpenAPI_list_free(interface_upf_info_listList); goto end; } OpenAPI_list_add(interface_upf_info_listList, interface_upf_info_listItem); @@ -473,6 +471,10 @@ atsss_capability = cJSON_GetObjectItemCaseSensitive(nrf_info_served_upf_info_valueJSON, "atsssCapability"); if (atsss_capability) { atsss_capability_local_nonprim = OpenAPI_atsss_capability_parseFromJSON(atsss_capability); + if (!atsss_capability_local_nonprim) { + ogs_error("OpenAPI_atsss_capability_parseFromJSON failed atsss_capability"); + goto end; + } } ue_ip_addr_ind = cJSON_GetObjectItemCaseSensitive(nrf_info_served_upf_info_valueJSON, "ueIpAddrInd"); @@ -501,7 +503,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -526,7 +527,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -536,16 +536,28 @@ w_agf_info = cJSON_GetObjectItemCaseSensitive(nrf_info_served_upf_info_valueJSON, "wAgfInfo"); if (w_agf_info) { w_agf_info_local_nonprim = OpenAPI_w_agf_info_parseFromJSON(w_agf_info); + if (!w_agf_info_local_nonprim) { + ogs_error("OpenAPI_w_agf_info_parseFromJSON failed w_agf_info"); + goto end; + } } tngf_info = cJSON_GetObjectItemCaseSensitive(nrf_info_served_upf_info_valueJSON, "tngfInfo"); if (tngf_info) { tngf_info_local_nonprim = OpenAPI_tngf_info_parseFromJSON(tngf_info); + if (!tngf_info_local_nonprim) { + ogs_error("OpenAPI_tngf_info_parseFromJSON failed tngf_info"); + goto end; + } } twif_info = cJSON_GetObjectItemCaseSensitive(nrf_info_served_upf_info_valueJSON, "twifInfo"); if (twif_info) { twif_info_local_nonprim = OpenAPI_twif_info_parseFromJSON(twif_info); + if (!twif_info_local_nonprim) { + ogs_error("OpenAPI_twif_info_parseFromJSON failed twif_info"); + goto end; + } } priority = cJSON_GetObjectItemCaseSensitive(nrf_info_served_upf_info_valueJSON, "priority");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nrppa_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nrppa_information.c
Changed
@@ -112,6 +112,10 @@ goto end; } nrppa_pdu_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(nrppa_pdu); + if (!nrppa_pdu_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed nrppa_pdu"); + goto end; + } service_instance_id = cJSON_GetObjectItemCaseSensitive(nrppa_informationJSON, "serviceInstanceId"); if (service_instance_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nsacf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nsacf_info.c
Changed
@@ -126,6 +126,10 @@ goto end; } nsacf_capability_local_nonprim = OpenAPI_nsacf_capability_parseFromJSON(nsacf_capability); + if (!nsacf_capability_local_nonprim) { + ogs_error("OpenAPI_nsacf_capability_parseFromJSON failed nsacf_capability"); + goto end; + } tai_list = cJSON_GetObjectItemCaseSensitive(nsacf_infoJSON, "taiList"); if (tai_list) { @@ -145,7 +149,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -170,7 +173,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nsag_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nsag_info.c
Changed
@@ -203,7 +203,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem); @@ -227,7 +226,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -252,7 +250,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nsi_id_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nsi_id_info.c
Changed
@@ -97,6 +97,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } nsi_ids = cJSON_GetObjectItemCaseSensitive(nsi_id_infoJSON, "nsiIds"); if (nsi_ids) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nsi_load_level_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nsi_load_level_info.c
Changed
@@ -272,6 +272,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } nsi_id = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "nsiId"); if (nsi_id) { @@ -284,6 +288,10 @@ res_usage = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "resUsage"); if (res_usage) { res_usage_local_nonprim = OpenAPI_resource_usage_parseFromJSON(res_usage); + if (!res_usage_local_nonprim) { + ogs_error("OpenAPI_resource_usage_parseFromJSON failed res_usage"); + goto end; + } } num_of_exceed_load_level_thr = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "numOfExceedLoadLevelThr"); @@ -305,11 +313,19 @@ network_area = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "networkArea"); if (network_area) { network_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(network_area); + if (!network_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed network_area"); + goto end; + } } time_period = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "timePeriod"); if (time_period) { time_period_local_nonprim = OpenAPI_time_window_parseFromJSON(time_period); + if (!time_period_local_nonprim) { + ogs_error("OpenAPI_time_window_parseFromJSON failed time_period"); + goto end; + } } res_usg_thr_cross_time_period = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "resUsgThrCrossTimePeriod"); @@ -330,7 +346,6 @@ OpenAPI_time_window_t *res_usg_thr_cross_time_periodItem = OpenAPI_time_window_parseFromJSON(res_usg_thr_cross_time_period_local); if (!res_usg_thr_cross_time_periodItem) { ogs_error("No res_usg_thr_cross_time_periodItem"); - OpenAPI_list_free(res_usg_thr_cross_time_periodList); goto end; } OpenAPI_list_add(res_usg_thr_cross_time_periodList, res_usg_thr_cross_time_periodItem); @@ -340,11 +355,19 @@ num_of_ues = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "numOfUes"); if (num_of_ues) { num_of_ues_local_nonprim = OpenAPI_number_average_parseFromJSON(num_of_ues); + if (!num_of_ues_local_nonprim) { + ogs_error("OpenAPI_number_average_parseFromJSON failed num_of_ues"); + goto end; + } } num_of_pdu_sess = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "numOfPduSess"); if (num_of_pdu_sess) { num_of_pdu_sess_local_nonprim = OpenAPI_number_average_parseFromJSON(num_of_pdu_sess); + if (!num_of_pdu_sess_local_nonprim) { + ogs_error("OpenAPI_number_average_parseFromJSON failed num_of_pdu_sess"); + goto end; + } } confidence = cJSON_GetObjectItemCaseSensitive(nsi_load_level_infoJSON, "confidence");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nssaa_status.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nssaa_status.c
Changed
@@ -85,6 +85,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } status = cJSON_GetObjectItemCaseSensitive(nssaa_statusJSON, "status"); if (!status) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nssaaf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nssaaf_info.c
Changed
@@ -115,7 +115,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -140,7 +139,6 @@ OpenAPI_internal_group_id_range_t *internal_group_identifiers_rangesItem = OpenAPI_internal_group_id_range_parseFromJSON(internal_group_identifiers_ranges_local); if (!internal_group_identifiers_rangesItem) { ogs_error("No internal_group_identifiers_rangesItem"); - OpenAPI_list_free(internal_group_identifiers_rangesList); goto end; } OpenAPI_list_add(internal_group_identifiers_rangesList, internal_group_identifiers_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nssai.c
Changed
@@ -204,7 +204,6 @@ OpenAPI_snssai_t *default_single_nssaisItem = OpenAPI_snssai_parseFromJSON(default_single_nssais_local); if (!default_single_nssaisItem) { ogs_error("No default_single_nssaisItem"); - OpenAPI_list_free(default_single_nssaisList); goto end; } OpenAPI_list_add(default_single_nssaisList, default_single_nssaisItem); @@ -228,7 +227,6 @@ OpenAPI_snssai_t *single_nssaisItem = OpenAPI_snssai_parseFromJSON(single_nssais_local); if (!single_nssaisItem) { ogs_error("No single_nssaisItem"); - OpenAPI_list_free(single_nssaisList); goto end; } OpenAPI_list_add(single_nssaisList, single_nssaisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nssai_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nssai_1.c
Changed
@@ -204,7 +204,6 @@ OpenAPI_snssai_t *default_single_nssaisItem = OpenAPI_snssai_parseFromJSON(default_single_nssais_local); if (!default_single_nssaisItem) { ogs_error("No default_single_nssaisItem"); - OpenAPI_list_free(default_single_nssaisList); goto end; } OpenAPI_list_add(default_single_nssaisList, default_single_nssaisItem); @@ -228,7 +227,6 @@ OpenAPI_snssai_t *single_nssaisItem = OpenAPI_snssai_parseFromJSON(single_nssais_local); if (!single_nssaisItem) { ogs_error("No single_nssaisItem"); - OpenAPI_list_free(single_nssaisList); goto end; } OpenAPI_list_add(single_nssaisList, single_nssaisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nssai_mapping.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nssai_mapping.c
Changed
@@ -95,6 +95,10 @@ goto end; } mapped_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(mapped_snssai); + if (!mapped_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed mapped_snssai"); + goto end; + } h_snssai = cJSON_GetObjectItemCaseSensitive(nssai_mappingJSON, "hSnssai"); if (!h_snssai) { @@ -102,6 +106,10 @@ goto end; } h_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(h_snssai); + if (!h_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed h_snssai"); + goto end; + } nssai_mapping_local_var = OpenAPI_nssai_mapping_create ( mapped_snssai_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nudm_amf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nudm_amf_info.c
Changed
@@ -109,6 +109,10 @@ goto end; } guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } access_type = cJSON_GetObjectItemCaseSensitive(nudm_amf_infoJSON, "accessType"); if (access_type) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_cond.c
Changed
@@ -309,7 +309,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem); @@ -334,7 +333,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -359,7 +357,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -424,7 +421,6 @@ OpenAPI_ml_analytics_info_t *ml_analytics_listItem = OpenAPI_ml_analytics_info_parseFromJSON(ml_analytics_list_local); if (!ml_analytics_listItem) { ogs_error("No ml_analytics_listItem"); - OpenAPI_list_free(ml_analytics_listList); goto end; } OpenAPI_list_add(ml_analytics_listList, ml_analytics_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_data.c
Changed
@@ -114,7 +114,6 @@ OpenAPI_nwdaf_event_t *nwdaf_eventsItem = OpenAPI_nwdaf_event_parseFromJSON(nwdaf_events_local); if (!nwdaf_eventsItem) { ogs_error("No nwdaf_eventsItem"); - OpenAPI_list_free(nwdaf_eventsList); goto end; } OpenAPI_list_add(nwdaf_eventsList, nwdaf_eventsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_info.c
Changed
@@ -276,7 +276,6 @@ OpenAPI_event_id_t *event_idsItem = OpenAPI_event_id_parseFromJSON(event_ids_local); if (!event_idsItem) { ogs_error("No event_idsItem"); - OpenAPI_list_free(event_idsList); goto end; } OpenAPI_list_add(event_idsList, event_idsItem); @@ -301,7 +300,6 @@ OpenAPI_nwdaf_event_t *nwdaf_eventsItem = OpenAPI_nwdaf_event_parseFromJSON(nwdaf_events_local); if (!nwdaf_eventsItem) { ogs_error("No nwdaf_eventsItem"); - OpenAPI_list_free(nwdaf_eventsList); goto end; } OpenAPI_list_add(nwdaf_eventsList, nwdaf_eventsItem); @@ -326,7 +324,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -351,7 +348,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -361,6 +357,10 @@ nwdaf_capability = cJSON_GetObjectItemCaseSensitive(nwdaf_infoJSON, "nwdafCapability"); if (nwdaf_capability) { nwdaf_capability_local_nonprim = OpenAPI_nwdaf_capability_parseFromJSON(nwdaf_capability); + if (!nwdaf_capability_local_nonprim) { + ogs_error("OpenAPI_nwdaf_capability_parseFromJSON failed nwdaf_capability"); + goto end; + } } analytics_delay = cJSON_GetObjectItemCaseSensitive(nwdaf_infoJSON, "analyticsDelay"); @@ -429,7 +429,6 @@ OpenAPI_ml_analytics_info_t *ml_analytics_listItem = OpenAPI_ml_analytics_info_parseFromJSON(ml_analytics_list_local); if (!ml_analytics_listItem) { ogs_error("No ml_analytics_listItem"); - OpenAPI_list_free(ml_analytics_listList); goto end; } OpenAPI_list_add(ml_analytics_listList, ml_analytics_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_registration.c
Changed
@@ -207,7 +207,6 @@ OpenAPI_event_id_t *analytics_idsItem = OpenAPI_event_id_parseFromJSON(analytics_ids_local); if (!analytics_idsItem) { ogs_error("No analytics_idsItem"); - OpenAPI_list_free(analytics_idsList); goto end; } OpenAPI_list_add(analytics_idsList, analytics_idsItem); @@ -232,6 +231,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(nwdaf_registrationJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(nwdaf_registrationJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_registration_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_registration_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_nwdaf_registration_t *nwdaf_registration_listItem = OpenAPI_nwdaf_registration_parseFromJSON(nwdaf_registration_list_local); if (!nwdaf_registration_listItem) { ogs_error("No nwdaf_registration_listItem"); - OpenAPI_list_free(nwdaf_registration_listList); goto end; } OpenAPI_list_add(nwdaf_registration_listList, nwdaf_registration_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_registration_modification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_registration_modification.c
Changed
@@ -150,7 +150,6 @@ OpenAPI_event_id_t *analytics_idsItem = OpenAPI_event_id_parseFromJSON(analytics_ids_local); if (!analytics_idsItem) { ogs_error("No analytics_idsItem"); - OpenAPI_list_free(analytics_idsList); goto end; } OpenAPI_list_add(analytics_idsList, analytics_idsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/nwdaf_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/nwdaf_subscription.c
Changed
@@ -98,6 +98,10 @@ goto end; } nwdaf_events_subscription_local_nonprim = OpenAPI_nnwdaf_events_subscription_parseFromJSON(nwdaf_events_subscription); + if (!nwdaf_events_subscription_local_nonprim) { + ogs_error("OpenAPI_nnwdaf_events_subscription_parseFromJSON failed nwdaf_events_subscription"); + goto end; + } nwdaf_subscription_local_var = OpenAPI_nwdaf_subscription_create ( ogs_strdup(nwdaf_evt_subs_service_uri->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/operator_specific_data_container.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/operator_specific_data_container.c
Changed
@@ -180,6 +180,10 @@ goto end; } value_local_nonprim = OpenAPI_operator_specific_data_container_value_parseFromJSON(value); + if (!value_local_nonprim) { + ogs_error("OpenAPI_operator_specific_data_container_value_parseFromJSON failed value"); + goto end; + } supported_features = cJSON_GetObjectItemCaseSensitive(operator_specific_data_containerJSON, "supportedFeatures"); if (supported_features) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/out_of_credit_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/out_of_credit_information.c
Changed
@@ -99,6 +99,10 @@ goto end; } fin_unit_act_local_nonprim = OpenAPI_final_unit_action_parseFromJSON(fin_unit_act); + if (!fin_unit_act_local_nonprim) { + ogs_error("OpenAPI_final_unit_action_parseFromJSON failed fin_unit_act"); + goto end; + } flows = cJSON_GetObjectItemCaseSensitive(out_of_credit_informationJSON, "flows"); if (flows) { @@ -118,7 +122,6 @@ OpenAPI_flows_t *flowsItem = OpenAPI_flows_parseFromJSON(flows_local); if (!flowsItem) { ogs_error("No flowsItem"); - OpenAPI_list_free(flowsList); goto end; } OpenAPI_list_add(flowsList, flowsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/parameter_combination.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/parameter_combination.c
Changed
@@ -111,6 +111,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(parameter_combinationJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } parameter_combination_local_var = OpenAPI_parameter_combination_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/partial_success_report.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/partial_success_report.c
Changed
@@ -209,7 +209,6 @@ OpenAPI_rule_report_t *rule_reportsItem = OpenAPI_rule_report_parseFromJSON(rule_reports_local); if (!rule_reportsItem) { ogs_error("No rule_reportsItem"); - OpenAPI_list_free(rule_reportsList); goto end; } OpenAPI_list_add(rule_reportsList, rule_reportsItem); @@ -234,7 +233,6 @@ OpenAPI_session_rule_report_t *sess_rule_reportsItem = OpenAPI_session_rule_report_parseFromJSON(sess_rule_reports_local); if (!sess_rule_reportsItem) { ogs_error("No sess_rule_reportsItem"); - OpenAPI_list_free(sess_rule_reportsList); goto end; } OpenAPI_list_add(sess_rule_reportsList, sess_rule_reportsItem); @@ -244,6 +242,10 @@ ue_camping_rep = cJSON_GetObjectItemCaseSensitive(partial_success_reportJSON, "ueCampingRep"); if (ue_camping_rep) { ue_camping_rep_local_nonprim = OpenAPI_ue_camping_rep_parseFromJSON(ue_camping_rep); + if (!ue_camping_rep_local_nonprim) { + ogs_error("OpenAPI_ue_camping_rep_parseFromJSON failed ue_camping_rep"); + goto end; + } } policy_dec_failure_reports = cJSON_GetObjectItemCaseSensitive(partial_success_reportJSON, "policyDecFailureReports"); @@ -283,7 +285,6 @@ OpenAPI_invalid_param_t *invalid_policy_decsItem = OpenAPI_invalid_param_parseFromJSON(invalid_policy_decs_local); if (!invalid_policy_decsItem) { ogs_error("No invalid_policy_decsItem"); - OpenAPI_list_free(invalid_policy_decsList); goto end; } OpenAPI_list_add(invalid_policy_decsList, invalid_policy_decsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/patch_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/patch_result.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_report_item_t *reportItem = OpenAPI_report_item_parseFromJSON(report_local); if (!reportItem) { ogs_error("No reportItem"); - OpenAPI_list_free(reportList); goto end; } OpenAPI_list_add(reportList, reportItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pc5_qo_s_para.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pc5_qo_s_para.c
Changed
@@ -107,7 +107,6 @@ OpenAPI_pc5_qos_flow_item_t *pc5_qos_flow_listItem = OpenAPI_pc5_qos_flow_item_parseFromJSON(pc5_qos_flow_list_local); if (!pc5_qos_flow_listItem) { ogs_error("No pc5_qos_flow_listItem"); - OpenAPI_list_free(pc5_qos_flow_listList); goto end; } OpenAPI_list_add(pc5_qos_flow_listList, pc5_qos_flow_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pc5_qos_flow_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pc5_qos_flow_item.c
Changed
@@ -97,6 +97,10 @@ pc5_flow_bit_rates = cJSON_GetObjectItemCaseSensitive(pc5_qos_flow_itemJSON, "pc5FlowBitRates"); if (pc5_flow_bit_rates) { pc5_flow_bit_rates_local_nonprim = OpenAPI_pc5_flow_bit_rates_parseFromJSON(pc5_flow_bit_rates); + if (!pc5_flow_bit_rates_local_nonprim) { + ogs_error("OpenAPI_pc5_flow_bit_rates_parseFromJSON failed pc5_flow_bit_rates"); + goto end; + } } range = cJSON_GetObjectItemCaseSensitive(pc5_qos_flow_itemJSON, "range");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcc_rule.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcc_rule.c
Changed
@@ -537,7 +537,6 @@ OpenAPI_flow_information_t *flow_infosItem = OpenAPI_flow_information_parseFromJSON(flow_infos_local); if (!flow_infosItem) { ogs_error("No flow_infosItem"); - OpenAPI_list_free(flow_infosList); goto end; } OpenAPI_list_add(flow_infosList, flow_infosItem); @@ -798,11 +797,19 @@ tscai_input_dl = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiInputDl"); if (tscai_input_dl) { tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl); + if (!tscai_input_dl_local_nonprim) { + ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed tscai_input_dl"); + goto end; + } } tscai_input_ul = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiInputUl"); if (tscai_input_ul) { tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul); + if (!tscai_input_ul_local_nonprim) { + ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed tscai_input_ul"); + goto end; + } } tscai_time_dom = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiTimeDom"); @@ -816,11 +823,19 @@ dd_notif_ctrl = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "ddNotifCtrl"); if (dd_notif_ctrl) { dd_notif_ctrl_local_nonprim = OpenAPI_downlink_data_notification_control_parseFromJSON(dd_notif_ctrl); + if (!dd_notif_ctrl_local_nonprim) { + ogs_error("OpenAPI_downlink_data_notification_control_parseFromJSON failed dd_notif_ctrl"); + goto end; + } } dd_notif_ctrl2 = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "ddNotifCtrl2"); if (dd_notif_ctrl2) { dd_notif_ctrl2_local_nonprim = OpenAPI_downlink_data_notification_control_rm_parseFromJSON(dd_notif_ctrl2); + if (!dd_notif_ctrl2_local_nonprim) { + ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON failed dd_notif_ctrl2"); + goto end; + } } dis_ue_notif = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "disUeNotif");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_addressing_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_addressing_info.c
Changed
@@ -124,7 +124,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_binding.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_binding.c
Changed
@@ -590,7 +590,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem); @@ -639,7 +638,6 @@ OpenAPI_ip_end_point_t *pcf_sm_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_sm_ip_end_points_local); if (!pcf_sm_ip_end_pointsItem) { ogs_error("No pcf_sm_ip_end_pointsItem"); - OpenAPI_list_free(pcf_sm_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_sm_ip_end_pointsList, pcf_sm_ip_end_pointsItem); @@ -652,6 +650,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } supp_feat = cJSON_GetObjectItemCaseSensitive(pcf_bindingJSON, "suppFeat"); if (supp_feat) { @@ -688,6 +690,10 @@ para_com = cJSON_GetObjectItemCaseSensitive(pcf_bindingJSON, "paraCom"); if (para_com) { para_com_local_nonprim = OpenAPI_parameter_combination_parseFromJSON(para_com); + if (!para_com_local_nonprim) { + ogs_error("OpenAPI_parameter_combination_parseFromJSON failed para_com"); + goto end; + } } bind_level = cJSON_GetObjectItemCaseSensitive(pcf_bindingJSON, "bindLevel");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_binding_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_binding_patch.c
Changed
@@ -340,7 +340,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_for_pdu_session_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_for_pdu_session_info.c
Changed
@@ -256,6 +256,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } pcf_fqdn = cJSON_GetObjectItemCaseSensitive(pcf_for_pdu_session_infoJSON, "pcfFqdn"); if (pcf_fqdn) { @@ -283,7 +287,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_for_ue_binding.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_for_ue_binding.c
Changed
@@ -211,7 +211,6 @@ OpenAPI_ip_end_point_t *pcf_for_ue_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_for_ue_ip_end_points_local); if (!pcf_for_ue_ip_end_pointsItem) { ogs_error("No pcf_for_ue_ip_end_pointsItem"); - OpenAPI_list_free(pcf_for_ue_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_for_ue_ip_end_pointsList, pcf_for_ue_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_for_ue_binding_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_for_ue_binding_patch.c
Changed
@@ -124,7 +124,6 @@ OpenAPI_ip_end_point_t *pcf_for_ue_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_for_ue_ip_end_points_local); if (!pcf_for_ue_ip_end_pointsItem) { ogs_error("No pcf_for_ue_ip_end_pointsItem"); - OpenAPI_list_free(pcf_for_ue_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_for_ue_ip_end_pointsList, pcf_for_ue_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_for_ue_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_for_ue_info.c
Changed
@@ -149,7 +149,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_info.c
Changed
@@ -277,7 +277,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -302,7 +301,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -344,11 +342,19 @@ prose_capability = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "proseCapability"); if (prose_capability) { prose_capability_local_nonprim = OpenAPI_pro_se_capability_parseFromJSON(prose_capability); + if (!prose_capability_local_nonprim) { + ogs_error("OpenAPI_pro_se_capability_parseFromJSON failed prose_capability"); + goto end; + } } v2x_capability = cJSON_GetObjectItemCaseSensitive(pcf_infoJSON, "v2xCapability"); if (v2x_capability) { v2x_capability_local_nonprim = OpenAPI_v2x_capability_parseFromJSON(v2x_capability); + if (!v2x_capability_local_nonprim) { + ogs_error("OpenAPI_v2x_capability_parseFromJSON failed v2x_capability"); + goto end; + } } pcf_info_local_var = OpenAPI_pcf_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_mbs_binding.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_mbs_binding.c
Changed
@@ -180,6 +180,10 @@ goto end; } mbs_session_id_local_nonprim = OpenAPI_mbs_session_id_parseFromJSON(mbs_session_id); + if (!mbs_session_id_local_nonprim) { + ogs_error("OpenAPI_mbs_session_id_parseFromJSON failed mbs_session_id"); + goto end; + } pcf_fqdn = cJSON_GetObjectItemCaseSensitive(pcf_mbs_bindingJSON, "pcfFqdn"); if (pcf_fqdn) { @@ -207,7 +211,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_mbs_binding_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_mbs_binding_patch.c
Changed
@@ -124,7 +124,6 @@ OpenAPI_ip_end_point_t *pcf_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(pcf_ip_end_points_local); if (!pcf_ip_end_pointsItem) { ogs_error("No pcf_ip_end_pointsItem"); - OpenAPI_list_free(pcf_ip_end_pointsList); goto end; } OpenAPI_list_add(pcf_ip_end_pointsList, pcf_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_selection_assistance_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_selection_assistance_info.c
Changed
@@ -98,6 +98,10 @@ goto end; } single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } pcf_selection_assistance_info_local_var = OpenAPI_pcf_selection_assistance_info_create ( ogs_strdup(dnn->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcf_selection_assistance_info_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcf_selection_assistance_info_1.c
Changed
@@ -98,6 +98,10 @@ goto end; } single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } pcf_selection_assistance_info_1_local_var = OpenAPI_pcf_selection_assistance_info_1_create ( ogs_strdup(dnn->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcscf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcscf_info.c
Changed
@@ -430,7 +430,6 @@ OpenAPI_ipv4_address_range_t *served_ipv4_address_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(served_ipv4_address_ranges_local); if (!served_ipv4_address_rangesItem) { ogs_error("No served_ipv4_address_rangesItem"); - OpenAPI_list_free(served_ipv4_address_rangesList); goto end; } OpenAPI_list_add(served_ipv4_address_rangesList, served_ipv4_address_rangesItem); @@ -455,7 +454,6 @@ OpenAPI_ipv6_prefix_range_t *served_ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(served_ipv6_prefix_ranges_local); if (!served_ipv6_prefix_rangesItem) { ogs_error("No served_ipv6_prefix_rangesItem"); - OpenAPI_list_free(served_ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(served_ipv6_prefix_rangesList, served_ipv6_prefix_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcscf_restoration_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcscf_restoration_notification.c
Changed
@@ -93,6 +93,10 @@ failed_pcscf = cJSON_GetObjectItemCaseSensitive(pcscf_restoration_notificationJSON, "failedPcscf"); if (failed_pcscf) { failed_pcscf_local_nonprim = OpenAPI_pcscf_address_parseFromJSON(failed_pcscf); + if (!failed_pcscf_local_nonprim) { + ogs_error("OpenAPI_pcscf_address_parseFromJSON failed failed_pcscf"); + goto end; + } } pcscf_restoration_notification_local_var = OpenAPI_pcscf_restoration_notification_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pcscf_restoration_request_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pcscf_restoration_request_data.c
Changed
@@ -153,6 +153,10 @@ slice_info = cJSON_GetObjectItemCaseSensitive(pcscf_restoration_request_dataJSON, "sliceInfo"); if (slice_info) { slice_info_local_nonprim = OpenAPI_snssai_parseFromJSON(slice_info); + if (!slice_info_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed slice_info"); + goto end; + } } supi = cJSON_GetObjectItemCaseSensitive(pcscf_restoration_request_dataJSON, "supi");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session.c
Changed
@@ -145,10 +145,18 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } single_nssai = cJSON_GetObjectItemCaseSensitive(pdu_sessionJSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } pdu_session_local_var = OpenAPI_pdu_session_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_context.c
Changed
@@ -618,6 +618,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "dnn"); if (!dnn) { @@ -675,7 +679,6 @@ OpenAPI_ebi_arp_mapping_t *allocated_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(allocated_ebi_list_local); if (!allocated_ebi_listItem) { ogs_error("No allocated_ebi_listItem"); - OpenAPI_list_free(allocated_ebi_listList); goto end; } OpenAPI_list_add(allocated_ebi_listList, allocated_ebi_listItem); @@ -808,6 +811,10 @@ cn_assisted_ran_para = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "cnAssistedRanPara"); if (cn_assisted_ran_para) { cn_assisted_ran_para_local_nonprim = OpenAPI_cn_assisted_ran_para_parseFromJSON(cn_assisted_ran_para); + if (!cn_assisted_ran_para_local_nonprim) { + ogs_error("OpenAPI_cn_assisted_ran_para_parseFromJSON failed cn_assisted_ran_para"); + goto end; + } } nrf_management_uri = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "nrfManagementUri"); @@ -861,6 +868,10 @@ additional_snssai = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "additionalSnssai"); if (additional_snssai) { additional_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(additional_snssai); + if (!additional_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed additional_snssai"); + goto end; + } } inter_plmn_api_root = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "interPlmnApiRoot"); @@ -882,11 +893,19 @@ pgw_ip_addr = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "pgwIpAddr"); if (pgw_ip_addr) { pgw_ip_addr_local_nonprim = OpenAPI_ip_address_parseFromJSON(pgw_ip_addr); + if (!pgw_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed pgw_ip_addr"); + goto end; + } } plmn_id = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } anchor_smf_supported_features = cJSON_GetObjectItemCaseSensitive(pdu_session_contextJSON, "anchorSmfSupportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_create_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_create_data.c
Changed
@@ -1243,11 +1243,19 @@ s_nssai = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } hplmn_snssai = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "hplmnSnssai"); if (hplmn_snssai) { hplmn_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(hplmn_snssai); + if (!hplmn_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed hplmn_snssai"); + goto end; + } } vsmf_id = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "vsmfId"); @@ -1272,6 +1280,10 @@ goto end; } serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } request_type = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "requestType"); if (request_type) { @@ -1336,21 +1348,37 @@ vcn_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "vcnTunnelInfo"); if (vcn_tunnel_info) { vcn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(vcn_tunnel_info); + if (!vcn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed vcn_tunnel_info"); + goto end; + } } icn_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "icnTunnelInfo"); if (icn_tunnel_info) { icn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(icn_tunnel_info); + if (!icn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed icn_tunnel_info"); + goto end; + } } n9_forwarding_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "n9ForwardingTunnelInfo"); if (n9_forwarding_tunnel_info) { n9_forwarding_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(n9_forwarding_tunnel_info); + if (!n9_forwarding_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed n9_forwarding_tunnel_info"); + goto end; + } } additional_cn_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "additionalCnTunnelInfo"); if (additional_cn_tunnel_info) { additional_cn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(additional_cn_tunnel_info); + if (!additional_cn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed additional_cn_tunnel_info"); + goto end; + } } an_type = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "anType"); @@ -1385,6 +1413,10 @@ ue_location = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "ueTimeZone"); @@ -1398,6 +1430,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } gpsi = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "gpsi"); @@ -1411,11 +1447,19 @@ n1_sm_info_from_ue = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "n1SmInfoFromUe"); if (n1_sm_info_from_ue) { n1_sm_info_from_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_from_ue); + if (!n1_sm_info_from_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_from_ue"); + goto end; + } } unknown_n1_sm_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "unknownN1SmInfo"); if (unknown_n1_sm_info) { unknown_n1_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(unknown_n1_sm_info); + if (!unknown_n1_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed unknown_n1_sm_info"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "supportedFeatures"); @@ -1543,6 +1587,10 @@ roaming_charging_profile = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "roamingChargingProfile"); if (roaming_charging_profile) { roaming_charging_profile_local_nonprim = OpenAPI_roaming_charging_profile_parseFromJSON(roaming_charging_profile); + if (!roaming_charging_profile_local_nonprim) { + ogs_error("OpenAPI_roaming_charging_profile_parseFromJSON failed roaming_charging_profile"); + goto end; + } } charging_id = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "chargingId"); @@ -1580,6 +1628,10 @@ guami = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } max_integrity_protected_data_rate_ul = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "maxIntegrityProtectedDataRateUl"); @@ -1688,7 +1740,6 @@ OpenAPI_secondary_rat_usage_info_t *secondary_rat_usage_infoItem = OpenAPI_secondary_rat_usage_info_parseFromJSON(secondary_rat_usage_info_local); if (!secondary_rat_usage_infoItem) { ogs_error("No secondary_rat_usage_infoItem"); - OpenAPI_list_free(secondary_rat_usage_infoList); goto end; } OpenAPI_list_add(secondary_rat_usage_infoList, secondary_rat_usage_infoItem); @@ -1698,11 +1749,19 @@ small_data_rate_status = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } dl_serving_plmn_rate_ctl = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "dlServingPlmnRateCtl"); @@ -1716,11 +1775,19 @@ up_security_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "upSecurityInfo"); if (up_security_info) { up_security_info_local_nonprim = OpenAPI_up_security_info_parseFromJSON(up_security_info); + if (!up_security_info_local_nonprim) { + ogs_error("OpenAPI_up_security_info_parseFromJSON failed up_security_info"); + goto end; + } } vplmn_qos = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "vplmnQos"); if (vplmn_qos) { vplmn_qos_local_nonprim = OpenAPI_vplmn_qos_parseFromJSON(vplmn_qos); + if (!vplmn_qos_local_nonprim) { + ogs_error("OpenAPI_vplmn_qos_parseFromJSON failed vplmn_qos"); + goto end; + } } old_sm_context_ref = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "oldSmContextRef"); @@ -1734,6 +1801,10 @@ redundant_pdu_session_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "redundantPduSessionInfo"); if (redundant_pdu_session_info) { redundant_pdu_session_info_local_nonprim = OpenAPI_redundant_pdu_session_information_parseFromJSON(redundant_pdu_session_info); + if (!redundant_pdu_session_info_local_nonprim) { + ogs_error("OpenAPI_redundant_pdu_session_information_parseFromJSON failed redundant_pdu_session_info"); + goto end; + } } old_pdu_session_ref = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "oldPduSessionRef"); @@ -1755,6 +1826,10 @@ pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "pcfUeCallbackInfo"); if (pcf_ue_callback_info) { pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info); + if (!pcf_ue_callback_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_callback_info"); + goto end; + } } satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "satelliteBackhaulCat");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_create_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_create_error.c
Changed
@@ -133,6 +133,10 @@ goto end; } error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } n1sm_cause = cJSON_GetObjectItemCaseSensitive(pdu_session_create_errorJSON, "n1smCause"); if (n1sm_cause) { @@ -145,6 +149,10 @@ n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(pdu_session_create_errorJSON, "n1SmInfoToUe"); if (n1_sm_info_to_ue) { n1_sm_info_to_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_to_ue); + if (!n1_sm_info_to_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_to_ue"); + goto end; + } } back_off_timer = cJSON_GetObjectItemCaseSensitive(pdu_session_create_errorJSON, "backOffTimer");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_created_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_created_data.c
Changed
@@ -718,21 +718,37 @@ hcn_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "hcnTunnelInfo"); if (hcn_tunnel_info) { hcn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(hcn_tunnel_info); + if (!hcn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed hcn_tunnel_info"); + goto end; + } } cn_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "cnTunnelInfo"); if (cn_tunnel_info) { cn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(cn_tunnel_info); + if (!cn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed cn_tunnel_info"); + goto end; + } } additional_cn_tunnel_info = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "additionalCnTunnelInfo"); if (additional_cn_tunnel_info) { additional_cn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(additional_cn_tunnel_info); + if (!additional_cn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed additional_cn_tunnel_info"); + goto end; + } } session_ambr = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "sessionAmbr"); if (session_ambr) { session_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed session_ambr"); + goto end; + } } qos_flows_setup_list = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "qosFlowsSetupList"); @@ -753,7 +769,6 @@ OpenAPI_qos_flow_setup_item_t *qos_flows_setup_listItem = OpenAPI_qos_flow_setup_item_parseFromJSON(qos_flows_setup_list_local); if (!qos_flows_setup_listItem) { ogs_error("No qos_flows_setup_listItem"); - OpenAPI_list_free(qos_flows_setup_listList); goto end; } OpenAPI_list_add(qos_flows_setup_listList, qos_flows_setup_listItem); @@ -787,6 +802,10 @@ s_nssai = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } enable_pause_charging = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "enablePauseCharging"); @@ -816,11 +835,19 @@ n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "n1SmInfoToUe"); if (n1_sm_info_to_ue) { n1_sm_info_to_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_to_ue); + if (!n1_sm_info_to_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_to_ue"); + goto end; + } } eps_pdn_cnx_info = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "epsPdnCnxInfo"); if (eps_pdn_cnx_info) { eps_pdn_cnx_info_local_nonprim = OpenAPI_eps_pdn_cnx_info_parseFromJSON(eps_pdn_cnx_info); + if (!eps_pdn_cnx_info_local_nonprim) { + ogs_error("OpenAPI_eps_pdn_cnx_info_parseFromJSON failed eps_pdn_cnx_info"); + goto end; + } } eps_bearer_info = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "epsBearerInfo"); @@ -841,7 +868,6 @@ OpenAPI_eps_bearer_info_t *eps_bearer_infoItem = OpenAPI_eps_bearer_info_parseFromJSON(eps_bearer_info_local); if (!eps_bearer_infoItem) { ogs_error("No eps_bearer_infoItem"); - OpenAPI_list_free(eps_bearer_infoList); goto end; } OpenAPI_list_add(eps_bearer_infoList, eps_bearer_infoItem); @@ -893,11 +919,19 @@ up_security = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "upSecurity"); if (up_security) { up_security_local_nonprim = OpenAPI_up_security_parseFromJSON(up_security); + if (!up_security_local_nonprim) { + ogs_error("OpenAPI_up_security_parseFromJSON failed up_security"); + goto end; + } } roaming_charging_profile = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "roamingChargingProfile"); if (roaming_charging_profile) { roaming_charging_profile_local_nonprim = OpenAPI_roaming_charging_profile_parseFromJSON(roaming_charging_profile); + if (!roaming_charging_profile_local_nonprim) { + ogs_error("OpenAPI_roaming_charging_profile_parseFromJSON failed roaming_charging_profile"); + goto end; + } } h_smf_service_instance_id = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "hSmfServiceInstanceId"); @@ -1004,11 +1038,19 @@ dn_aaa_address = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "dnAaaAddress"); if (dn_aaa_address) { dn_aaa_address_local_nonprim = OpenAPI_ip_address_parseFromJSON(dn_aaa_address); + if (!dn_aaa_address_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed dn_aaa_address"); + goto end; + } } redundant_pdu_session_info = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "redundantPduSessionInfo"); if (redundant_pdu_session_info) { redundant_pdu_session_info_local_nonprim = OpenAPI_redundant_pdu_session_information_parseFromJSON(redundant_pdu_session_info); + if (!redundant_pdu_session_info_local_nonprim) { + ogs_error("OpenAPI_redundant_pdu_session_information_parseFromJSON failed redundant_pdu_session_info"); + goto end; + } } nspu_support_ind = cJSON_GetObjectItemCaseSensitive(pdu_session_created_dataJSON, "nspuSupportInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_event_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_event_notification.c
Changed
@@ -209,6 +209,10 @@ goto end; } ev_notif_local_nonprim = OpenAPI_af_event_notification_parseFromJSON(ev_notif); + if (!ev_notif_local_nonprim) { + ogs_error("OpenAPI_af_event_notification_parseFromJSON failed ev_notif"); + goto end; + } supi = cJSON_GetObjectItemCaseSensitive(pdu_session_event_notificationJSON, "supi"); if (supi) { @@ -254,6 +258,10 @@ pcf_info = cJSON_GetObjectItemCaseSensitive(pdu_session_event_notificationJSON, "pcfInfo"); if (pcf_info) { pcf_info_local_nonprim = OpenAPI_pcf_addressing_info_parseFromJSON(pcf_info); + if (!pcf_info_local_nonprim) { + ogs_error("OpenAPI_pcf_addressing_info_parseFromJSON failed pcf_info"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(pdu_session_event_notificationJSON, "dnn"); @@ -267,6 +275,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(pdu_session_event_notificationJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } gpsi = cJSON_GetObjectItemCaseSensitive(pdu_session_event_notificationJSON, "gpsi");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_info.c
Changed
@@ -88,6 +88,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(pdu_session_infoJSON, "dnn"); if (!dnn) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_management_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_management_data.c
Changed
@@ -342,7 +342,6 @@ OpenAPI_route_to_location_t *n6_traffic_routing_infoItem = OpenAPI_route_to_location_parseFromJSON(n6_traffic_routing_info_local); if (!n6_traffic_routing_infoItem) { ogs_error("No n6_traffic_routing_infoItem"); - OpenAPI_list_free(n6_traffic_routing_infoList); goto end; } OpenAPI_list_add(n6_traffic_routing_infoList, n6_traffic_routing_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pdu_session_tsn_bridge.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pdu_session_tsn_bridge.c
Changed
@@ -218,15 +218,27 @@ goto end; } tsn_bridge_info_local_nonprim = OpenAPI_tsn_bridge_info_parseFromJSON(tsn_bridge_info); + if (!tsn_bridge_info_local_nonprim) { + ogs_error("OpenAPI_tsn_bridge_info_parseFromJSON failed tsn_bridge_info"); + goto end; + } tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(pdu_session_tsn_bridgeJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(pdu_session_tsn_bridgeJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(pdu_session_tsn_bridgeJSON, "tsnPortManContNwtts"); @@ -247,7 +259,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem); @@ -273,6 +284,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(pdu_session_tsn_bridgeJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } ip_domain = cJSON_GetObjectItemCaseSensitive(pdu_session_tsn_bridgeJSON, "ipDomain");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pfd_change_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pfd_change_notification.c
Changed
@@ -154,7 +154,6 @@ OpenAPI_pfd_content_t *pfdsItem = OpenAPI_pfd_content_parseFromJSON(pfds_local); if (!pfdsItem) { ogs_error("No pfdsItem"); - OpenAPI_list_free(pfdsList); goto end; } OpenAPI_list_add(pfdsList, pfdsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pfd_content.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pfd_content.c
Changed
@@ -227,6 +227,10 @@ dn_protocol = cJSON_GetObjectItemCaseSensitive(pfd_contentJSON, "dnProtocol"); if (dn_protocol) { dn_protocol_local_nonprim = OpenAPI_domain_name_protocol_parseFromJSON(dn_protocol); + if (!dn_protocol_local_nonprim) { + ogs_error("OpenAPI_domain_name_protocol_parseFromJSON failed dn_protocol"); + goto end; + } } pfd_content_local_var = OpenAPI_pfd_content_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pfd_data_for_app_ext.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pfd_data_for_app_ext.c
Changed
@@ -184,7 +184,6 @@ OpenAPI_pfd_content_t *pfdsItem = OpenAPI_pfd_content_parseFromJSON(pfds_local); if (!pfdsItem) { ogs_error("No pfdsItem"); - OpenAPI_list_free(pfdsList); goto end; } OpenAPI_list_add(pfdsList, pfdsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pgw_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pgw_info.c
Changed
@@ -180,11 +180,19 @@ pgw_ip_addr = cJSON_GetObjectItemCaseSensitive(pgw_infoJSON, "pgwIpAddr"); if (pgw_ip_addr) { pgw_ip_addr_local_nonprim = OpenAPI_ip_address_parseFromJSON(pgw_ip_addr); + if (!pgw_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed pgw_ip_addr"); + goto end; + } } plmn_id = cJSON_GetObjectItemCaseSensitive(pgw_infoJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } epdg_ind = cJSON_GetObjectItemCaseSensitive(pgw_infoJSON, "epdgInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_ec_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_ec_info.c
Changed
@@ -105,10 +105,18 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } ec_restriction_data_wb = cJSON_GetObjectItemCaseSensitive(plmn_ec_infoJSON, "ecRestrictionDataWb"); if (ec_restriction_data_wb) { ec_restriction_data_wb_local_nonprim = OpenAPI_ec_restriction_data_wb_parseFromJSON(ec_restriction_data_wb); + if (!ec_restriction_data_wb_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_data_wb_parseFromJSON failed ec_restriction_data_wb"); + goto end; + } } ec_restriction_data_nb = cJSON_GetObjectItemCaseSensitive(plmn_ec_infoJSON, "ecRestrictionDataNb");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_ec_info_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_ec_info_1.c
Changed
@@ -105,10 +105,18 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } ec_restriction_data_wb = cJSON_GetObjectItemCaseSensitive(plmn_ec_info_1JSON, "ecRestrictionDataWb"); if (ec_restriction_data_wb) { ec_restriction_data_wb_local_nonprim = OpenAPI_ec_restriction_data_wb_parseFromJSON(ec_restriction_data_wb); + if (!ec_restriction_data_wb_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_data_wb_parseFromJSON failed ec_restriction_data_wb"); + goto end; + } } ec_restriction_data_nb = cJSON_GetObjectItemCaseSensitive(plmn_ec_info_1JSON, "ecRestrictionDataNb");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_oauth2.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_oauth2.c
Changed
@@ -115,7 +115,6 @@ OpenAPI_plmn_id_t *oauth2_required_plmn_id_listItem = OpenAPI_plmn_id_parseFromJSON(oauth2_required_plmn_id_list_local); if (!oauth2_required_plmn_id_listItem) { ogs_error("No oauth2_required_plmn_id_listItem"); - OpenAPI_list_free(oauth2_required_plmn_id_listList); goto end; } OpenAPI_list_add(oauth2_required_plmn_id_listList, oauth2_required_plmn_id_listItem); @@ -140,7 +139,6 @@ OpenAPI_plmn_id_t *oauth2_not_required_plmn_id_listItem = OpenAPI_plmn_id_parseFromJSON(oauth2_not_required_plmn_id_list_local); if (!oauth2_not_required_plmn_id_listItem) { ogs_error("No oauth2_not_required_plmn_id_listItem"); - OpenAPI_list_free(oauth2_not_required_plmn_id_listList); goto end; } OpenAPI_list_add(oauth2_not_required_plmn_id_listList, oauth2_not_required_plmn_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_restriction.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_restriction.c
Changed
@@ -216,7 +216,6 @@ OpenAPI_area_t *forbidden_areasItem = OpenAPI_area_parseFromJSON(forbidden_areas_local); if (!forbidden_areasItem) { ogs_error("No forbidden_areasItem"); - OpenAPI_list_free(forbidden_areasList); goto end; } OpenAPI_list_add(forbidden_areasList, forbidden_areasItem); @@ -226,6 +225,10 @@ service_area_restriction = cJSON_GetObjectItemCaseSensitive(plmn_restrictionJSON, "serviceAreaRestriction"); if (service_area_restriction) { service_area_restriction_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(service_area_restriction); + if (!service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed service_area_restriction"); + goto end; + } } core_network_type_restrictions = cJSON_GetObjectItemCaseSensitive(plmn_restrictionJSON, "coreNetworkTypeRestrictions");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_restriction_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_restriction_1.c
Changed
@@ -216,7 +216,6 @@ OpenAPI_area_1_t *forbidden_areasItem = OpenAPI_area_1_parseFromJSON(forbidden_areas_local); if (!forbidden_areasItem) { ogs_error("No forbidden_areasItem"); - OpenAPI_list_free(forbidden_areasList); goto end; } OpenAPI_list_add(forbidden_areasList, forbidden_areasItem); @@ -226,6 +225,10 @@ service_area_restriction = cJSON_GetObjectItemCaseSensitive(plmn_restriction_1JSON, "serviceAreaRestriction"); if (service_area_restriction) { service_area_restriction_local_nonprim = OpenAPI_service_area_restriction_1_parseFromJSON(service_area_restriction); + if (!service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_1_parseFromJSON failed service_area_restriction"); + goto end; + } } core_network_type_restrictions = cJSON_GetObjectItemCaseSensitive(plmn_restriction_1JSON, "coreNetworkTypeRestrictions");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_route_selection_descriptor.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_route_selection_descriptor.c
Changed
@@ -99,6 +99,10 @@ goto end; } serving_plmn_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(serving_plmn); + if (!serving_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed serving_plmn"); + goto end; + } snssai_route_sel_descs = cJSON_GetObjectItemCaseSensitive(plmn_route_selection_descriptorJSON, "snssaiRouteSelDescs"); if (snssai_route_sel_descs) { @@ -118,7 +122,6 @@ OpenAPI_snssai_route_selection_descriptor_t *snssai_route_sel_descsItem = OpenAPI_snssai_route_selection_descriptor_parseFromJSON(snssai_route_sel_descs_local); if (!snssai_route_sel_descsItem) { ogs_error("No snssai_route_sel_descsItem"); - OpenAPI_list_free(snssai_route_sel_descsList); goto end; } OpenAPI_list_add(snssai_route_sel_descsList, snssai_route_sel_descsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/plmn_snssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/plmn_snssai.c
Changed
@@ -115,6 +115,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } s_nssai_list = cJSON_GetObjectItemCaseSensitive(plmn_snssaiJSON, "sNssaiList"); if (!s_nssai_list) { @@ -137,7 +141,6 @@ OpenAPI_ext_snssai_t *s_nssai_listItem = OpenAPI_ext_snssai_parseFromJSON(s_nssai_list_local); if (!s_nssai_listItem) { ogs_error("No s_nssai_listItem"); - OpenAPI_list_free(s_nssai_listList); goto end; } OpenAPI_list_add(s_nssai_listList, s_nssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point.c
Changed
@@ -95,6 +95,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(pointJSON, "point"); if (!point) { @@ -102,6 +106,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } point_local_var = OpenAPI_point_create ( shape_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_all_of.c
Changed
@@ -72,6 +72,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } point_all_of_local_var = OpenAPI_point_all_of_create ( point_local_nonprim
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_altitude.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_altitude.c
Changed
@@ -103,6 +103,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(point_altitudeJSON, "point"); if (!point) { @@ -110,6 +114,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } altitude = cJSON_GetObjectItemCaseSensitive(point_altitudeJSON, "altitude"); if (!altitude) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_altitude_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_altitude_all_of.c
Changed
@@ -80,6 +80,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } altitude = cJSON_GetObjectItemCaseSensitive(point_altitude_all_ofJSON, "altitude"); if (!altitude) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_altitude_uncertainty.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_altitude_uncertainty.c
Changed
@@ -142,6 +142,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(point_altitude_uncertaintyJSON, "point"); if (!point) { @@ -149,6 +153,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } altitude = cJSON_GetObjectItemCaseSensitive(point_altitude_uncertaintyJSON, "altitude"); if (!altitude) { @@ -166,6 +174,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } uncertainty_altitude = cJSON_GetObjectItemCaseSensitive(point_altitude_uncertaintyJSON, "uncertaintyAltitude"); if (!uncertainty_altitude) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_altitude_uncertainty_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_altitude_uncertainty_all_of.c
Changed
@@ -119,6 +119,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } altitude = cJSON_GetObjectItemCaseSensitive(point_altitude_uncertainty_all_ofJSON, "altitude"); if (!altitude) { @@ -136,6 +140,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } uncertainty_altitude = cJSON_GetObjectItemCaseSensitive(point_altitude_uncertainty_all_ofJSON, "uncertaintyAltitude"); if (!uncertainty_altitude) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_uncertainty_circle.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_uncertainty_circle.c
Changed
@@ -103,6 +103,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(point_uncertainty_circleJSON, "point"); if (!point) { @@ -110,6 +114,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } uncertainty = cJSON_GetObjectItemCaseSensitive(point_uncertainty_circleJSON, "uncertainty"); if (!uncertainty) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_uncertainty_circle_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_uncertainty_circle_all_of.c
Changed
@@ -80,6 +80,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } uncertainty = cJSON_GetObjectItemCaseSensitive(point_uncertainty_circle_all_ofJSON, "uncertainty"); if (!uncertainty) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_uncertainty_ellipse.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_uncertainty_ellipse.c
Changed
@@ -126,6 +126,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point = cJSON_GetObjectItemCaseSensitive(point_uncertainty_ellipseJSON, "point"); if (!point) { @@ -133,6 +137,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } uncertainty_ellipse = cJSON_GetObjectItemCaseSensitive(point_uncertainty_ellipseJSON, "uncertaintyEllipse"); if (!uncertainty_ellipse) { @@ -140,6 +148,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(point_uncertainty_ellipseJSON, "confidence"); if (!confidence) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/point_uncertainty_ellipse_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/point_uncertainty_ellipse_all_of.c
Changed
@@ -103,6 +103,10 @@ goto end; } point_local_nonprim = OpenAPI_geographical_coordinates_parseFromJSON(point); + if (!point_local_nonprim) { + ogs_error("OpenAPI_geographical_coordinates_parseFromJSON failed point"); + goto end; + } uncertainty_ellipse = cJSON_GetObjectItemCaseSensitive(point_uncertainty_ellipse_all_ofJSON, "uncertaintyEllipse"); if (!uncertainty_ellipse) { @@ -110,6 +114,10 @@ goto end; } uncertainty_ellipse_local_nonprim = OpenAPI_uncertainty_ellipse_parseFromJSON(uncertainty_ellipse); + if (!uncertainty_ellipse_local_nonprim) { + ogs_error("OpenAPI_uncertainty_ellipse_parseFromJSON failed uncertainty_ellipse"); + goto end; + } confidence = cJSON_GetObjectItemCaseSensitive(point_uncertainty_ellipse_all_ofJSON, "confidence"); if (!confidence) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_association.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_association.c
Changed
@@ -345,6 +345,10 @@ request = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "request"); if (request) { request_local_nonprim = OpenAPI_policy_association_request_parseFromJSON(request); + if (!request_local_nonprim) { + ogs_error("OpenAPI_policy_association_request_parseFromJSON failed request"); + goto end; + } } triggers = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "triggers"); @@ -369,11 +373,19 @@ serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "servAreaRes"); if (serv_area_res) { serv_area_res_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(serv_area_res); + if (!serv_area_res_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed serv_area_res"); + goto end; + } } wl_serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "wlServAreaRes"); if (wl_serv_area_res) { wl_serv_area_res_local_nonprim = OpenAPI_wireline_service_area_restriction_parseFromJSON(wl_serv_area_res); + if (!wl_serv_area_res_local_nonprim) { + ogs_error("OpenAPI_wireline_service_area_restriction_parseFromJSON failed wl_serv_area_res"); + goto end; + } } rfsp = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "rfsp"); @@ -395,11 +407,19 @@ smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "smfSelInfo"); if (smf_sel_info) { smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info); + if (!smf_sel_info_local_nonprim) { + ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed smf_sel_info"); + goto end; + } } ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "ueAmbr"); if (ue_ambr) { ue_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(ue_ambr); + if (!ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed ue_ambr"); + goto end; + } } ue_slice_mbrs = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "ueSliceMbrs"); @@ -420,7 +440,6 @@ OpenAPI_ue_slice_mbr_t *ue_slice_mbrsItem = OpenAPI_ue_slice_mbr_parseFromJSON(ue_slice_mbrs_local); if (!ue_slice_mbrsItem) { ogs_error("No ue_slice_mbrsItem"); - OpenAPI_list_free(ue_slice_mbrsList); goto end; } OpenAPI_list_add(ue_slice_mbrsList, ue_slice_mbrsItem); @@ -466,6 +485,10 @@ pcf_ue_info = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "pcfUeInfo"); if (pcf_ue_info) { pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info); + if (!pcf_ue_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_info"); + goto end; + } } match_pdus = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "matchPdus"); @@ -486,7 +509,6 @@ OpenAPI_pdu_session_info_t *match_pdusItem = OpenAPI_pdu_session_info_parseFromJSON(match_pdus_local); if (!match_pdusItem) { ogs_error("No match_pdusItem"); - OpenAPI_list_free(match_pdusList); goto end; } OpenAPI_list_add(match_pdusList, match_pdusItem); @@ -496,6 +518,10 @@ as_time_dis_param = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "asTimeDisParam"); if (as_time_dis_param) { as_time_dis_param_local_nonprim = OpenAPI_as_time_distribution_param_parseFromJSON(as_time_dis_param); + if (!as_time_dis_param_local_nonprim) { + ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON failed as_time_dis_param"); + goto end; + } } policy_association_local_var = OpenAPI_policy_association_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_association_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_association_request.c
Changed
@@ -764,6 +764,10 @@ user_loc = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "userLoc"); if (user_loc) { user_loc_local_nonprim = OpenAPI_user_location_parseFromJSON(user_loc); + if (!user_loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_loc"); + goto end; + } } time_zone = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "timeZone"); @@ -777,6 +781,10 @@ serving_plmn = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "servingPlmn"); if (serving_plmn) { serving_plmn_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_plmn); + if (!serving_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_plmn"); + goto end; + } } rat_type = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "ratType"); @@ -831,11 +839,19 @@ serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "servAreaRes"); if (serv_area_res) { serv_area_res_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(serv_area_res); + if (!serv_area_res_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed serv_area_res"); + goto end; + } } wl_serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "wlServAreaRes"); if (wl_serv_area_res) { wl_serv_area_res_local_nonprim = OpenAPI_wireline_service_area_restriction_parseFromJSON(wl_serv_area_res); + if (!wl_serv_area_res_local_nonprim) { + ogs_error("OpenAPI_wireline_service_area_restriction_parseFromJSON failed wl_serv_area_res"); + goto end; + } } rfsp = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "rfsp"); @@ -849,6 +865,10 @@ ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "ueAmbr"); if (ue_ambr) { ue_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(ue_ambr); + if (!ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed ue_ambr"); + goto end; + } } ue_slice_mbrs = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "ueSliceMbrs"); @@ -869,7 +889,6 @@ OpenAPI_ue_slice_mbr_t *ue_slice_mbrsItem = OpenAPI_ue_slice_mbr_parseFromJSON(ue_slice_mbrs_local); if (!ue_slice_mbrsItem) { ogs_error("No ue_slice_mbrsItem"); - OpenAPI_list_free(ue_slice_mbrsList); goto end; } OpenAPI_list_add(ue_slice_mbrsList, ue_slice_mbrsItem); @@ -894,7 +913,6 @@ OpenAPI_snssai_t *allowed_snssaisItem = OpenAPI_snssai_parseFromJSON(allowed_snssais_local); if (!allowed_snssaisItem) { ogs_error("No allowed_snssaisItem"); - OpenAPI_list_free(allowed_snssaisList); goto end; } OpenAPI_list_add(allowed_snssaisList, allowed_snssaisItem); @@ -919,7 +937,6 @@ OpenAPI_snssai_t *target_snssaisItem = OpenAPI_snssai_parseFromJSON(target_snssais_local); if (!target_snssaisItem) { ogs_error("No target_snssaisItem"); - OpenAPI_list_free(target_snssaisList); goto end; } OpenAPI_list_add(target_snssaisList, target_snssaisItem); @@ -944,7 +961,6 @@ OpenAPI_mapping_of_snssai_t *mapping_snssaisItem = OpenAPI_mapping_of_snssai_parseFromJSON(mapping_snssais_local); if (!mapping_snssaisItem) { ogs_error("No mapping_snssaisItem"); - OpenAPI_list_free(mapping_snssaisList); goto end; } OpenAPI_list_add(mapping_snssaisList, mapping_snssaisItem); @@ -969,7 +985,6 @@ OpenAPI_snssai_t *n3g_allowed_snssaisItem = OpenAPI_snssai_parseFromJSON(n3g_allowed_snssais_local); if (!n3g_allowed_snssaisItem) { ogs_error("No n3g_allowed_snssaisItem"); - OpenAPI_list_free(n3g_allowed_snssaisList); goto end; } OpenAPI_list_add(n3g_allowed_snssaisList, n3g_allowed_snssaisItem); @@ -979,6 +994,10 @@ guami = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } service_name = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "serviceName"); @@ -992,6 +1011,10 @@ trace_req = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "traceReq"); if (trace_req) { trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req); + if (!trace_req_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_req"); + goto end; + } } nwdaf_datas = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "nwdafDatas"); @@ -1012,7 +1035,6 @@ OpenAPI_nwdaf_data_t *nwdaf_datasItem = OpenAPI_nwdaf_data_parseFromJSON(nwdaf_datas_local); if (!nwdaf_datasItem) { ogs_error("No nwdaf_datasItem"); - OpenAPI_list_free(nwdaf_datasList); goto end; } OpenAPI_list_add(nwdaf_datasList, nwdaf_datasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_association_update_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_association_update_request.c
Changed
@@ -648,11 +648,19 @@ serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "servAreaRes"); if (serv_area_res) { serv_area_res_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(serv_area_res); + if (!serv_area_res_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed serv_area_res"); + goto end; + } } wl_serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "wlServAreaRes"); if (wl_serv_area_res) { wl_serv_area_res_local_nonprim = OpenAPI_wireline_service_area_restriction_parseFromJSON(wl_serv_area_res); + if (!wl_serv_area_res_local_nonprim) { + ogs_error("OpenAPI_wireline_service_area_restriction_parseFromJSON failed wl_serv_area_res"); + goto end; + } } rfsp = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "rfsp"); @@ -666,11 +674,19 @@ smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "smfSelInfo"); if (smf_sel_info) { smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info); + if (!smf_sel_info_local_nonprim) { + ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed smf_sel_info"); + goto end; + } } ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "ueAmbr"); if (ue_ambr) { ue_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(ue_ambr); + if (!ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed ue_ambr"); + goto end; + } } ue_slice_mbrs = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "ueSliceMbrs"); @@ -691,7 +707,6 @@ OpenAPI_ue_slice_mbr_t *ue_slice_mbrsItem = OpenAPI_ue_slice_mbr_parseFromJSON(ue_slice_mbrs_local); if (!ue_slice_mbrsItem) { ogs_error("No ue_slice_mbrsItem"); - OpenAPI_list_free(ue_slice_mbrsList); goto end; } OpenAPI_list_add(ue_slice_mbrsList, ue_slice_mbrsItem); @@ -727,6 +742,10 @@ user_loc = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "userLoc"); if (user_loc) { user_loc_local_nonprim = OpenAPI_user_location_parseFromJSON(user_loc); + if (!user_loc_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_loc"); + goto end; + } } allowed_snssais = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "allowedSnssais"); @@ -747,7 +766,6 @@ OpenAPI_snssai_t *allowed_snssaisItem = OpenAPI_snssai_parseFromJSON(allowed_snssais_local); if (!allowed_snssaisItem) { ogs_error("No allowed_snssaisItem"); - OpenAPI_list_free(allowed_snssaisList); goto end; } OpenAPI_list_add(allowed_snssaisList, allowed_snssaisItem); @@ -772,7 +790,6 @@ OpenAPI_snssai_t *target_snssaisItem = OpenAPI_snssai_parseFromJSON(target_snssais_local); if (!target_snssaisItem) { ogs_error("No target_snssaisItem"); - OpenAPI_list_free(target_snssaisList); goto end; } OpenAPI_list_add(target_snssaisList, target_snssaisItem); @@ -797,7 +814,6 @@ OpenAPI_mapping_of_snssai_t *mapping_snssaisItem = OpenAPI_mapping_of_snssai_parseFromJSON(mapping_snssais_local); if (!mapping_snssaisItem) { ogs_error("No mapping_snssaisItem"); - OpenAPI_list_free(mapping_snssaisList); goto end; } OpenAPI_list_add(mapping_snssaisList, mapping_snssaisItem); @@ -860,7 +876,6 @@ OpenAPI_snssai_t *n3g_allowed_snssaisItem = OpenAPI_snssai_parseFromJSON(n3g_allowed_snssais_local); if (!n3g_allowed_snssaisItem) { ogs_error("No n3g_allowed_snssaisItem"); - OpenAPI_list_free(n3g_allowed_snssaisList); goto end; } OpenAPI_list_add(n3g_allowed_snssaisList, n3g_allowed_snssaisItem); @@ -870,11 +885,19 @@ trace_req = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "traceReq"); if (trace_req) { trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req); + if (!trace_req_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_req"); + goto end; + } } guami = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } nwdaf_datas = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "nwdafDatas"); @@ -895,7 +918,6 @@ OpenAPI_nwdaf_data_t *nwdaf_datasItem = OpenAPI_nwdaf_data_parseFromJSON(nwdaf_datas_local); if (!nwdaf_datasItem) { ogs_error("No nwdaf_datasItem"); - OpenAPI_list_free(nwdaf_datasList); goto end; } OpenAPI_list_add(nwdaf_datasList, nwdaf_datasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_data_change_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_data_change_notification.c
Changed
@@ -435,41 +435,73 @@ am_policy_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "amPolicyData"); if (am_policy_data) { am_policy_data_local_nonprim = OpenAPI_am_policy_data_parseFromJSON(am_policy_data); + if (!am_policy_data_local_nonprim) { + ogs_error("OpenAPI_am_policy_data_parseFromJSON failed am_policy_data"); + goto end; + } } ue_policy_set = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "uePolicySet"); if (ue_policy_set) { ue_policy_set_local_nonprim = OpenAPI_ue_policy_set_parseFromJSON(ue_policy_set); + if (!ue_policy_set_local_nonprim) { + ogs_error("OpenAPI_ue_policy_set_parseFromJSON failed ue_policy_set"); + goto end; + } } plmn_ue_policy_set = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "plmnUePolicySet"); if (plmn_ue_policy_set) { plmn_ue_policy_set_local_nonprim = OpenAPI_ue_policy_set_parseFromJSON(plmn_ue_policy_set); + if (!plmn_ue_policy_set_local_nonprim) { + ogs_error("OpenAPI_ue_policy_set_parseFromJSON failed plmn_ue_policy_set"); + goto end; + } } sm_policy_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "smPolicyData"); if (sm_policy_data) { sm_policy_data_local_nonprim = OpenAPI_sm_policy_data_parseFromJSON(sm_policy_data); + if (!sm_policy_data_local_nonprim) { + ogs_error("OpenAPI_sm_policy_data_parseFromJSON failed sm_policy_data"); + goto end; + } } usage_mon_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "usageMonData"); if (usage_mon_data) { usage_mon_data_local_nonprim = OpenAPI_usage_mon_data_parseFromJSON(usage_mon_data); + if (!usage_mon_data_local_nonprim) { + ogs_error("OpenAPI_usage_mon_data_parseFromJSON failed usage_mon_data"); + goto end; + } } sponsor_connectivity_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "SponsorConnectivityData"); if (sponsor_connectivity_data) { sponsor_connectivity_data_local_nonprim = OpenAPI_sponsor_connectivity_data_parseFromJSON(sponsor_connectivity_data); + if (!sponsor_connectivity_data_local_nonprim) { + ogs_error("OpenAPI_sponsor_connectivity_data_parseFromJSON failed sponsor_connectivity_data"); + goto end; + } } bdt_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "bdtData"); if (bdt_data) { bdt_data_local_nonprim = OpenAPI_bdt_data_parseFromJSON(bdt_data); + if (!bdt_data_local_nonprim) { + ogs_error("OpenAPI_bdt_data_parseFromJSON failed bdt_data"); + goto end; + } } op_spec_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "opSpecData"); if (op_spec_data) { op_spec_data_local_nonprim = OpenAPI_operator_specific_data_container_parseFromJSON(op_spec_data); + if (!op_spec_data_local_nonprim) { + ogs_error("OpenAPI_operator_specific_data_container_parseFromJSON failed op_spec_data"); + goto end; + } } op_spec_data_map = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "opSpecDataMap"); @@ -533,6 +565,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } } del_resources = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "delResources"); @@ -582,7 +618,6 @@ OpenAPI_notification_item_t *reported_fragmentsItem = OpenAPI_notification_item_parseFromJSON(reported_fragments_local); if (!reported_fragmentsItem) { ogs_error("No reported_fragmentsItem"); - OpenAPI_list_free(reported_fragmentsList); goto end; } OpenAPI_list_add(reported_fragmentsList, reported_fragmentsItem); @@ -592,11 +627,19 @@ slice_policy_data = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "slicePolicyData"); if (slice_policy_data) { slice_policy_data_local_nonprim = OpenAPI_slice_policy_data_parseFromJSON(slice_policy_data); + if (!slice_policy_data_local_nonprim) { + ogs_error("OpenAPI_slice_policy_data_parseFromJSON failed slice_policy_data"); + goto end; + } } snssai = cJSON_GetObjectItemCaseSensitive(policy_data_change_notificationJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } policy_data_change_notification_local_var = OpenAPI_policy_data_change_notification_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_data_for_individual_ue.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_data_for_individual_ue.c
Changed
@@ -181,16 +181,28 @@ ue_policy_data_set = cJSON_GetObjectItemCaseSensitive(policy_data_for_individual_ueJSON, "uePolicyDataSet"); if (ue_policy_data_set) { ue_policy_data_set_local_nonprim = OpenAPI_ue_policy_set_parseFromJSON(ue_policy_data_set); + if (!ue_policy_data_set_local_nonprim) { + ogs_error("OpenAPI_ue_policy_set_parseFromJSON failed ue_policy_data_set"); + goto end; + } } sm_policy_data_set = cJSON_GetObjectItemCaseSensitive(policy_data_for_individual_ueJSON, "smPolicyDataSet"); if (sm_policy_data_set) { sm_policy_data_set_local_nonprim = OpenAPI_sm_policy_data_parseFromJSON(sm_policy_data_set); + if (!sm_policy_data_set_local_nonprim) { + ogs_error("OpenAPI_sm_policy_data_parseFromJSON failed sm_policy_data_set"); + goto end; + } } am_policy_data_set = cJSON_GetObjectItemCaseSensitive(policy_data_for_individual_ueJSON, "amPolicyDataSet"); if (am_policy_data_set) { am_policy_data_set_local_nonprim = OpenAPI_am_policy_data_parseFromJSON(am_policy_data_set); + if (!am_policy_data_set_local_nonprim) { + ogs_error("OpenAPI_am_policy_data_parseFromJSON failed am_policy_data_set"); + goto end; + } } um_data = cJSON_GetObjectItemCaseSensitive(policy_data_for_individual_ueJSON, "umData");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_data_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_data_subscription.c
Changed
@@ -266,7 +266,6 @@ OpenAPI_resource_item_t *mon_res_itemsItem = OpenAPI_resource_item_parseFromJSON(mon_res_items_local); if (!mon_res_itemsItem) { ogs_error("No mon_res_itemsItem"); - OpenAPI_list_free(mon_res_itemsList); goto end; } OpenAPI_list_add(mon_res_itemsList, mon_res_itemsItem); @@ -291,7 +290,6 @@ OpenAPI_resource_item_t *excluded_res_itemsItem = OpenAPI_resource_item_parseFromJSON(excluded_res_items_local); if (!excluded_res_itemsItem) { ogs_error("No excluded_res_itemsItem"); - OpenAPI_list_free(excluded_res_itemsList); goto end; } OpenAPI_list_add(excluded_res_itemsList, excluded_res_itemsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/policy_update.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/policy_update.c
Changed
@@ -353,11 +353,19 @@ serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "servAreaRes"); if (serv_area_res) { serv_area_res_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(serv_area_res); + if (!serv_area_res_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed serv_area_res"); + goto end; + } } wl_serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "wlServAreaRes"); if (wl_serv_area_res) { wl_serv_area_res_local_nonprim = OpenAPI_wireline_service_area_restriction_parseFromJSON(wl_serv_area_res); + if (!wl_serv_area_res_local_nonprim) { + ogs_error("OpenAPI_wireline_service_area_restriction_parseFromJSON failed wl_serv_area_res"); + goto end; + } } rfsp = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "rfsp"); @@ -379,11 +387,19 @@ smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "smfSelInfo"); if (smf_sel_info) { smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info); + if (!smf_sel_info_local_nonprim) { + ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed smf_sel_info"); + goto end; + } } ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "ueAmbr"); if (ue_ambr) { ue_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(ue_ambr); + if (!ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed ue_ambr"); + goto end; + } } ue_slice_mbrs = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "ueSliceMbrs"); @@ -404,7 +420,6 @@ OpenAPI_ue_slice_mbr_t *ue_slice_mbrsItem = OpenAPI_ue_slice_mbr_parseFromJSON(ue_slice_mbrs_local); if (!ue_slice_mbrsItem) { ogs_error("No ue_slice_mbrsItem"); - OpenAPI_list_free(ue_slice_mbrsList); goto end; } OpenAPI_list_add(ue_slice_mbrsList, ue_slice_mbrsItem); @@ -440,6 +455,10 @@ pcf_ue_info = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "pcfUeInfo"); if (pcf_ue_info) { pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info); + if (!pcf_ue_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_info"); + goto end; + } } match_pdus = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "matchPdus"); @@ -460,7 +479,6 @@ OpenAPI_pdu_session_info_t *match_pdusItem = OpenAPI_pdu_session_info_parseFromJSON(match_pdus_local); if (!match_pdusItem) { ogs_error("No match_pdusItem"); - OpenAPI_list_free(match_pdusList); goto end; } OpenAPI_list_add(match_pdusList, match_pdusItem); @@ -470,6 +488,10 @@ as_time_dis_param = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "asTimeDisParam"); if (as_time_dis_param) { as_time_dis_param_local_nonprim = OpenAPI_as_time_distribution_param_parseFromJSON(as_time_dis_param); + if (!as_time_dis_param_local_nonprim) { + ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON failed as_time_dis_param"); + goto end; + } } policy_update_local_var = OpenAPI_policy_update_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/polygon.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/polygon.c
Changed
@@ -101,6 +101,10 @@ goto end; } shape_local_nonprim = OpenAPI_supported_gad_shapes_parseFromJSON(shape); + if (!shape_local_nonprim) { + ogs_error("OpenAPI_supported_gad_shapes_parseFromJSON failed shape"); + goto end; + } point_list = cJSON_GetObjectItemCaseSensitive(polygonJSON, "pointList"); if (!point_list) { @@ -123,7 +127,6 @@ OpenAPI_geographical_coordinates_t *point_listItem = OpenAPI_geographical_coordinates_parseFromJSON(point_list_local); if (!point_listItem) { ogs_error("No point_listItem"); - OpenAPI_list_free(point_listList); goto end; } OpenAPI_list_add(point_listList, point_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/polygon_all_of.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/polygon_all_of.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_geographical_coordinates_t *point_listItem = OpenAPI_geographical_coordinates_parseFromJSON(point_list_local); if (!point_listItem) { ogs_error("No point_listItem"); - OpenAPI_list_free(point_listList); goto end; } OpenAPI_list_add(point_listList, point_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pp_data.c
Changed
@@ -221,6 +221,10 @@ communication_characteristics = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "communicationCharacteristics"); if (communication_characteristics) { communication_characteristics_local_nonprim = OpenAPI_communication_characteristics_parseFromJSON(communication_characteristics); + if (!communication_characteristics_local_nonprim) { + ogs_error("OpenAPI_communication_characteristics_parseFromJSON failed communication_characteristics"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "supportedFeatures"); @@ -234,16 +238,28 @@ expected_ue_behaviour_parameters = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "expectedUeBehaviourParameters"); if (expected_ue_behaviour_parameters) { expected_ue_behaviour_parameters_local_nonprim = OpenAPI_expected_ue_behaviour_parseFromJSON(expected_ue_behaviour_parameters); + if (!expected_ue_behaviour_parameters_local_nonprim) { + ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON failed expected_ue_behaviour_parameters"); + goto end; + } } ec_restriction = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "ecRestriction"); if (ec_restriction) { ec_restriction_local_nonprim = OpenAPI_ec_restriction_parseFromJSON(ec_restriction); + if (!ec_restriction_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_parseFromJSON failed ec_restriction"); + goto end; + } } acs_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "acsInfo"); if (acs_info) { acs_info_local_nonprim = OpenAPI_acs_info_rm_parseFromJSON(acs_info); + if (!acs_info_local_nonprim) { + ogs_error("OpenAPI_acs_info_rm_parseFromJSON failed acs_info"); + goto end; + } } stn_sr = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "stnSr"); @@ -257,16 +273,28 @@ lcs_privacy = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "lcsPrivacy"); if (lcs_privacy) { lcs_privacy_local_nonprim = OpenAPI_lcs_privacy_parseFromJSON(lcs_privacy); + if (!lcs_privacy_local_nonprim) { + ogs_error("OpenAPI_lcs_privacy_parseFromJSON failed lcs_privacy"); + goto end; + } } sor_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "sorInfo"); if (sor_info) { sor_info_local_nonprim = OpenAPI_sor_info_parseFromJSON(sor_info); + if (!sor_info_local_nonprim) { + ogs_error("OpenAPI_sor_info_parseFromJSON failed sor_info"); + goto end; + } } _5mbs_authorization_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "5mbsAuthorizationInfo"); if (_5mbs_authorization_info) { _5mbs_authorization_info_local_nonprim = OpenAPI_model_5_mbs_authorization_info_parseFromJSON(_5mbs_authorization_info); + if (!_5mbs_authorization_info_local_nonprim) { + ogs_error("OpenAPI_model_5_mbs_authorization_info_parseFromJSON failed _5mbs_authorization_info"); + goto end; + } } pp_data_local_var = OpenAPI_pp_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pp_data_entry.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pp_data_entry.c
Changed
@@ -190,6 +190,10 @@ communication_characteristics = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "communicationCharacteristics"); if (communication_characteristics) { communication_characteristics_local_nonprim = OpenAPI_communication_characteristics_af_parseFromJSON(communication_characteristics); + if (!communication_characteristics_local_nonprim) { + ogs_error("OpenAPI_communication_characteristics_af_parseFromJSON failed communication_characteristics"); + goto end; + } } reference_id = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "referenceId"); @@ -227,6 +231,10 @@ ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "ecsAddrConfigInfo"); if (ecs_addr_config_info) { ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_1_parseFromJSON(ecs_addr_config_info); + if (!ecs_addr_config_info_local_nonprim) { + ogs_error("OpenAPI_ecs_addr_config_info_1_parseFromJSON failed ecs_addr_config_info"); + goto end; + } } additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "additionalEcsAddrConfigInfos"); @@ -247,7 +255,6 @@ OpenAPI_ecs_addr_config_info_1_t *additional_ecs_addr_config_infosItem = OpenAPI_ecs_addr_config_info_1_parseFromJSON(additional_ecs_addr_config_infos_local); if (!additional_ecs_addr_config_infosItem) { ogs_error("No additional_ecs_addr_config_infosItem"); - OpenAPI_list_free(additional_ecs_addr_config_infosList); goto end; } OpenAPI_list_add(additional_ecs_addr_config_infosList, additional_ecs_addr_config_infosItem); @@ -257,6 +264,10 @@ ec_restriction = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "ecRestriction"); if (ec_restriction) { ec_restriction_local_nonprim = OpenAPI_ec_restriction_1_parseFromJSON(ec_restriction); + if (!ec_restriction_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_1_parseFromJSON failed ec_restriction"); + goto end; + } } pp_data_entry_local_var = OpenAPI_pp_data_entry_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pp_data_entry_list.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pp_data_entry_list.c
Changed
@@ -102,7 +102,6 @@ OpenAPI_pp_data_entry_t *pp_data_entry_listItem = OpenAPI_pp_data_entry_parseFromJSON(pp_data_entry_list_local); if (!pp_data_entry_listItem) { ogs_error("No pp_data_entry_listItem"); - OpenAPI_list_free(pp_data_entry_listList); goto end; } OpenAPI_list_add(pp_data_entry_listList, pp_data_entry_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pp_dl_packet_count_ext.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pp_dl_packet_count_ext.c
Changed
@@ -161,6 +161,10 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(pp_dl_packet_count_extJSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } validity_time = cJSON_GetObjectItemCaseSensitive(pp_dl_packet_count_extJSON, "validityTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/presence_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/presence_info.c
Changed
@@ -260,7 +260,6 @@ OpenAPI_tai_t *tracking_area_listItem = OpenAPI_tai_parseFromJSON(tracking_area_list_local); if (!tracking_area_listItem) { ogs_error("No tracking_area_listItem"); - OpenAPI_list_free(tracking_area_listList); goto end; } OpenAPI_list_add(tracking_area_listList, tracking_area_listItem); @@ -285,7 +284,6 @@ OpenAPI_ecgi_t *ecgi_listItem = OpenAPI_ecgi_parseFromJSON(ecgi_list_local); if (!ecgi_listItem) { ogs_error("No ecgi_listItem"); - OpenAPI_list_free(ecgi_listList); goto end; } OpenAPI_list_add(ecgi_listList, ecgi_listItem); @@ -310,7 +308,6 @@ OpenAPI_ncgi_t *ncgi_listItem = OpenAPI_ncgi_parseFromJSON(ncgi_list_local); if (!ncgi_listItem) { ogs_error("No ncgi_listItem"); - OpenAPI_list_free(ncgi_listList); goto end; } OpenAPI_list_add(ncgi_listList, ncgi_listItem); @@ -335,7 +332,6 @@ OpenAPI_global_ran_node_id_t *global_ran_node_id_listItem = OpenAPI_global_ran_node_id_parseFromJSON(global_ran_node_id_list_local); if (!global_ran_node_id_listItem) { ogs_error("No global_ran_node_id_listItem"); - OpenAPI_list_free(global_ran_node_id_listList); goto end; } OpenAPI_list_add(global_ran_node_id_listList, global_ran_node_id_listItem); @@ -360,7 +356,6 @@ OpenAPI_global_ran_node_id_t *globale_nb_id_listItem = OpenAPI_global_ran_node_id_parseFromJSON(globale_nb_id_list_local); if (!globale_nb_id_listItem) { ogs_error("No globale_nb_id_listItem"); - OpenAPI_list_free(globale_nb_id_listList); goto end; } OpenAPI_list_add(globale_nb_id_listList, globale_nb_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/presence_info_rm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/presence_info_rm.c
Changed
@@ -260,7 +260,6 @@ OpenAPI_tai_t *tracking_area_listItem = OpenAPI_tai_parseFromJSON(tracking_area_list_local); if (!tracking_area_listItem) { ogs_error("No tracking_area_listItem"); - OpenAPI_list_free(tracking_area_listList); goto end; } OpenAPI_list_add(tracking_area_listList, tracking_area_listItem); @@ -285,7 +284,6 @@ OpenAPI_ecgi_t *ecgi_listItem = OpenAPI_ecgi_parseFromJSON(ecgi_list_local); if (!ecgi_listItem) { ogs_error("No ecgi_listItem"); - OpenAPI_list_free(ecgi_listList); goto end; } OpenAPI_list_add(ecgi_listList, ecgi_listItem); @@ -310,7 +308,6 @@ OpenAPI_ncgi_t *ncgi_listItem = OpenAPI_ncgi_parseFromJSON(ncgi_list_local); if (!ncgi_listItem) { ogs_error("No ncgi_listItem"); - OpenAPI_list_free(ncgi_listList); goto end; } OpenAPI_list_add(ncgi_listList, ncgi_listItem); @@ -335,7 +332,6 @@ OpenAPI_global_ran_node_id_t *global_ran_node_id_listItem = OpenAPI_global_ran_node_id_parseFromJSON(global_ran_node_id_list_local); if (!global_ran_node_id_listItem) { ogs_error("No global_ran_node_id_listItem"); - OpenAPI_list_free(global_ran_node_id_listList); goto end; } OpenAPI_list_add(global_ran_node_id_listList, global_ran_node_id_listItem); @@ -360,7 +356,6 @@ OpenAPI_global_ran_node_id_t *globale_nb_id_listItem = OpenAPI_global_ran_node_id_parseFromJSON(globale_nb_id_list_local); if (!globale_nb_id_listItem) { ogs_error("No globale_nb_id_listItem"); - OpenAPI_list_free(globale_nb_id_listList); goto end; } OpenAPI_list_add(globale_nb_id_listList, globale_nb_id_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/prev_sub_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/prev_sub_info.c
Changed
@@ -185,7 +185,6 @@ OpenAPI_nwdaf_event_t *nf_ana_eventsItem = OpenAPI_nwdaf_event_parseFromJSON(nf_ana_events_local); if (!nf_ana_eventsItem) { ogs_error("No nf_ana_eventsItem"); - OpenAPI_list_free(nf_ana_eventsList); goto end; } OpenAPI_list_add(nf_ana_eventsList, nf_ana_eventsItem); @@ -210,7 +209,6 @@ OpenAPI_ue_analytics_context_descriptor_t *ue_ana_eventsItem = OpenAPI_ue_analytics_context_descriptor_parseFromJSON(ue_ana_events_local); if (!ue_ana_eventsItem) { ogs_error("No ue_ana_eventsItem"); - OpenAPI_list_free(ue_ana_eventsList); goto end; } OpenAPI_list_add(ue_ana_eventsList, ue_ana_eventsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pro_se_allowed_plmn.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pro_se_allowed_plmn.c
Changed
@@ -94,6 +94,10 @@ goto end; } visited_plmn_local_nonprim = OpenAPI_plmn_id_parseFromJSON(visited_plmn); + if (!visited_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed visited_plmn"); + goto end; + } prose_direct_allowed = cJSON_GetObjectItemCaseSensitive(pro_se_allowed_plmnJSON, "proseDirectAllowed"); if (prose_direct_allowed) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pro_se_authentication_ctx.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pro_se_authentication_ctx.c
Changed
@@ -176,6 +176,10 @@ goto end; } pro_se_auth_data_local_nonprim = OpenAPI_pro_se_auth_data_parseFromJSON(pro_se_auth_data); + if (!pro_se_auth_data_local_nonprim) { + ogs_error("OpenAPI_pro_se_auth_data_parseFromJSON failed pro_se_auth_data"); + goto end; + } supported_features = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_ctxJSON, "supportedFeatures"); if (supported_features) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pro_se_authentication_info_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pro_se_authentication_info_request.c
Changed
@@ -125,6 +125,10 @@ resynchronization_info = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_info_requestJSON, "resynchronizationInfo"); if (resynchronization_info) { resynchronization_info_local_nonprim = OpenAPI_resynchronization_info_parseFromJSON(resynchronization_info); + if (!resynchronization_info_local_nonprim) { + ogs_error("OpenAPI_resynchronization_info_parseFromJSON failed resynchronization_info"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_info_requestJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pro_se_authentication_info_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pro_se_authentication_info_result.c
Changed
@@ -119,6 +119,10 @@ prose_authentication_vectors = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_info_resultJSON, "proseAuthenticationVectors"); if (prose_authentication_vectors) { prose_authentication_vectors_local_nonprim = OpenAPI_pro_se_authentication_vectors_parseFromJSON(prose_authentication_vectors); + if (!prose_authentication_vectors_local_nonprim) { + ogs_error("OpenAPI_pro_se_authentication_vectors_parseFromJSON failed prose_authentication_vectors"); + goto end; + } } supi = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_info_resultJSON, "supi");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pro_se_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pro_se_information.c
Changed
@@ -67,6 +67,10 @@ n2_pc5_pro_se_pol = cJSON_GetObjectItemCaseSensitive(pro_se_informationJSON, "n2Pc5ProSePol"); if (n2_pc5_pro_se_pol) { n2_pc5_pro_se_pol_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(n2_pc5_pro_se_pol); + if (!n2_pc5_pro_se_pol_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed n2_pc5_pro_se_pol"); + goto end; + } } pro_se_information_local_var = OpenAPI_pro_se_information_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/problem_details.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/problem_details.c
Changed
@@ -288,7 +288,6 @@ OpenAPI_invalid_param_t *invalid_paramsItem = OpenAPI_invalid_param_parseFromJSON(invalid_params_local); if (!invalid_paramsItem) { ogs_error("No invalid_paramsItem"); - OpenAPI_list_free(invalid_paramsList); goto end; } OpenAPI_list_add(invalid_paramsList, invalid_paramsItem); @@ -306,11 +305,19 @@ access_token_error = cJSON_GetObjectItemCaseSensitive(problem_detailsJSON, "accessTokenError"); if (access_token_error) { access_token_error_local_nonprim = OpenAPI_access_token_err_parseFromJSON(access_token_error); + if (!access_token_error_local_nonprim) { + ogs_error("OpenAPI_access_token_err_parseFromJSON failed access_token_error"); + goto end; + } } access_token_request = cJSON_GetObjectItemCaseSensitive(problem_detailsJSON, "accessTokenRequest"); if (access_token_request) { access_token_request_local_nonprim = OpenAPI_access_token_req_parseFromJSON(access_token_request); + if (!access_token_request_local_nonprim) { + ogs_error("OpenAPI_access_token_req_parseFromJSON failed access_token_request"); + goto end; + } } nrf_id = cJSON_GetObjectItemCaseSensitive(problem_detailsJSON, "nrfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/problem_details_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/problem_details_1.c
Changed
@@ -288,7 +288,6 @@ OpenAPI_invalid_param_t *invalid_paramsItem = OpenAPI_invalid_param_parseFromJSON(invalid_params_local); if (!invalid_paramsItem) { ogs_error("No invalid_paramsItem"); - OpenAPI_list_free(invalid_paramsList); goto end; } OpenAPI_list_add(invalid_paramsList, invalid_paramsItem); @@ -306,11 +305,19 @@ access_token_error = cJSON_GetObjectItemCaseSensitive(problem_details_1JSON, "accessTokenError"); if (access_token_error) { access_token_error_local_nonprim = OpenAPI_access_token_err_parseFromJSON(access_token_error); + if (!access_token_error_local_nonprim) { + ogs_error("OpenAPI_access_token_err_parseFromJSON failed access_token_error"); + goto end; + } } access_token_request = cJSON_GetObjectItemCaseSensitive(problem_details_1JSON, "accessTokenRequest"); if (access_token_request) { access_token_request_local_nonprim = OpenAPI_access_token_req_parseFromJSON(access_token_request); + if (!access_token_request_local_nonprim) { + ogs_error("OpenAPI_access_token_req_parseFromJSON failed access_token_request"); + goto end; + } } nrf_id = cJSON_GetObjectItemCaseSensitive(problem_details_1JSON, "nrfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/prose_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/prose_context.c
Changed
@@ -189,6 +189,10 @@ pc5_qo_s_para = cJSON_GetObjectItemCaseSensitive(prose_contextJSON, "pc5QoSPara"); if (pc5_qo_s_para) { pc5_qo_s_para_local_nonprim = OpenAPI_pc5_qo_s_para_parseFromJSON(pc5_qo_s_para); + if (!pc5_qo_s_para_local_nonprim) { + ogs_error("OpenAPI_pc5_qo_s_para_parseFromJSON failed pc5_qo_s_para"); + goto end; + } } prose_context_local_var = OpenAPI_prose_context_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/prose_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/prose_subscription_data.c
Changed
@@ -108,6 +108,10 @@ prose_service_auth = cJSON_GetObjectItemCaseSensitive(prose_subscription_dataJSON, "proseServiceAuth"); if (prose_service_auth) { prose_service_auth_local_nonprim = OpenAPI_prose_service_auth_parseFromJSON(prose_service_auth); + if (!prose_service_auth_local_nonprim) { + ogs_error("OpenAPI_prose_service_auth_parseFromJSON failed prose_service_auth"); + goto end; + } } nr_ue_pc5_ambr = cJSON_GetObjectItemCaseSensitive(prose_subscription_dataJSON, "nrUePc5Ambr"); @@ -136,7 +140,6 @@ OpenAPI_pro_se_allowed_plmn_t *prose_allowed_plmnItem = OpenAPI_pro_se_allowed_plmn_parseFromJSON(prose_allowed_plmn_local); if (!prose_allowed_plmnItem) { ogs_error("No prose_allowed_plmnItem"); - OpenAPI_list_free(prose_allowed_plmnList); goto end; } OpenAPI_list_add(prose_allowed_plmnList, prose_allowed_plmnItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/protection_policy.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/protection_policy.c
Changed
@@ -115,7 +115,6 @@ OpenAPI_api_ie_mapping_t *api_ie_mapping_listItem = OpenAPI_api_ie_mapping_parseFromJSON(api_ie_mapping_list_local); if (!api_ie_mapping_listItem) { ogs_error("No api_ie_mapping_listItem"); - OpenAPI_list_free(api_ie_mapping_listList); goto end; } OpenAPI_list_add(api_ie_mapping_listList, api_ie_mapping_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/provisioned_data_sets.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/provisioned_data_sets.c
Changed
@@ -382,81 +382,145 @@ am_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "amData"); if (am_data) { am_data_local_nonprim = OpenAPI_access_and_mobility_subscription_data_parseFromJSON(am_data); + if (!am_data_local_nonprim) { + ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON failed am_data"); + goto end; + } } smf_sel_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "smfSelData"); if (smf_sel_data) { smf_sel_data_local_nonprim = OpenAPI_smf_selection_subscription_data_parseFromJSON(smf_sel_data); + if (!smf_sel_data_local_nonprim) { + ogs_error("OpenAPI_smf_selection_subscription_data_parseFromJSON failed smf_sel_data"); + goto end; + } } sms_subs_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "smsSubsData"); if (sms_subs_data) { sms_subs_data_local_nonprim = OpenAPI_sms_subscription_data_parseFromJSON(sms_subs_data); + if (!sms_subs_data_local_nonprim) { + ogs_error("OpenAPI_sms_subscription_data_parseFromJSON failed sms_subs_data"); + goto end; + } } sm_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "smData"); if (sm_data) { sm_data_local_nonprim = OpenAPI_sm_subs_data_parseFromJSON(sm_data); + if (!sm_data_local_nonprim) { + ogs_error("OpenAPI_sm_subs_data_parseFromJSON failed sm_data"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } sms_mng_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "smsMngData"); if (sms_mng_data) { sms_mng_data_local_nonprim = OpenAPI_sms_management_subscription_data_parseFromJSON(sms_mng_data); + if (!sms_mng_data_local_nonprim) { + ogs_error("OpenAPI_sms_management_subscription_data_parseFromJSON failed sms_mng_data"); + goto end; + } } lcs_privacy_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "lcsPrivacyData"); if (lcs_privacy_data) { lcs_privacy_data_local_nonprim = OpenAPI_lcs_privacy_data_parseFromJSON(lcs_privacy_data); + if (!lcs_privacy_data_local_nonprim) { + ogs_error("OpenAPI_lcs_privacy_data_parseFromJSON failed lcs_privacy_data"); + goto end; + } } lcs_mo_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "lcsMoData"); if (lcs_mo_data) { lcs_mo_data_local_nonprim = OpenAPI_lcs_mo_data_parseFromJSON(lcs_mo_data); + if (!lcs_mo_data_local_nonprim) { + ogs_error("OpenAPI_lcs_mo_data_parseFromJSON failed lcs_mo_data"); + goto end; + } } lcs_bca_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "lcsBcaData"); if (lcs_bca_data) { lcs_bca_data_local_nonprim = OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON(lcs_bca_data); + if (!lcs_bca_data_local_nonprim) { + ogs_error("OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON failed lcs_bca_data"); + goto end; + } } v2x_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "v2xData"); if (v2x_data) { v2x_data_local_nonprim = OpenAPI_v2x_subscription_data_parseFromJSON(v2x_data); + if (!v2x_data_local_nonprim) { + ogs_error("OpenAPI_v2x_subscription_data_parseFromJSON failed v2x_data"); + goto end; + } } prose_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "proseData"); if (prose_data) { prose_data_local_nonprim = OpenAPI_prose_subscription_data_parseFromJSON(prose_data); + if (!prose_data_local_nonprim) { + ogs_error("OpenAPI_prose_subscription_data_parseFromJSON failed prose_data"); + goto end; + } } odb_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "odbData"); if (odb_data) { odb_data_local_nonprim = OpenAPI_odb_data_parseFromJSON(odb_data); + if (!odb_data_local_nonprim) { + ogs_error("OpenAPI_odb_data_parseFromJSON failed odb_data"); + goto end; + } } ee_profile_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "eeProfileData"); if (ee_profile_data) { ee_profile_data_local_nonprim = OpenAPI_ee_profile_data_parseFromJSON(ee_profile_data); + if (!ee_profile_data_local_nonprim) { + ogs_error("OpenAPI_ee_profile_data_parseFromJSON failed ee_profile_data"); + goto end; + } } pp_profile_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "ppProfileData"); if (pp_profile_data) { pp_profile_data_local_nonprim = OpenAPI_pp_profile_data_parseFromJSON(pp_profile_data); + if (!pp_profile_data_local_nonprim) { + ogs_error("OpenAPI_pp_profile_data_parseFromJSON failed pp_profile_data"); + goto end; + } } nidd_auth_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "niddAuthData"); if (nidd_auth_data) { nidd_auth_data_local_nonprim = OpenAPI_authorization_data_parseFromJSON(nidd_auth_data); + if (!nidd_auth_data_local_nonprim) { + ogs_error("OpenAPI_authorization_data_parseFromJSON failed nidd_auth_data"); + goto end; + } } mbs_subscription_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "mbsSubscriptionData"); if (mbs_subscription_data) { mbs_subscription_data_local_nonprim = OpenAPI_mbs_subscription_data_1_parseFromJSON(mbs_subscription_data); + if (!mbs_subscription_data_local_nonprim) { + ogs_error("OpenAPI_mbs_subscription_data_1_parseFromJSON failed mbs_subscription_data"); + goto end; + } } provisioned_data_sets_local_var = OpenAPI_provisioned_data_sets_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pws_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pws_information.c
Changed
@@ -175,6 +175,10 @@ goto end; } pws_container_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(pws_container); + if (!pws_container_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed pws_container"); + goto end; + } bc_empty_area_list = cJSON_GetObjectItemCaseSensitive(pws_informationJSON, "bcEmptyAreaList"); if (bc_empty_area_list) { @@ -194,7 +198,6 @@ OpenAPI_global_ran_node_id_t *bc_empty_area_listItem = OpenAPI_global_ran_node_id_parseFromJSON(bc_empty_area_list_local); if (!bc_empty_area_listItem) { ogs_error("No bc_empty_area_listItem"); - OpenAPI_list_free(bc_empty_area_listList); goto end; } OpenAPI_list_add(bc_empty_area_listList, bc_empty_area_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/pws_response_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/pws_response_data.c
Changed
@@ -142,7 +142,6 @@ OpenAPI_tai_t *unknown_tai_listItem = OpenAPI_tai_parseFromJSON(unknown_tai_list_local); if (!unknown_tai_listItem) { ogs_error("No unknown_tai_listItem"); - OpenAPI_list_free(unknown_tai_listList); goto end; } OpenAPI_list_add(unknown_tai_listList, unknown_tai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_data.c
Changed
@@ -363,6 +363,10 @@ arp = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "arp"); if (arp) { arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } } qnc = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "qnc");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_flow_add_modify_request_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_flow_add_modify_request_item.c
Changed
@@ -160,6 +160,10 @@ qos_flow_profile = cJSON_GetObjectItemCaseSensitive(qos_flow_add_modify_request_itemJSON, "qosFlowProfile"); if (qos_flow_profile) { qos_flow_profile_local_nonprim = OpenAPI_qos_flow_profile_parseFromJSON(qos_flow_profile); + if (!qos_flow_profile_local_nonprim) { + ogs_error("OpenAPI_qos_flow_profile_parseFromJSON failed qos_flow_profile"); + goto end; + } } associated_an_type = cJSON_GetObjectItemCaseSensitive(qos_flow_add_modify_request_itemJSON, "associatedAnType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_flow_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_flow_item.c
Changed
@@ -145,6 +145,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(qos_flow_itemJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } qos_flow_item_local_var = OpenAPI_qos_flow_item_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_flow_profile.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_flow_profile.c
Changed
@@ -193,21 +193,37 @@ non_dynamic5_qi = cJSON_GetObjectItemCaseSensitive(qos_flow_profileJSON, "nonDynamic5Qi"); if (non_dynamic5_qi) { non_dynamic5_qi_local_nonprim = OpenAPI_non_dynamic5_qi_parseFromJSON(non_dynamic5_qi); + if (!non_dynamic5_qi_local_nonprim) { + ogs_error("OpenAPI_non_dynamic5_qi_parseFromJSON failed non_dynamic5_qi"); + goto end; + } } dynamic5_qi = cJSON_GetObjectItemCaseSensitive(qos_flow_profileJSON, "dynamic5Qi"); if (dynamic5_qi) { dynamic5_qi_local_nonprim = OpenAPI_dynamic5_qi_parseFromJSON(dynamic5_qi); + if (!dynamic5_qi_local_nonprim) { + ogs_error("OpenAPI_dynamic5_qi_parseFromJSON failed dynamic5_qi"); + goto end; + } } arp = cJSON_GetObjectItemCaseSensitive(qos_flow_profileJSON, "arp"); if (arp) { arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } } gbr_qos_flow_info = cJSON_GetObjectItemCaseSensitive(qos_flow_profileJSON, "gbrQosFlowInfo"); if (gbr_qos_flow_info) { gbr_qos_flow_info_local_nonprim = OpenAPI_gbr_qos_flow_information_parseFromJSON(gbr_qos_flow_info); + if (!gbr_qos_flow_info_local_nonprim) { + ogs_error("OpenAPI_gbr_qos_flow_information_parseFromJSON failed gbr_qos_flow_info"); + goto end; + } } rqa = cJSON_GetObjectItemCaseSensitive(qos_flow_profileJSON, "rqa");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_flow_setup_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_flow_setup_item.c
Changed
@@ -176,6 +176,10 @@ qos_flow_profile = cJSON_GetObjectItemCaseSensitive(qos_flow_setup_itemJSON, "qosFlowProfile"); if (qos_flow_profile) { qos_flow_profile_local_nonprim = OpenAPI_qos_flow_profile_parseFromJSON(qos_flow_profile); + if (!qos_flow_profile_local_nonprim) { + ogs_error("OpenAPI_qos_flow_profile_parseFromJSON failed qos_flow_profile"); + goto end; + } } associated_an_type = cJSON_GetObjectItemCaseSensitive(qos_flow_setup_itemJSON, "associatedAnType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_flow_tunnel.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_flow_tunnel.c
Changed
@@ -128,6 +128,10 @@ goto end; } tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(tunnel_info); + if (!tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed tunnel_info"); + goto end; + } qos_flow_tunnel_local_var = OpenAPI_qos_flow_tunnel_create ( qfi_listList,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_monitoring_report.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_monitoring_report.c
Changed
@@ -163,7 +163,6 @@ OpenAPI_flows_t *flowsItem = OpenAPI_flows_parseFromJSON(flows_local); if (!flowsItem) { ogs_error("No flowsItem"); - OpenAPI_list_free(flowsList); goto end; } OpenAPI_list_add(flowsList, flowsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_notification_control_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_notification_control_info.c
Changed
@@ -126,7 +126,6 @@ OpenAPI_flows_t *flowsItem = OpenAPI_flows_parseFromJSON(flows_local); if (!flowsItem) { ogs_error("No flowsItem"); - OpenAPI_list_free(flowsList); goto end; } OpenAPI_list_add(flowsList, flowsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/qos_sustainability_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/qos_sustainability_info.c
Changed
@@ -163,6 +163,10 @@ area_info = cJSON_GetObjectItemCaseSensitive(qos_sustainability_infoJSON, "areaInfo"); if (area_info) { area_info_local_nonprim = OpenAPI_network_area_info_parseFromJSON(area_info); + if (!area_info_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed area_info"); + goto end; + } } start_ts = cJSON_GetObjectItemCaseSensitive(qos_sustainability_infoJSON, "startTs"); @@ -184,6 +188,10 @@ qos_flow_ret_thd = cJSON_GetObjectItemCaseSensitive(qos_sustainability_infoJSON, "qosFlowRetThd"); if (qos_flow_ret_thd) { qos_flow_ret_thd_local_nonprim = OpenAPI_retainability_threshold_parseFromJSON(qos_flow_ret_thd); + if (!qos_flow_ret_thd_local_nonprim) { + ogs_error("OpenAPI_retainability_threshold_parseFromJSON failed qos_flow_ret_thd"); + goto end; + } } ran_ue_throu_thd = cJSON_GetObjectItemCaseSensitive(qos_sustainability_infoJSON, "ranUeThrouThd"); @@ -197,6 +205,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(qos_sustainability_infoJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } confidence = cJSON_GetObjectItemCaseSensitive(qos_sustainability_infoJSON, "confidence");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/query_param_combination.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/query_param_combination.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_query_parameter_t *query_paramsItem = OpenAPI_query_parameter_parseFromJSON(query_params_local); if (!query_paramsItem) { ogs_error("No query_paramsItem"); - OpenAPI_list_free(query_paramsList); goto end; } OpenAPI_list_add(query_paramsList, query_paramsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ran_nas_rel_cause.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ran_nas_rel_cause.c
Changed
@@ -105,6 +105,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(ran_nas_rel_causeJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } _5g_mm_cause = cJSON_GetObjectItemCaseSensitive(ran_nas_rel_causeJSON, "5gMmCause");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/rat_freq_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/rat_freq_information.c
Changed
@@ -168,11 +168,19 @@ svc_exp_threshold = cJSON_GetObjectItemCaseSensitive(rat_freq_informationJSON, "svcExpThreshold"); if (svc_exp_threshold) { svc_exp_threshold_local_nonprim = OpenAPI_threshold_level_parseFromJSON(svc_exp_threshold); + if (!svc_exp_threshold_local_nonprim) { + ogs_error("OpenAPI_threshold_level_parseFromJSON failed svc_exp_threshold"); + goto end; + } } matching_dir = cJSON_GetObjectItemCaseSensitive(rat_freq_informationJSON, "matchingDir"); if (matching_dir) { matching_dir_local_nonprim = OpenAPI_matching_direction_parseFromJSON(matching_dir); + if (!matching_dir_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed matching_dir"); + goto end; + } } rat_freq_information_local_var = OpenAPI_rat_freq_information_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/reachability_for_data_configuration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/reachability_for_data_configuration.c
Changed
@@ -84,6 +84,10 @@ goto end; } report_cfg_local_nonprim = OpenAPI_reachability_for_data_report_config_parseFromJSON(report_cfg); + if (!report_cfg_local_nonprim) { + ogs_error("OpenAPI_reachability_for_data_report_config_parseFromJSON failed report_cfg"); + goto end; + } min_interval = cJSON_GetObjectItemCaseSensitive(reachability_for_data_configurationJSON, "minInterval"); if (min_interval) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/reachability_for_data_configuration_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/reachability_for_data_configuration_1.c
Changed
@@ -84,6 +84,10 @@ goto end; } report_cfg_local_nonprim = OpenAPI_reachability_for_data_report_config_parseFromJSON(report_cfg); + if (!report_cfg_local_nonprim) { + ogs_error("OpenAPI_reachability_for_data_report_config_parseFromJSON failed report_cfg"); + goto end; + } min_interval = cJSON_GetObjectItemCaseSensitive(reachability_for_data_configuration_1JSON, "minInterval"); if (min_interval) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/redundant_transmission_exp_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/redundant_transmission_exp_info.c
Changed
@@ -110,6 +110,10 @@ spatial_valid_con = cJSON_GetObjectItemCaseSensitive(redundant_transmission_exp_infoJSON, "spatialValidCon"); if (spatial_valid_con) { spatial_valid_con_local_nonprim = OpenAPI_network_area_info_parseFromJSON(spatial_valid_con); + if (!spatial_valid_con_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed spatial_valid_con"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(redundant_transmission_exp_infoJSON, "dnn"); @@ -141,7 +145,6 @@ OpenAPI_redundant_transmission_exp_per_ts_t *red_trans_expsItem = OpenAPI_redundant_transmission_exp_per_ts_parseFromJSON(red_trans_exps_local); if (!red_trans_expsItem) { ogs_error("No red_trans_expsItem"); - OpenAPI_list_free(red_trans_expsList); goto end; } OpenAPI_list_add(red_trans_expsList, red_trans_expsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/redundant_transmission_exp_per_ts.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/redundant_transmission_exp_per_ts.c
Changed
@@ -152,6 +152,10 @@ goto end; } obsv_red_trans_exp_local_nonprim = OpenAPI_observed_redundant_trans_exp_parseFromJSON(obsv_red_trans_exp); + if (!obsv_red_trans_exp_local_nonprim) { + ogs_error("OpenAPI_observed_redundant_trans_exp_parseFromJSON failed obsv_red_trans_exp"); + goto end; + } red_trans_status = cJSON_GetObjectItemCaseSensitive(redundant_transmission_exp_per_tsJSON, "redTransStatus"); if (red_trans_status) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/redundant_transmission_exp_req.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/redundant_transmission_exp_req.c
Changed
@@ -88,11 +88,19 @@ red_t_order_criter = cJSON_GetObjectItemCaseSensitive(redundant_transmission_exp_reqJSON, "redTOrderCriter"); if (red_t_order_criter) { red_t_order_criter_local_nonprim = OpenAPI_red_trans_exp_ordering_criterion_parseFromJSON(red_t_order_criter); + if (!red_t_order_criter_local_nonprim) { + ogs_error("OpenAPI_red_trans_exp_ordering_criterion_parseFromJSON failed red_t_order_criter"); + goto end; + } } order = cJSON_GetObjectItemCaseSensitive(redundant_transmission_exp_reqJSON, "order"); if (order) { order_local_nonprim = OpenAPI_matching_direction_parseFromJSON(order); + if (!order_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed order"); + goto end; + } } redundant_transmission_exp_req_local_var = OpenAPI_redundant_transmission_exp_req_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/registration_context_container.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/registration_context_container.c
Changed
@@ -445,6 +445,10 @@ goto end; } ue_context_local_nonprim = OpenAPI_ue_context_parseFromJSON(ue_context); + if (!ue_context_local_nonprim) { + ogs_error("OpenAPI_ue_context_parseFromJSON failed ue_context"); + goto end; + } local_time_zone = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "localTimeZone"); if (local_time_zone) { @@ -481,6 +485,10 @@ goto end; } ran_node_id_local_nonprim = OpenAPI_global_ran_node_id_parseFromJSON(ran_node_id); + if (!ran_node_id_local_nonprim) { + ogs_error("OpenAPI_global_ran_node_id_parseFromJSON failed ran_node_id"); + goto end; + } initial_amf_name = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "initialAmfName"); if (!initial_amf_name) { @@ -498,6 +506,10 @@ goto end; } user_location_local_nonprim = OpenAPI_user_location_parseFromJSON(user_location); + if (!user_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_location"); + goto end; + } rrc_est_cause = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "rrcEstCause"); if (rrc_est_cause) { @@ -542,6 +554,10 @@ allowed_nssai = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "allowedNssai"); if (allowed_nssai) { allowed_nssai_local_nonprim = OpenAPI_allowed_nssai_parseFromJSON(allowed_nssai); + if (!allowed_nssai_local_nonprim) { + ogs_error("OpenAPI_allowed_nssai_parseFromJSON failed allowed_nssai"); + goto end; + } } configured_nssai = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "configuredNssai"); @@ -562,7 +578,6 @@ OpenAPI_configured_snssai_t *configured_nssaiItem = OpenAPI_configured_snssai_parseFromJSON(configured_nssai_local); if (!configured_nssaiItem) { ogs_error("No configured_nssaiItem"); - OpenAPI_list_free(configured_nssaiList); goto end; } OpenAPI_list_add(configured_nssaiList, configured_nssaiItem); @@ -587,7 +602,6 @@ OpenAPI_snssai_t *rejected_nssai_in_plmnItem = OpenAPI_snssai_parseFromJSON(rejected_nssai_in_plmn_local); if (!rejected_nssai_in_plmnItem) { ogs_error("No rejected_nssai_in_plmnItem"); - OpenAPI_list_free(rejected_nssai_in_plmnList); goto end; } OpenAPI_list_add(rejected_nssai_in_plmnList, rejected_nssai_in_plmnItem); @@ -612,7 +626,6 @@ OpenAPI_snssai_t *rejected_nssai_in_taItem = OpenAPI_snssai_parseFromJSON(rejected_nssai_in_ta_local); if (!rejected_nssai_in_taItem) { ogs_error("No rejected_nssai_in_taItem"); - OpenAPI_list_free(rejected_nssai_in_taList); goto end; } OpenAPI_list_add(rejected_nssai_in_taList, rejected_nssai_in_taItem); @@ -622,6 +635,10 @@ selected_plmn_id = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "selectedPlmnId"); if (selected_plmn_id) { selected_plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(selected_plmn_id); + if (!selected_plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed selected_plmn_id"); + goto end; + } } iab_node_ind = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "iabNodeInd"); @@ -635,11 +652,19 @@ ce_mode_b_ind = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "ceModeBInd"); if (ce_mode_b_ind) { ce_mode_b_ind_local_nonprim = OpenAPI_ce_mode_b_ind_parseFromJSON(ce_mode_b_ind); + if (!ce_mode_b_ind_local_nonprim) { + ogs_error("OpenAPI_ce_mode_b_ind_parseFromJSON failed ce_mode_b_ind"); + goto end; + } } lte_m_ind = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "lteMInd"); if (lte_m_ind) { lte_m_ind_local_nonprim = OpenAPI_lte_m_ind_parseFromJSON(lte_m_ind); + if (!lte_m_ind_local_nonprim) { + ogs_error("OpenAPI_lte_m_ind_parseFromJSON failed lte_m_ind"); + goto end; + } } authenticated_ind = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "authenticatedInd"); @@ -653,6 +678,10 @@ npn_access_info = cJSON_GetObjectItemCaseSensitive(registration_context_containerJSON, "npnAccessInfo"); if (npn_access_info) { npn_access_info_local_nonprim = OpenAPI_npn_access_info_parseFromJSON(npn_access_info); + if (!npn_access_info_local_nonprim) { + ogs_error("OpenAPI_npn_access_info_parseFromJSON failed npn_access_info"); + goto end; + } } registration_context_container_local_var = OpenAPI_registration_context_container_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/registration_data_sets.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/registration_data_sets.c
Changed
@@ -193,36 +193,64 @@ amf3_gpp = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "amf3Gpp"); if (amf3_gpp) { amf3_gpp_local_nonprim = OpenAPI_amf3_gpp_access_registration_parseFromJSON(amf3_gpp); + if (!amf3_gpp_local_nonprim) { + ogs_error("OpenAPI_amf3_gpp_access_registration_parseFromJSON failed amf3_gpp"); + goto end; + } } amf_non3_gpp = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "amfNon3Gpp"); if (amf_non3_gpp) { amf_non3_gpp_local_nonprim = OpenAPI_amf_non3_gpp_access_registration_parseFromJSON(amf_non3_gpp); + if (!amf_non3_gpp_local_nonprim) { + ogs_error("OpenAPI_amf_non3_gpp_access_registration_parseFromJSON failed amf_non3_gpp"); + goto end; + } } smf_registration = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "smfRegistration"); if (smf_registration) { smf_registration_local_nonprim = OpenAPI_smf_registration_info_parseFromJSON(smf_registration); + if (!smf_registration_local_nonprim) { + ogs_error("OpenAPI_smf_registration_info_parseFromJSON failed smf_registration"); + goto end; + } } smsf3_gpp = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "smsf3Gpp"); if (smsf3_gpp) { smsf3_gpp_local_nonprim = OpenAPI_smsf_registration_parseFromJSON(smsf3_gpp); + if (!smsf3_gpp_local_nonprim) { + ogs_error("OpenAPI_smsf_registration_parseFromJSON failed smsf3_gpp"); + goto end; + } } smsf_non3_gpp = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "smsfNon3Gpp"); if (smsf_non3_gpp) { smsf_non3_gpp_local_nonprim = OpenAPI_smsf_registration_parseFromJSON(smsf_non3_gpp); + if (!smsf_non3_gpp_local_nonprim) { + ogs_error("OpenAPI_smsf_registration_parseFromJSON failed smsf_non3_gpp"); + goto end; + } } ip_sm_gw = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "ipSmGw"); if (ip_sm_gw) { ip_sm_gw_local_nonprim = OpenAPI_ip_sm_gw_registration_parseFromJSON(ip_sm_gw); + if (!ip_sm_gw_local_nonprim) { + ogs_error("OpenAPI_ip_sm_gw_registration_parseFromJSON failed ip_sm_gw"); + goto end; + } } nwdaf_registration = cJSON_GetObjectItemCaseSensitive(registration_data_setsJSON, "nwdafRegistration"); if (nwdaf_registration) { nwdaf_registration_local_nonprim = OpenAPI_nwdaf_registration_info_parseFromJSON(nwdaf_registration); + if (!nwdaf_registration_local_nonprim) { + ogs_error("OpenAPI_nwdaf_registration_info_parseFromJSON failed nwdaf_registration"); + goto end; + } } registration_data_sets_local_var = OpenAPI_registration_data_sets_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/registration_location_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/registration_location_info.c
Changed
@@ -159,16 +159,28 @@ guami = cJSON_GetObjectItemCaseSensitive(registration_location_infoJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } plmn_id = cJSON_GetObjectItemCaseSensitive(registration_location_infoJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } vgmlc_address = cJSON_GetObjectItemCaseSensitive(registration_location_infoJSON, "vgmlcAddress"); if (vgmlc_address) { vgmlc_address_local_nonprim = OpenAPI_vgmlc_address_parseFromJSON(vgmlc_address); + if (!vgmlc_address_local_nonprim) { + ogs_error("OpenAPI_vgmlc_address_parseFromJSON failed vgmlc_address"); + goto end; + } } access_type_list = cJSON_GetObjectItemCaseSensitive(registration_location_infoJSON, "accessTypeList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/release_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/release_data.c
Changed
@@ -272,6 +272,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } _5g_mm_cause_value = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "5gMmCauseValue"); @@ -285,6 +289,10 @@ ue_location = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "ueTimeZone"); @@ -298,6 +306,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } secondary_rat_usage_report = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "secondaryRatUsageReport"); @@ -318,7 +330,6 @@ OpenAPI_secondary_rat_usage_report_t *secondary_rat_usage_reportItem = OpenAPI_secondary_rat_usage_report_parseFromJSON(secondary_rat_usage_report_local); if (!secondary_rat_usage_reportItem) { ogs_error("No secondary_rat_usage_reportItem"); - OpenAPI_list_free(secondary_rat_usage_reportList); goto end; } OpenAPI_list_add(secondary_rat_usage_reportList, secondary_rat_usage_reportItem); @@ -343,7 +354,6 @@ OpenAPI_secondary_rat_usage_info_t *secondary_rat_usage_infoItem = OpenAPI_secondary_rat_usage_info_parseFromJSON(secondary_rat_usage_info_local); if (!secondary_rat_usage_infoItem) { ogs_error("No secondary_rat_usage_infoItem"); - OpenAPI_list_free(secondary_rat_usage_infoList); goto end; } OpenAPI_list_add(secondary_rat_usage_infoList, secondary_rat_usage_infoItem); @@ -353,16 +363,28 @@ n4_info = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(release_dataJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } release_data_local_var = OpenAPI_release_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/release_pdu_session_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/release_pdu_session_200_response.c
Changed
@@ -118,6 +118,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(release_pdu_session_200_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_released_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_released_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n4_information = cJSON_GetObjectItemCaseSensitive(release_pdu_session_200_responseJSON, "binaryDataN4Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/release_pdu_session_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/release_pdu_session_request.c
Changed
@@ -118,6 +118,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(release_pdu_session_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_release_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_release_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n4_information = cJSON_GetObjectItemCaseSensitive(release_pdu_session_requestJSON, "binaryDataN4Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/release_sm_context_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/release_sm_context_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(release_sm_context_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_sm_context_release_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_sm_context_release_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_sm_information = cJSON_GetObjectItemCaseSensitive(release_sm_context_requestJSON, "binaryDataN2SmInformation");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/released_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/released_data.c
Changed
@@ -151,26 +151,46 @@ small_data_rate_status = cJSON_GetObjectItemCaseSensitive(released_dataJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(released_dataJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } n4_info = cJSON_GetObjectItemCaseSensitive(released_dataJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(released_dataJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(released_dataJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } released_data_local_var = OpenAPI_released_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/relocate_ue_context_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/relocate_ue_context_request.c
Changed
@@ -373,6 +373,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(relocate_ue_context_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_relocate_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_relocate_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_forward_relocation_request = cJSON_GetObjectItemCaseSensitive(relocate_ue_context_requestJSON, "binaryDataForwardRelocationRequest");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/reporting_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/reporting_information.c
Changed
@@ -182,6 +182,10 @@ notif_method = cJSON_GetObjectItemCaseSensitive(reporting_informationJSON, "notifMethod"); if (notif_method) { notif_method_local_nonprim = OpenAPI_notification_method_1_parseFromJSON(notif_method); + if (!notif_method_local_nonprim) { + ogs_error("OpenAPI_notification_method_1_parseFromJSON failed notif_method"); + goto end; + } } max_report_nbr = cJSON_GetObjectItemCaseSensitive(reporting_informationJSON, "maxReportNbr");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/reporting_options.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/reporting_options.c
Changed
@@ -140,6 +140,10 @@ report_mode = cJSON_GetObjectItemCaseSensitive(reporting_optionsJSON, "reportMode"); if (report_mode) { report_mode_local_nonprim = OpenAPI_event_report_mode_parseFromJSON(report_mode); + if (!report_mode_local_nonprim) { + ogs_error("OpenAPI_event_report_mode_parseFromJSON failed report_mode"); + goto end; + } } max_num_of_reports = cJSON_GetObjectItemCaseSensitive(reporting_optionsJSON, "maxNumOfReports");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/reporting_options_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/reporting_options_1.c
Changed
@@ -140,6 +140,10 @@ report_mode = cJSON_GetObjectItemCaseSensitive(reporting_options_1JSON, "reportMode"); if (report_mode) { report_mode_local_nonprim = OpenAPI_event_report_mode_parseFromJSON(report_mode); + if (!report_mode_local_nonprim) { + ogs_error("OpenAPI_event_report_mode_parseFromJSON failed report_mode"); + goto end; + } } max_num_of_reports = cJSON_GetObjectItemCaseSensitive(reporting_options_1JSON, "maxNumOfReports");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/resources_allocation_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/resources_allocation_info.c
Changed
@@ -122,7 +122,6 @@ OpenAPI_flows_t *flowsItem = OpenAPI_flows_parseFromJSON(flows_local); if (!flowsItem) { ogs_error("No flowsItem"); - OpenAPI_list_free(flowsList); goto end; } OpenAPI_list_add(flowsList, flowsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/retainability_threshold.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/retainability_threshold.c
Changed
@@ -99,6 +99,10 @@ rel_time_unit = cJSON_GetObjectItemCaseSensitive(retainability_thresholdJSON, "relTimeUnit"); if (rel_time_unit) { rel_time_unit_local_nonprim = OpenAPI_time_unit_parseFromJSON(rel_time_unit); + if (!rel_time_unit_local_nonprim) { + ogs_error("OpenAPI_time_unit_parseFromJSON failed rel_time_unit"); + goto end; + } } rel_flow_ratio = cJSON_GetObjectItemCaseSensitive(retainability_thresholdJSON, "relFlowRatio");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/retrieved_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/retrieved_data.c
Changed
@@ -88,11 +88,19 @@ small_data_rate_status = cJSON_GetObjectItemCaseSensitive(retrieved_dataJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } af_coordination_info = cJSON_GetObjectItemCaseSensitive(retrieved_dataJSON, "afCoordinationInfo"); if (af_coordination_info) { af_coordination_info_local_nonprim = OpenAPI_af_coordination_info_parseFromJSON(af_coordination_info); + if (!af_coordination_info_local_nonprim) { + ogs_error("OpenAPI_af_coordination_info_parseFromJSON failed af_coordination_info"); + goto end; + } } retrieved_data_local_var = OpenAPI_retrieved_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/rm_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/rm_info.c
Changed
@@ -85,6 +85,10 @@ goto end; } rm_state_local_nonprim = OpenAPI_rm_state_parseFromJSON(rm_state); + if (!rm_state_local_nonprim) { + ogs_error("OpenAPI_rm_state_parseFromJSON failed rm_state"); + goto end; + } access_type = cJSON_GetObjectItemCaseSensitive(rm_infoJSON, "accessType"); if (!access_type) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/roaming_charging_profile.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/roaming_charging_profile.c
Changed
@@ -109,7 +109,6 @@ OpenAPI_trigger_t *triggersItem = OpenAPI_trigger_parseFromJSON(triggers_local); if (!triggersItem) { ogs_error("No triggersItem"); - OpenAPI_list_free(triggersList); goto end; } OpenAPI_list_add(triggersList, triggersItem); @@ -119,6 +118,10 @@ partial_record_method = cJSON_GetObjectItemCaseSensitive(roaming_charging_profileJSON, "partialRecordMethod"); if (partial_record_method) { partial_record_method_local_nonprim = OpenAPI_partial_record_method_parseFromJSON(partial_record_method); + if (!partial_record_method_local_nonprim) { + ogs_error("OpenAPI_partial_record_method_parseFromJSON failed partial_record_method"); + goto end; + } } roaming_charging_profile_local_var = OpenAPI_roaming_charging_profile_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/roaming_info_update.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/roaming_info_update.c
Changed
@@ -92,6 +92,10 @@ goto end; } serving_plmn_local_nonprim = OpenAPI_plmn_id_parseFromJSON(serving_plmn); + if (!serving_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed serving_plmn"); + goto end; + } roaming_info_update_local_var = OpenAPI_roaming_info_update_create ( roaming ? true : false,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/route_selection_parameter_set.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/route_selection_parameter_set.c
Changed
@@ -155,6 +155,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(route_selection_parameter_setJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } precedence = cJSON_GetObjectItemCaseSensitive(route_selection_parameter_setJSON, "precedence"); @@ -183,7 +187,6 @@ OpenAPI_geographical_area_t *spatial_validity_areasItem = OpenAPI_geographical_area_parseFromJSON(spatial_validity_areas_local); if (!spatial_validity_areasItem) { ogs_error("No spatial_validity_areasItem"); - OpenAPI_list_free(spatial_validity_areasList); goto end; } OpenAPI_list_add(spatial_validity_areasList, spatial_validity_areasItem); @@ -208,7 +211,6 @@ OpenAPI_tai_1_t *spatial_validity_taisItem = OpenAPI_tai_1_parseFromJSON(spatial_validity_tais_local); if (!spatial_validity_taisItem) { ogs_error("No spatial_validity_taisItem"); - OpenAPI_list_free(spatial_validity_taisList); goto end; } OpenAPI_list_add(spatial_validity_taisList, spatial_validity_taisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/route_to_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/route_to_location.c
Changed
@@ -107,6 +107,10 @@ route_info = cJSON_GetObjectItemCaseSensitive(route_to_locationJSON, "routeInfo"); if (route_info) { route_info_local_nonprim = OpenAPI_route_information_parseFromJSON(route_info); + if (!route_info_local_nonprim) { + ogs_error("OpenAPI_route_information_parseFromJSON failed route_info"); + goto end; + } } route_prof_id = cJSON_GetObjectItemCaseSensitive(route_to_locationJSON, "routeProfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/routing_area_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/routing_area_id.c
Changed
@@ -104,6 +104,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } lac = cJSON_GetObjectItemCaseSensitive(routing_area_idJSON, "lac"); if (!lac) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/routing_info_sm_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/routing_info_sm_response.c
Changed
@@ -152,21 +152,37 @@ smsf3_gpp = cJSON_GetObjectItemCaseSensitive(routing_info_sm_responseJSON, "smsf3Gpp"); if (smsf3_gpp) { smsf3_gpp_local_nonprim = OpenAPI_smsf_registration_parseFromJSON(smsf3_gpp); + if (!smsf3_gpp_local_nonprim) { + ogs_error("OpenAPI_smsf_registration_parseFromJSON failed smsf3_gpp"); + goto end; + } } smsf_non3_gpp = cJSON_GetObjectItemCaseSensitive(routing_info_sm_responseJSON, "smsfNon3Gpp"); if (smsf_non3_gpp) { smsf_non3_gpp_local_nonprim = OpenAPI_smsf_registration_parseFromJSON(smsf_non3_gpp); + if (!smsf_non3_gpp_local_nonprim) { + ogs_error("OpenAPI_smsf_registration_parseFromJSON failed smsf_non3_gpp"); + goto end; + } } ip_sm_gw = cJSON_GetObjectItemCaseSensitive(routing_info_sm_responseJSON, "ipSmGw"); if (ip_sm_gw) { ip_sm_gw_local_nonprim = OpenAPI_ip_sm_gw_info_parseFromJSON(ip_sm_gw); + if (!ip_sm_gw_local_nonprim) { + ogs_error("OpenAPI_ip_sm_gw_info_parseFromJSON failed ip_sm_gw"); + goto end; + } } sms_router = cJSON_GetObjectItemCaseSensitive(routing_info_sm_responseJSON, "smsRouter"); if (sms_router) { sms_router_local_nonprim = OpenAPI_sms_router_info_parseFromJSON(sms_router); + if (!sms_router_local_nonprim) { + ogs_error("OpenAPI_sms_router_info_parseFromJSON failed sms_router"); + goto end; + } } routing_info_sm_response_local_var = OpenAPI_routing_info_sm_response_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/rule_report.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/rule_report.c
Changed
@@ -254,6 +254,10 @@ fin_unit_act = cJSON_GetObjectItemCaseSensitive(rule_reportJSON, "finUnitAct"); if (fin_unit_act) { fin_unit_act_local_nonprim = OpenAPI_final_unit_action_parseFromJSON(fin_unit_act); + if (!fin_unit_act_local_nonprim) { + ogs_error("OpenAPI_final_unit_action_parseFromJSON failed fin_unit_act"); + goto end; + } } ran_nas_rel_causes = cJSON_GetObjectItemCaseSensitive(rule_reportJSON, "ranNasRelCauses"); @@ -274,7 +278,6 @@ OpenAPI_ran_nas_rel_cause_t *ran_nas_rel_causesItem = OpenAPI_ran_nas_rel_cause_parseFromJSON(ran_nas_rel_causes_local); if (!ran_nas_rel_causesItem) { ogs_error("No ran_nas_rel_causesItem"); - OpenAPI_list_free(ran_nas_rel_causesList); goto end; } OpenAPI_list_add(ran_nas_rel_causesList, ran_nas_rel_causesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/scp_domain_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/scp_domain_info.c
Changed
@@ -156,7 +156,6 @@ OpenAPI_ip_end_point_t *scp_ip_end_pointsItem = OpenAPI_ip_end_point_parseFromJSON(scp_ip_end_points_local); if (!scp_ip_end_pointsItem) { ogs_error("No scp_ip_end_pointsItem"); - OpenAPI_list_free(scp_ip_end_pointsList); goto end; } OpenAPI_list_add(scp_ip_end_pointsList, scp_ip_end_pointsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/scp_domain_routing_info_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/scp_domain_routing_info_notification.c
Changed
@@ -84,6 +84,10 @@ goto end; } routing_info_local_nonprim = OpenAPI_scp_domain_routing_information_parseFromJSON(routing_info); + if (!routing_info_local_nonprim) { + ogs_error("OpenAPI_scp_domain_routing_information_parseFromJSON failed routing_info"); + goto end; + } local_ind = cJSON_GetObjectItemCaseSensitive(scp_domain_routing_info_notificationJSON, "localInd"); if (local_ind) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/scp_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/scp_info.c
Changed
@@ -511,7 +511,6 @@ OpenAPI_ipv4_address_range_t *ipv4_addr_rangesItem = OpenAPI_ipv4_address_range_parseFromJSON(ipv4_addr_ranges_local); if (!ipv4_addr_rangesItem) { ogs_error("No ipv4_addr_rangesItem"); - OpenAPI_list_free(ipv4_addr_rangesList); goto end; } OpenAPI_list_add(ipv4_addr_rangesList, ipv4_addr_rangesItem); @@ -536,7 +535,6 @@ OpenAPI_ipv6_prefix_range_t *ipv6_prefix_rangesItem = OpenAPI_ipv6_prefix_range_parseFromJSON(ipv6_prefix_ranges_local); if (!ipv6_prefix_rangesItem) { ogs_error("No ipv6_prefix_rangesItem"); - OpenAPI_list_free(ipv6_prefix_rangesList); goto end; } OpenAPI_list_add(ipv6_prefix_rangesList, ipv6_prefix_rangesItem); @@ -582,7 +580,6 @@ OpenAPI_plmn_id_t *remote_plmn_listItem = OpenAPI_plmn_id_parseFromJSON(remote_plmn_list_local); if (!remote_plmn_listItem) { ogs_error("No remote_plmn_listItem"); - OpenAPI_list_free(remote_plmn_listList); goto end; } OpenAPI_list_add(remote_plmn_listList, remote_plmn_listItem); @@ -607,7 +604,6 @@ OpenAPI_plmn_id_nid_t *remote_snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(remote_snpn_list_local); if (!remote_snpn_listItem) { ogs_error("No remote_snpn_listItem"); - OpenAPI_list_free(remote_snpn_listList); goto end; } OpenAPI_list_add(remote_snpn_listList, remote_snpn_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sdm_subscription.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sdm_subscription.c
Changed
@@ -420,6 +420,10 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "dnn"); @@ -441,6 +445,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } immediate_report = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "immediateReport"); @@ -454,6 +462,10 @@ report = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "report"); if (report) { report_local_nonprim = OpenAPI_immediate_report_parseFromJSON(report); + if (!report_local_nonprim) { + ogs_error("OpenAPI_immediate_report_parseFromJSON failed report"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "supportedFeatures"); @@ -467,6 +479,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } nf_change_filter = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "nfChangeFilter"); @@ -509,6 +525,10 @@ ue_con_smf_data_sub_filter = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "ueConSmfDataSubFilter"); if (ue_con_smf_data_sub_filter) { ue_con_smf_data_sub_filter_local_nonprim = OpenAPI_ue_context_in_smf_data_sub_filter_parseFromJSON(ue_con_smf_data_sub_filter); + if (!ue_con_smf_data_sub_filter_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smf_data_sub_filter_parseFromJSON failed ue_con_smf_data_sub_filter"); + goto end; + } } sdm_subscription_local_var = OpenAPI_sdm_subscription_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sdm_subscription_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sdm_subscription_1.c
Changed
@@ -420,6 +420,10 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "dnn"); @@ -441,6 +445,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } } immediate_report = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "immediateReport"); @@ -454,6 +462,10 @@ report = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "report"); if (report) { report_local_nonprim = OpenAPI_immediate_report_parseFromJSON(report); + if (!report_local_nonprim) { + ogs_error("OpenAPI_immediate_report_parseFromJSON failed report"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "supportedFeatures"); @@ -467,6 +479,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } nf_change_filter = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "nfChangeFilter"); @@ -509,6 +525,10 @@ ue_con_smf_data_sub_filter = cJSON_GetObjectItemCaseSensitive(sdm_subscription_1JSON, "ueConSmfDataSubFilter"); if (ue_con_smf_data_sub_filter) { ue_con_smf_data_sub_filter_local_nonprim = OpenAPI_ue_context_in_smf_data_sub_filter_1_parseFromJSON(ue_con_smf_data_sub_filter); + if (!ue_con_smf_data_sub_filter_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smf_data_sub_filter_1_parseFromJSON failed ue_con_smf_data_sub_filter"); + goto end; + } } sdm_subscription_1_local_var = OpenAPI_sdm_subscription_1_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/seaf_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/seaf_data.c
Changed
@@ -145,6 +145,10 @@ goto end; } ng_ksi_local_nonprim = OpenAPI_ng_ksi_parseFromJSON(ng_ksi); + if (!ng_ksi_local_nonprim) { + ogs_error("OpenAPI_ng_ksi_parseFromJSON failed ng_ksi"); + goto end; + } key_amf = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "keyAmf"); if (!key_amf) { @@ -152,6 +156,10 @@ goto end; } key_amf_local_nonprim = OpenAPI_key_amf_parseFromJSON(key_amf); + if (!key_amf_local_nonprim) { + ogs_error("OpenAPI_key_amf_parseFromJSON failed key_amf"); + goto end; + } nh = cJSON_GetObjectItemCaseSensitive(seaf_dataJSON, "nh"); if (nh) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/search_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/search_result.c
Changed
@@ -243,7 +243,6 @@ OpenAPI_nf_profile_t *nf_instancesItem = OpenAPI_nf_profile_parseFromJSON(nf_instances_local); if (!nf_instancesItem) { ogs_error("No nf_instancesItem"); - OpenAPI_list_free(nf_instancesList); goto end; } OpenAPI_list_add(nf_instancesList, nf_instancesItem); @@ -268,6 +267,10 @@ preferred_search = cJSON_GetObjectItemCaseSensitive(search_resultJSON, "preferredSearch"); if (preferred_search) { preferred_search_local_nonprim = OpenAPI_preferred_search_parseFromJSON(preferred_search); + if (!preferred_search_local_nonprim) { + ogs_error("OpenAPI_preferred_search_parseFromJSON failed preferred_search"); + goto end; + } } nrf_supported_features = cJSON_GetObjectItemCaseSensitive(search_resultJSON, "nrfSupportedFeatures"); @@ -315,6 +318,10 @@ no_profile_match_info = cJSON_GetObjectItemCaseSensitive(search_resultJSON, "noProfileMatchInfo"); if (no_profile_match_info) { no_profile_match_info_local_nonprim = OpenAPI_no_profile_match_info_parseFromJSON(no_profile_match_info); + if (!no_profile_match_info_local_nonprim) { + ogs_error("OpenAPI_no_profile_match_info_parseFromJSON failed no_profile_match_info"); + goto end; + } } search_result_local_var = OpenAPI_search_result_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sec_negotiate_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sec_negotiate_req_data.c
Changed
@@ -289,7 +289,6 @@ OpenAPI_plmn_id_t *plmn_id_listItem = OpenAPI_plmn_id_parseFromJSON(plmn_id_list_local); if (!plmn_id_listItem) { ogs_error("No plmn_id_listItem"); - OpenAPI_list_free(plmn_id_listList); goto end; } OpenAPI_list_add(plmn_id_listList, plmn_id_listItem); @@ -314,7 +313,6 @@ OpenAPI_plmn_id_nid_t *snpn_id_listItem = OpenAPI_plmn_id_nid_parseFromJSON(snpn_id_list_local); if (!snpn_id_listItem) { ogs_error("No snpn_id_listItem"); - OpenAPI_list_free(snpn_id_listList); goto end; } OpenAPI_list_add(snpn_id_listList, snpn_id_listItem); @@ -324,11 +322,19 @@ target_plmn_id = cJSON_GetObjectItemCaseSensitive(sec_negotiate_req_dataJSON, "targetPlmnId"); if (target_plmn_id) { target_plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(target_plmn_id); + if (!target_plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed target_plmn_id"); + goto end; + } } target_snpn_id = cJSON_GetObjectItemCaseSensitive(sec_negotiate_req_dataJSON, "targetSnpnId"); if (target_snpn_id) { target_snpn_id_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(target_snpn_id); + if (!target_snpn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed target_snpn_id"); + goto end; + } } intended_usage_purpose = cJSON_GetObjectItemCaseSensitive(sec_negotiate_req_dataJSON, "intendedUsagePurpose"); @@ -349,7 +355,6 @@ OpenAPI_intended_n32_purpose_t *intended_usage_purposeItem = OpenAPI_intended_n32_purpose_parseFromJSON(intended_usage_purpose_local); if (!intended_usage_purposeItem) { ogs_error("No intended_usage_purposeItem"); - OpenAPI_list_free(intended_usage_purposeList); goto end; } OpenAPI_list_add(intended_usage_purposeList, intended_usage_purposeItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sec_negotiate_rsp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sec_negotiate_rsp_data.c
Changed
@@ -253,7 +253,6 @@ OpenAPI_plmn_id_t *plmn_id_listItem = OpenAPI_plmn_id_parseFromJSON(plmn_id_list_local); if (!plmn_id_listItem) { ogs_error("No plmn_id_listItem"); - OpenAPI_list_free(plmn_id_listList); goto end; } OpenAPI_list_add(plmn_id_listList, plmn_id_listItem); @@ -278,7 +277,6 @@ OpenAPI_plmn_id_nid_t *snpn_id_listItem = OpenAPI_plmn_id_nid_parseFromJSON(snpn_id_list_local); if (!snpn_id_listItem) { ogs_error("No snpn_id_listItem"); - OpenAPI_list_free(snpn_id_listList); goto end; } OpenAPI_list_add(snpn_id_listList, snpn_id_listItem); @@ -303,7 +301,6 @@ OpenAPI_intended_n32_purpose_t *allowed_usage_purposeItem = OpenAPI_intended_n32_purpose_parseFromJSON(allowed_usage_purpose_local); if (!allowed_usage_purposeItem) { ogs_error("No allowed_usage_purposeItem"); - OpenAPI_list_free(allowed_usage_purposeList); goto end; } OpenAPI_list_add(allowed_usage_purposeList, allowed_usage_purposeItem); @@ -328,7 +325,6 @@ OpenAPI_intended_n32_purpose_t *rejected_usage_purposeItem = OpenAPI_intended_n32_purpose_parseFromJSON(rejected_usage_purpose_local); if (!rejected_usage_purposeItem) { ogs_error("No rejected_usage_purposeItem"); - OpenAPI_list_free(rejected_usage_purposeList); goto end; } OpenAPI_list_add(rejected_usage_purposeList, rejected_usage_purposeItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sec_param_exch_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sec_param_exch_req_data.c
Changed
@@ -226,6 +226,10 @@ protection_policy_info = cJSON_GetObjectItemCaseSensitive(sec_param_exch_req_dataJSON, "protectionPolicyInfo"); if (protection_policy_info) { protection_policy_info_local_nonprim = OpenAPI_protection_policy_parseFromJSON(protection_policy_info); + if (!protection_policy_info_local_nonprim) { + ogs_error("OpenAPI_protection_policy_parseFromJSON failed protection_policy_info"); + goto end; + } } ipx_provider_sec_info_list = cJSON_GetObjectItemCaseSensitive(sec_param_exch_req_dataJSON, "ipxProviderSecInfoList"); @@ -246,7 +250,6 @@ OpenAPI_ipx_provider_sec_info_t *ipx_provider_sec_info_listItem = OpenAPI_ipx_provider_sec_info_parseFromJSON(ipx_provider_sec_info_list_local); if (!ipx_provider_sec_info_listItem) { ogs_error("No ipx_provider_sec_info_listItem"); - OpenAPI_list_free(ipx_provider_sec_info_listList); goto end; } OpenAPI_list_add(ipx_provider_sec_info_listList, ipx_provider_sec_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sec_param_exch_rsp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sec_param_exch_rsp_data.c
Changed
@@ -178,6 +178,10 @@ sel_protection_policy_info = cJSON_GetObjectItemCaseSensitive(sec_param_exch_rsp_dataJSON, "selProtectionPolicyInfo"); if (sel_protection_policy_info) { sel_protection_policy_info_local_nonprim = OpenAPI_protection_policy_parseFromJSON(sel_protection_policy_info); + if (!sel_protection_policy_info_local_nonprim) { + ogs_error("OpenAPI_protection_policy_parseFromJSON failed sel_protection_policy_info"); + goto end; + } } ipx_provider_sec_info_list = cJSON_GetObjectItemCaseSensitive(sec_param_exch_rsp_dataJSON, "ipxProviderSecInfoList"); @@ -198,7 +202,6 @@ OpenAPI_ipx_provider_sec_info_t *ipx_provider_sec_info_listItem = OpenAPI_ipx_provider_sec_info_parseFromJSON(ipx_provider_sec_info_list_local); if (!ipx_provider_sec_info_listItem) { ogs_error("No ipx_provider_sec_info_listItem"); - OpenAPI_list_free(ipx_provider_sec_info_listList); goto end; } OpenAPI_list_add(ipx_provider_sec_info_listList, ipx_provider_sec_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/secondary_rat_usage_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/secondary_rat_usage_info.c
Changed
@@ -139,7 +139,6 @@ OpenAPI_qos_flow_usage_report_t *qos_flows_usage_dataItem = OpenAPI_qos_flow_usage_report_parseFromJSON(qos_flows_usage_data_local); if (!qos_flows_usage_dataItem) { ogs_error("No qos_flows_usage_dataItem"); - OpenAPI_list_free(qos_flows_usage_dataList); goto end; } OpenAPI_list_add(qos_flows_usage_dataList, qos_flows_usage_dataItem); @@ -164,7 +163,6 @@ OpenAPI_volume_timed_report_t *pdu_session_usage_dataItem = OpenAPI_volume_timed_report_parseFromJSON(pdu_session_usage_data_local); if (!pdu_session_usage_dataItem) { ogs_error("No pdu_session_usage_dataItem"); - OpenAPI_list_free(pdu_session_usage_dataList); goto end; } OpenAPI_list_add(pdu_session_usage_dataList, pdu_session_usage_dataItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/secondary_rat_usage_report.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/secondary_rat_usage_report.c
Changed
@@ -117,7 +117,6 @@ OpenAPI_qos_flow_usage_report_t *qos_flows_usage_dataItem = OpenAPI_qos_flow_usage_report_parseFromJSON(qos_flows_usage_data_local); if (!qos_flows_usage_dataItem) { ogs_error("No qos_flows_usage_dataItem"); - OpenAPI_list_free(qos_flows_usage_dataList); goto end; } OpenAPI_list_add(qos_flows_usage_dataList, qos_flows_usage_dataItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/send_mo_data_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/send_mo_data_req_data.c
Changed
@@ -114,15 +114,27 @@ goto end; } mo_data_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(mo_data); + if (!mo_data_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed mo_data"); + goto end; + } mo_exp_data_counter = cJSON_GetObjectItemCaseSensitive(send_mo_data_req_dataJSON, "moExpDataCounter"); if (mo_exp_data_counter) { mo_exp_data_counter_local_nonprim = OpenAPI_mo_exp_data_counter_parseFromJSON(mo_exp_data_counter); + if (!mo_exp_data_counter_local_nonprim) { + ogs_error("OpenAPI_mo_exp_data_counter_parseFromJSON failed mo_exp_data_counter"); + goto end; + } } ue_location = cJSON_GetObjectItemCaseSensitive(send_mo_data_req_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } send_mo_data_req_data_local_var = OpenAPI_send_mo_data_req_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/send_mo_data_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/send_mo_data_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(send_mo_data_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_send_mo_data_req_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_send_mo_data_req_data_parseFromJSON failed json_data"); + goto end; + } } binary_mo_data = cJSON_GetObjectItemCaseSensitive(send_mo_data_requestJSON, "binaryMoData");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sepp_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sepp_info.c
Changed
@@ -199,7 +199,6 @@ OpenAPI_plmn_id_t *remote_plmn_listItem = OpenAPI_plmn_id_parseFromJSON(remote_plmn_list_local); if (!remote_plmn_listItem) { ogs_error("No remote_plmn_listItem"); - OpenAPI_list_free(remote_plmn_listList); goto end; } OpenAPI_list_add(remote_plmn_listList, remote_plmn_listItem); @@ -224,7 +223,6 @@ OpenAPI_plmn_id_nid_t *remote_snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(remote_snpn_list_local); if (!remote_snpn_listItem) { ogs_error("No remote_snpn_listItem"); - OpenAPI_list_free(remote_snpn_listList); goto end; } OpenAPI_list_add(remote_snpn_listList, remote_snpn_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_area_coverage_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_area_coverage_info.c
Changed
@@ -117,6 +117,10 @@ serving_network = cJSON_GetObjectItemCaseSensitive(service_area_coverage_infoJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_1_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_1_parseFromJSON failed serving_network"); + goto end; + } } service_area_coverage_info_local_var = OpenAPI_service_area_coverage_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_area_id.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_area_id.c
Changed
@@ -104,6 +104,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } lac = cJSON_GetObjectItemCaseSensitive(service_area_idJSON, "lac"); if (!lac) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_area_restriction.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_area_restriction.c
Changed
@@ -132,7 +132,6 @@ OpenAPI_area_t *areasItem = OpenAPI_area_parseFromJSON(areas_local); if (!areasItem) { ogs_error("No areasItem"); - OpenAPI_list_free(areasList); goto end; } OpenAPI_list_add(areasList, areasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_area_restriction_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_area_restriction_1.c
Changed
@@ -132,7 +132,6 @@ OpenAPI_area_1_t *areasItem = OpenAPI_area_1_parseFromJSON(areas_local); if (!areasItem) { ogs_error("No areasItem"); - OpenAPI_list_free(areasList); goto end; } OpenAPI_list_add(areasList, areasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_experience_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_experience_info.c
Changed
@@ -342,6 +342,10 @@ goto end; } svc_exprc_local_nonprim = OpenAPI_svc_experience_parseFromJSON(svc_exprc); + if (!svc_exprc_local_nonprim) { + ogs_error("OpenAPI_svc_experience_parseFromJSON failed svc_exprc"); + goto end; + } svc_exprc_variance = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "svcExprcVariance"); if (svc_exprc_variance) { @@ -375,6 +379,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } app_id = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "appId"); @@ -388,6 +396,10 @@ srv_expc_type = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "srvExpcType"); if (srv_expc_type) { srv_expc_type_local_nonprim = OpenAPI_service_experience_type_parseFromJSON(srv_expc_type); + if (!srv_expc_type_local_nonprim) { + ogs_error("OpenAPI_service_experience_type_parseFromJSON failed srv_expc_type"); + goto end; + } } ue_locs = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "ueLocs"); @@ -408,7 +420,6 @@ OpenAPI_location_info_t *ue_locsItem = OpenAPI_location_info_parseFromJSON(ue_locs_local); if (!ue_locsItem) { ogs_error("No ue_locsItem"); - OpenAPI_list_free(ue_locsList); goto end; } OpenAPI_list_add(ue_locsList, ue_locsItem); @@ -418,6 +429,10 @@ upf_info = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "upfInfo"); if (upf_info) { upf_info_local_nonprim = OpenAPI_upf_information_parseFromJSON(upf_info); + if (!upf_info_local_nonprim) { + ogs_error("OpenAPI_upf_information_parseFromJSON failed upf_info"); + goto end; + } } dnai = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "dnai"); @@ -431,6 +446,10 @@ app_server_inst = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "appServerInst"); if (app_server_inst) { app_server_inst_local_nonprim = OpenAPI_addr_fqdn_parseFromJSON(app_server_inst); + if (!app_server_inst_local_nonprim) { + ogs_error("OpenAPI_addr_fqdn_parseFromJSON failed app_server_inst"); + goto end; + } } confidence = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "confidence"); @@ -452,6 +471,10 @@ network_area = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "networkArea"); if (network_area) { network_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(network_area); + if (!network_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed network_area"); + goto end; + } } nsi_id = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "nsiId"); @@ -473,6 +496,10 @@ rat_freq = cJSON_GetObjectItemCaseSensitive(service_experience_infoJSON, "ratFreq"); if (rat_freq) { rat_freq_local_nonprim = OpenAPI_rat_freq_information_parseFromJSON(rat_freq); + if (!rat_freq_local_nonprim) { + ogs_error("OpenAPI_rat_freq_information_parseFromJSON failed rat_freq"); + goto end; + } } service_experience_info_local_var = OpenAPI_service_experience_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_parameter_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_parameter_data.c
Changed
@@ -437,6 +437,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(service_parameter_dataJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } inter_group_id = cJSON_GetObjectItemCaseSensitive(service_parameter_dataJSON, "interGroupId"); @@ -553,7 +557,6 @@ OpenAPI_ursp_rule_request_t *ursp_guidanceItem = OpenAPI_ursp_rule_request_parseFromJSON(ursp_guidance_local); if (!ursp_guidanceItem) { ogs_error("No ursp_guidanceItem"); - OpenAPI_list_free(ursp_guidanceList); goto end; } OpenAPI_list_add(ursp_guidanceList, ursp_guidanceItem); @@ -578,7 +581,6 @@ OpenAPI_event_t *delivery_eventsItem = OpenAPI_event_parseFromJSON(delivery_events_local); if (!delivery_eventsItem) { ogs_error("No delivery_eventsItem"); - OpenAPI_list_free(delivery_eventsList); goto end; } OpenAPI_list_add(delivery_eventsList, delivery_eventsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_parameter_data_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_parameter_data_patch.c
Changed
@@ -261,7 +261,6 @@ OpenAPI_ursp_rule_request_t *ursp_influenceItem = OpenAPI_ursp_rule_request_parseFromJSON(ursp_influence_local); if (!ursp_influenceItem) { ogs_error("No ursp_influenceItem"); - OpenAPI_list_free(ursp_influenceList); goto end; } OpenAPI_list_add(ursp_influenceList, ursp_influenceItem); @@ -286,7 +285,6 @@ OpenAPI_event_t *delivery_eventsItem = OpenAPI_event_parseFromJSON(delivery_events_local); if (!delivery_eventsItem) { ogs_error("No delivery_eventsItem"); - OpenAPI_list_free(delivery_eventsList); goto end; } OpenAPI_list_add(delivery_eventsList, delivery_eventsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_specific_authorization_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_specific_authorization_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_authorization_info_t *service_specific_authorization_listItem = OpenAPI_authorization_info_parseFromJSON(service_specific_authorization_list_local); if (!service_specific_authorization_listItem) { ogs_error("No service_specific_authorization_listItem"); - OpenAPI_list_free(service_specific_authorization_listList); goto end; } OpenAPI_list_add(service_specific_authorization_listList, service_specific_authorization_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/service_type_unrelated_class.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/service_type_unrelated_class.c
Changed
@@ -174,7 +174,6 @@ OpenAPI_geographic_area_t *allowed_geographic_areaItem = OpenAPI_geographic_area_parseFromJSON(allowed_geographic_area_local); if (!allowed_geographic_areaItem) { ogs_error("No allowed_geographic_areaItem"); - OpenAPI_list_free(allowed_geographic_areaList); goto end; } OpenAPI_list_add(allowed_geographic_areaList, allowed_geographic_areaItem); @@ -202,6 +201,10 @@ valid_time_period = cJSON_GetObjectItemCaseSensitive(service_type_unrelated_classJSON, "validTimePeriod"); if (valid_time_period) { valid_time_period_local_nonprim = OpenAPI_valid_time_period_parseFromJSON(valid_time_period); + if (!valid_time_period_local_nonprim) { + ogs_error("OpenAPI_valid_time_period_parseFromJSON failed valid_time_period"); + goto end; + } } code_word_list = cJSON_GetObjectItemCaseSensitive(service_type_unrelated_classJSON, "codeWordList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/serving_nf_identity.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/serving_nf_identity.c
Changed
@@ -131,16 +131,28 @@ guami = cJSON_GetObjectItemCaseSensitive(serving_nf_identityJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } an_gw_addr = cJSON_GetObjectItemCaseSensitive(serving_nf_identityJSON, "anGwAddr"); if (an_gw_addr) { an_gw_addr_local_nonprim = OpenAPI_an_gw_address_parseFromJSON(an_gw_addr); + if (!an_gw_addr_local_nonprim) { + ogs_error("OpenAPI_an_gw_address_parseFromJSON failed an_gw_addr"); + goto end; + } } sgsn_addr = cJSON_GetObjectItemCaseSensitive(serving_nf_identityJSON, "sgsnAddr"); if (sgsn_addr) { sgsn_addr_local_nonprim = OpenAPI_sgsn_address_parseFromJSON(sgsn_addr); + if (!sgsn_addr_local_nonprim) { + ogs_error("OpenAPI_sgsn_address_parseFromJSON failed sgsn_addr"); + goto end; + } } serving_nf_identity_local_var = OpenAPI_serving_nf_identity_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/session_management_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/session_management_subscription_data.c
Changed
@@ -325,6 +325,10 @@ goto end; } single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } dnn_configurations = cJSON_GetObjectItemCaseSensitive(session_management_subscription_dataJSON, "dnnConfigurations"); if (dnn_configurations) { @@ -417,6 +421,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(session_management_subscription_dataJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } shared_trace_data_id = cJSON_GetObjectItemCaseSensitive(session_management_subscription_dataJSON, "sharedTraceDataId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/session_management_subscription_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/session_management_subscription_data_1.c
Changed
@@ -325,6 +325,10 @@ goto end; } single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } dnn_configurations = cJSON_GetObjectItemCaseSensitive(session_management_subscription_data_1JSON, "dnnConfigurations"); if (dnn_configurations) { @@ -417,6 +421,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(session_management_subscription_data_1JSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } shared_trace_data_id = cJSON_GetObjectItemCaseSensitive(session_management_subscription_data_1JSON, "sharedTraceDataId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/session_rule.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/session_rule.c
Changed
@@ -146,11 +146,19 @@ auth_sess_ambr = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "authSessAmbr"); if (auth_sess_ambr) { auth_sess_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(auth_sess_ambr); + if (!auth_sess_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed auth_sess_ambr"); + goto end; + } } auth_def_qos = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "authDefQos"); if (auth_def_qos) { auth_def_qos_local_nonprim = OpenAPI_authorized_default_qos_parseFromJSON(auth_def_qos); + if (!auth_def_qos_local_nonprim) { + ogs_error("OpenAPI_authorized_default_qos_parseFromJSON failed auth_def_qos"); + goto end; + } } sess_rule_id = cJSON_GetObjectItemCaseSensitive(session_ruleJSON, "sessRuleId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/shared_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/shared_data.c
Changed
@@ -337,16 +337,28 @@ shared_am_data = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedAmData"); if (shared_am_data) { shared_am_data_local_nonprim = OpenAPI_access_and_mobility_subscription_data_parseFromJSON(shared_am_data); + if (!shared_am_data_local_nonprim) { + ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON failed shared_am_data"); + goto end; + } } shared_sms_subs_data = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedSmsSubsData"); if (shared_sms_subs_data) { shared_sms_subs_data_local_nonprim = OpenAPI_sms_subscription_data_parseFromJSON(shared_sms_subs_data); + if (!shared_sms_subs_data_local_nonprim) { + ogs_error("OpenAPI_sms_subscription_data_parseFromJSON failed shared_sms_subs_data"); + goto end; + } } shared_sms_mng_subs_data = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedSmsMngSubsData"); if (shared_sms_mng_subs_data) { shared_sms_mng_subs_data_local_nonprim = OpenAPI_sms_management_subscription_data_parseFromJSON(shared_sms_mng_subs_data); + if (!shared_sms_mng_subs_data_local_nonprim) { + ogs_error("OpenAPI_sms_management_subscription_data_parseFromJSON failed shared_sms_mng_subs_data"); + goto end; + } } shared_dnn_configurations = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedDnnConfigurations"); @@ -378,6 +390,10 @@ shared_trace_data = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedTraceData"); if (shared_trace_data) { shared_trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(shared_trace_data); + if (!shared_trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed shared_trace_data"); + goto end; + } } shared_snssai_infos = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedSnssaiInfos"); @@ -457,11 +473,19 @@ shared_sm_subs_data = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedSmSubsData"); if (shared_sm_subs_data) { shared_sm_subs_data_local_nonprim = OpenAPI_session_management_subscription_data_parseFromJSON(shared_sm_subs_data); + if (!shared_sm_subs_data_local_nonprim) { + ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON failed shared_sm_subs_data"); + goto end; + } } shared_ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(shared_dataJSON, "sharedEcsAddrConfigInfo"); if (shared_ecs_addr_config_info) { shared_ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_parseFromJSON(shared_ecs_addr_config_info); + if (!shared_ecs_addr_config_info_local_nonprim) { + ogs_error("OpenAPI_ecs_addr_config_info_parseFromJSON failed shared_ecs_addr_config_info"); + goto end; + } } shared_data_local_var = OpenAPI_shared_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/slice_info_for_pdu_session.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/slice_info_for_pdu_session.c
Changed
@@ -106,6 +106,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } roaming_indication = cJSON_GetObjectItemCaseSensitive(slice_info_for_pdu_sessionJSON, "roamingIndication"); if (!roaming_indication) { @@ -121,6 +125,10 @@ home_snssai = cJSON_GetObjectItemCaseSensitive(slice_info_for_pdu_sessionJSON, "homeSnssai"); if (home_snssai) { home_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(home_snssai); + if (!home_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed home_snssai"); + goto end; + } } slice_info_for_pdu_session_local_var = OpenAPI_slice_info_for_pdu_session_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/slice_info_for_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/slice_info_for_registration.c
Changed
@@ -271,7 +271,6 @@ OpenAPI_subscribed_snssai_t *subscribed_nssaiItem = OpenAPI_subscribed_snssai_parseFromJSON(subscribed_nssai_local); if (!subscribed_nssaiItem) { ogs_error("No subscribed_nssaiItem"); - OpenAPI_list_free(subscribed_nssaiList); goto end; } OpenAPI_list_add(subscribed_nssaiList, subscribed_nssaiItem); @@ -281,11 +280,19 @@ allowed_nssai_current_access = cJSON_GetObjectItemCaseSensitive(slice_info_for_registrationJSON, "allowedNssaiCurrentAccess"); if (allowed_nssai_current_access) { allowed_nssai_current_access_local_nonprim = OpenAPI_allowed_nssai_parseFromJSON(allowed_nssai_current_access); + if (!allowed_nssai_current_access_local_nonprim) { + ogs_error("OpenAPI_allowed_nssai_parseFromJSON failed allowed_nssai_current_access"); + goto end; + } } allowed_nssai_other_access = cJSON_GetObjectItemCaseSensitive(slice_info_for_registrationJSON, "allowedNssaiOtherAccess"); if (allowed_nssai_other_access) { allowed_nssai_other_access_local_nonprim = OpenAPI_allowed_nssai_parseFromJSON(allowed_nssai_other_access); + if (!allowed_nssai_other_access_local_nonprim) { + ogs_error("OpenAPI_allowed_nssai_parseFromJSON failed allowed_nssai_other_access"); + goto end; + } } s_nssai_for_mapping = cJSON_GetObjectItemCaseSensitive(slice_info_for_registrationJSON, "sNssaiForMapping"); @@ -306,7 +313,6 @@ OpenAPI_snssai_t *s_nssai_for_mappingItem = OpenAPI_snssai_parseFromJSON(s_nssai_for_mapping_local); if (!s_nssai_for_mappingItem) { ogs_error("No s_nssai_for_mappingItem"); - OpenAPI_list_free(s_nssai_for_mappingList); goto end; } OpenAPI_list_add(s_nssai_for_mappingList, s_nssai_for_mappingItem); @@ -331,7 +337,6 @@ OpenAPI_snssai_t *requested_nssaiItem = OpenAPI_snssai_parseFromJSON(requested_nssai_local); if (!requested_nssaiItem) { ogs_error("No requested_nssaiItem"); - OpenAPI_list_free(requested_nssaiList); goto end; } OpenAPI_list_add(requested_nssaiList, requested_nssaiItem); @@ -364,7 +369,6 @@ OpenAPI_mapping_of_snssai_t *mapping_of_nssaiItem = OpenAPI_mapping_of_snssai_parseFromJSON(mapping_of_nssai_local); if (!mapping_of_nssaiItem) { ogs_error("No mapping_of_nssaiItem"); - OpenAPI_list_free(mapping_of_nssaiList); goto end; } OpenAPI_list_add(mapping_of_nssaiList, mapping_of_nssaiItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/slice_info_for_ue_configuration_update.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/slice_info_for_ue_configuration_update.c
Changed
@@ -259,7 +259,6 @@ OpenAPI_subscribed_snssai_t *subscribed_nssaiItem = OpenAPI_subscribed_snssai_parseFromJSON(subscribed_nssai_local); if (!subscribed_nssaiItem) { ogs_error("No subscribed_nssaiItem"); - OpenAPI_list_free(subscribed_nssaiList); goto end; } OpenAPI_list_add(subscribed_nssaiList, subscribed_nssaiItem); @@ -269,11 +268,19 @@ allowed_nssai_current_access = cJSON_GetObjectItemCaseSensitive(slice_info_for_ue_configuration_updateJSON, "allowedNssaiCurrentAccess"); if (allowed_nssai_current_access) { allowed_nssai_current_access_local_nonprim = OpenAPI_allowed_nssai_parseFromJSON(allowed_nssai_current_access); + if (!allowed_nssai_current_access_local_nonprim) { + ogs_error("OpenAPI_allowed_nssai_parseFromJSON failed allowed_nssai_current_access"); + goto end; + } } allowed_nssai_other_access = cJSON_GetObjectItemCaseSensitive(slice_info_for_ue_configuration_updateJSON, "allowedNssaiOtherAccess"); if (allowed_nssai_other_access) { allowed_nssai_other_access_local_nonprim = OpenAPI_allowed_nssai_parseFromJSON(allowed_nssai_other_access); + if (!allowed_nssai_other_access_local_nonprim) { + ogs_error("OpenAPI_allowed_nssai_parseFromJSON failed allowed_nssai_other_access"); + goto end; + } } default_configured_snssai_ind = cJSON_GetObjectItemCaseSensitive(slice_info_for_ue_configuration_updateJSON, "defaultConfiguredSnssaiInd"); @@ -302,7 +309,6 @@ OpenAPI_snssai_t *requested_nssaiItem = OpenAPI_snssai_parseFromJSON(requested_nssai_local); if (!requested_nssaiItem) { ogs_error("No requested_nssaiItem"); - OpenAPI_list_free(requested_nssaiList); goto end; } OpenAPI_list_add(requested_nssaiList, requested_nssaiItem); @@ -327,7 +333,6 @@ OpenAPI_mapping_of_snssai_t *mapping_of_nssaiItem = OpenAPI_mapping_of_snssai_parseFromJSON(mapping_of_nssai_local); if (!mapping_of_nssaiItem) { ogs_error("No mapping_of_nssaiItem"); - OpenAPI_list_free(mapping_of_nssaiList); goto end; } OpenAPI_list_add(mapping_of_nssaiList, mapping_of_nssaiItem); @@ -368,7 +373,6 @@ OpenAPI_snssai_t *rejected_nssai_raItem = OpenAPI_snssai_parseFromJSON(rejected_nssai_ra_local); if (!rejected_nssai_raItem) { ogs_error("No rejected_nssai_raItem"); - OpenAPI_list_free(rejected_nssai_raList); goto end; } OpenAPI_list_add(rejected_nssai_raList, rejected_nssai_raItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/slice_load_level_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/slice_load_level_information.c
Changed
@@ -111,7 +111,6 @@ OpenAPI_snssai_t *snssaisItem = OpenAPI_snssai_parseFromJSON(snssais_local); if (!snssaisItem) { ogs_error("No snssaisItem"); - OpenAPI_list_free(snssaisList); goto end; } OpenAPI_list_add(snssaisList, snssaisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context.c
Changed
@@ -1003,10 +1003,18 @@ goto end; } s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } hplmn_snssai = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "hplmnSnssai"); if (hplmn_snssai) { hplmn_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(hplmn_snssai); + if (!hplmn_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed hplmn_snssai"); + goto end; + } } pdu_session_type = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "pduSessionType"); @@ -1131,6 +1139,10 @@ goto end; } session_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed session_ambr"); + goto end; + } qos_flows_list = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "qosFlowsList"); if (!qos_flows_list) { @@ -1153,7 +1165,6 @@ OpenAPI_qos_flow_setup_item_t *qos_flows_listItem = OpenAPI_qos_flow_setup_item_parseFromJSON(qos_flows_list_local); if (!qos_flows_listItem) { ogs_error("No qos_flows_listItem"); - OpenAPI_list_free(qos_flows_listList); goto end; } OpenAPI_list_add(qos_flows_listList, qos_flows_listItem); @@ -1227,6 +1238,10 @@ eps_pdn_cnx_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "epsPdnCnxInfo"); if (eps_pdn_cnx_info) { eps_pdn_cnx_info_local_nonprim = OpenAPI_eps_pdn_cnx_info_parseFromJSON(eps_pdn_cnx_info); + if (!eps_pdn_cnx_info_local_nonprim) { + ogs_error("OpenAPI_eps_pdn_cnx_info_parseFromJSON failed eps_pdn_cnx_info"); + goto end; + } } eps_bearer_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "epsBearerInfo"); @@ -1247,7 +1262,6 @@ OpenAPI_eps_bearer_info_t *eps_bearer_infoItem = OpenAPI_eps_bearer_info_parseFromJSON(eps_bearer_info_local); if (!eps_bearer_infoItem) { ogs_error("No eps_bearer_infoItem"); - OpenAPI_list_free(eps_bearer_infoList); goto end; } OpenAPI_list_add(eps_bearer_infoList, eps_bearer_infoItem); @@ -1283,6 +1297,10 @@ up_security = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "upSecurity"); if (up_security) { up_security_local_nonprim = OpenAPI_up_security_parseFromJSON(up_security); + if (!up_security_local_nonprim) { + ogs_error("OpenAPI_up_security_parseFromJSON failed up_security"); + goto end; + } } h_smf_service_instance_id = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "hSmfServiceInstanceId"); @@ -1320,6 +1338,10 @@ psa_tunnel_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "psaTunnelInfo"); if (psa_tunnel_info) { psa_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(psa_tunnel_info); + if (!psa_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed psa_tunnel_info"); + goto end; + } } charging_id = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "chargingId"); @@ -1333,11 +1355,19 @@ charging_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "chargingInfo"); if (charging_info) { charging_info_local_nonprim = OpenAPI_charging_information_parseFromJSON(charging_info); + if (!charging_info_local_nonprim) { + ogs_error("OpenAPI_charging_information_parseFromJSON failed charging_info"); + goto end; + } } roaming_charging_profile = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "roamingChargingProfile"); if (roaming_charging_profile) { roaming_charging_profile_local_nonprim = OpenAPI_roaming_charging_profile_parseFromJSON(roaming_charging_profile); + if (!roaming_charging_profile_local_nonprim) { + ogs_error("OpenAPI_roaming_charging_profile_parseFromJSON failed roaming_charging_profile"); + goto end; + } } nef_ext_buf_support_ind = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "nefExtBufSupportInd"); @@ -1359,16 +1389,28 @@ dn_aaa_address = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "dnAaaAddress"); if (dn_aaa_address) { dn_aaa_address_local_nonprim = OpenAPI_ip_address_parseFromJSON(dn_aaa_address); + if (!dn_aaa_address_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed dn_aaa_address"); + goto end; + } } redundant_pdu_session_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "redundantPduSessionInfo"); if (redundant_pdu_session_info) { redundant_pdu_session_info_local_nonprim = OpenAPI_redundant_pdu_session_information_parseFromJSON(redundant_pdu_session_info); + if (!redundant_pdu_session_info_local_nonprim) { + ogs_error("OpenAPI_redundant_pdu_session_information_parseFromJSON failed redundant_pdu_session_info"); + goto end; + } } ran_tunnel_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "ranTunnelInfo"); if (ran_tunnel_info) { ran_tunnel_info_local_nonprim = OpenAPI_qos_flow_tunnel_parseFromJSON(ran_tunnel_info); + if (!ran_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_qos_flow_tunnel_parseFromJSON failed ran_tunnel_info"); + goto end; + } } add_ran_tunnel_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "addRanTunnelInfo"); @@ -1389,7 +1431,6 @@ OpenAPI_qos_flow_tunnel_t *add_ran_tunnel_infoItem = OpenAPI_qos_flow_tunnel_parseFromJSON(add_ran_tunnel_info_local); if (!add_ran_tunnel_infoItem) { ogs_error("No add_ran_tunnel_infoItem"); - OpenAPI_list_free(add_ran_tunnel_infoList); goto end; } OpenAPI_list_add(add_ran_tunnel_infoList, add_ran_tunnel_infoItem); @@ -1399,6 +1440,10 @@ red_ran_tunnel_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "redRanTunnelInfo"); if (red_ran_tunnel_info) { red_ran_tunnel_info_local_nonprim = OpenAPI_qos_flow_tunnel_parseFromJSON(red_ran_tunnel_info); + if (!red_ran_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_qos_flow_tunnel_parseFromJSON failed red_ran_tunnel_info"); + goto end; + } } add_red_ran_tunnel_info = cJSON_GetObjectItemCaseSensitive(sm_contextJSON, "addRedRanTunnelInfo"); @@ -1419,7 +1464,6 @@ OpenAPI_qos_flow_tunnel_t *add_red_ran_tunnel_infoItem = OpenAPI_qos_flow_tunnel_parseFromJSON(add_red_ran_tunnel_info_local); if (!add_red_ran_tunnel_infoItem) { ogs_error("No add_red_ran_tunnel_infoItem"); - OpenAPI_list_free(add_red_ran_tunnel_infoList); goto end; } OpenAPI_list_add(add_red_ran_tunnel_infoList, add_red_ran_tunnel_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_create_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_create_data.c
Changed
@@ -1615,11 +1615,19 @@ s_nssai = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } hplmn_snssai = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "hplmnSnssai"); if (hplmn_snssai) { hplmn_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(hplmn_snssai); + if (!hplmn_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed hplmn_snssai"); + goto end; + } } serving_nf_id = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "servingNfId"); @@ -1635,6 +1643,10 @@ guami = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } service_name = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "serviceName"); @@ -1651,6 +1663,10 @@ goto end; } serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } request_type = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "requestType"); if (request_type) { @@ -1664,6 +1680,10 @@ n1_sm_msg = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "n1SmMsg"); if (n1_sm_msg) { n1_sm_msg_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_msg); + if (!n1_sm_msg_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_msg"); + goto end; + } } an_type = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "anType"); @@ -1707,6 +1727,10 @@ ue_location = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "ueTimeZone"); @@ -1720,6 +1744,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } sm_context_status_uri = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "smContextStatusUri"); @@ -1967,7 +1995,6 @@ OpenAPI_backup_amf_info_t *backup_amf_infoItem = OpenAPI_backup_amf_info_parseFromJSON(backup_amf_info_local); if (!backup_amf_infoItem) { ogs_error("No backup_amf_infoItem"); - OpenAPI_list_free(backup_amf_infoList); goto end; } OpenAPI_list_add(backup_amf_infoList, backup_amf_infoItem); @@ -1977,6 +2004,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } udm_group_id = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "udmGroupId"); @@ -2031,6 +2062,10 @@ target_id = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "targetId"); if (target_id) { target_id_local_nonprim = OpenAPI_ng_ran_target_id_parseFromJSON(target_id); + if (!target_id_local_nonprim) { + ogs_error("OpenAPI_ng_ran_target_id_parseFromJSON failed target_id"); + goto end; + } } eps_bearer_ctx_status = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "epsBearerCtxStatus"); @@ -2084,6 +2119,10 @@ n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "n2SmInfoType"); @@ -2098,6 +2137,10 @@ n2_sm_info_ext1 = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "n2SmInfoExt1"); if (n2_sm_info_ext1) { n2_sm_info_ext1_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info_ext1); + if (!n2_sm_info_ext1_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info_ext1"); + goto end; + } } n2_sm_info_type_ext1 = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "n2SmInfoTypeExt1"); @@ -2120,6 +2163,10 @@ sm_context_smf_plmn_id = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "smContextSmfPlmnId"); if (sm_context_smf_plmn_id) { sm_context_smf_plmn_id_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(sm_context_smf_plmn_id); + if (!sm_context_smf_plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed sm_context_smf_plmn_id"); + goto end; + } } sm_context_smf_id = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "smContextSmfId"); @@ -2167,11 +2214,19 @@ small_data_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } extended_nas_sm_timer_ind = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "extendedNasSmTimerInd"); @@ -2193,6 +2248,10 @@ ddn_failure_subs = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "ddnFailureSubs"); if (ddn_failure_subs) { ddn_failure_subs_local_nonprim = OpenAPI_ddn_failure_subs_parseFromJSON(ddn_failure_subs); + if (!ddn_failure_subs_local_nonprim) { + ogs_error("OpenAPI_ddn_failure_subs_parseFromJSON failed ddn_failure_subs"); + goto end; + } } smf_transfer_ind = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "smfTransferInd"); @@ -2222,16 +2281,28 @@ w_agf_info = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "wAgfInfo"); if (w_agf_info) { w_agf_info_local_nonprim = OpenAPI_w_agf_info_parseFromJSON(w_agf_info); + if (!w_agf_info_local_nonprim) { + ogs_error("OpenAPI_w_agf_info_parseFromJSON failed w_agf_info"); + goto end; + } } tngf_info = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "tngfInfo"); if (tngf_info) { tngf_info_local_nonprim = OpenAPI_tngf_info_parseFromJSON(tngf_info); + if (!tngf_info_local_nonprim) { + ogs_error("OpenAPI_tngf_info_parseFromJSON failed tngf_info"); + goto end; + } } twif_info = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "twifInfo"); if (twif_info) { twif_info_local_nonprim = OpenAPI_twif_info_parseFromJSON(twif_info); + if (!twif_info_local_nonprim) { + ogs_error("OpenAPI_twif_info_parseFromJSON failed twif_info"); + goto end; + } } ran_unchanged_ind = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "ranUnchangedInd"); @@ -2338,7 +2409,6 @@ OpenAPI_server_addressing_info_t *pvs_infoItem = OpenAPI_server_addressing_info_parseFromJSON(pvs_info_local); if (!pvs_infoItem) { ogs_error("No pvs_infoItem"); - OpenAPI_list_free(pvs_infoList); goto end; } OpenAPI_list_add(pvs_infoList, pvs_infoItem); @@ -2372,6 +2442,10 @@ pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "pcfUeCallbackInfo"); if (pcf_ue_callback_info) { pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info); + if (!pcf_ue_callback_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_callback_info"); + goto end; + } } satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(sm_context_create_dataJSON, "satelliteBackhaulCat");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_create_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_create_error.c
Changed
@@ -139,15 +139,27 @@ goto end; } error_local_nonprim = OpenAPI_ext_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_ext_problem_details_parseFromJSON failed error"); + goto end; + } n1_sm_msg = cJSON_GetObjectItemCaseSensitive(sm_context_create_errorJSON, "n1SmMsg"); if (n1_sm_msg) { n1_sm_msg_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_msg); + if (!n1_sm_msg_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_msg"); + goto end; + } } n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_create_errorJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_create_errorJSON, "n2SmInfoType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_created_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_created_data.c
Changed
@@ -310,6 +310,10 @@ s_nssai = cJSON_GetObjectItemCaseSensitive(sm_context_created_dataJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } up_cnx_state = cJSON_GetObjectItemCaseSensitive(sm_context_created_dataJSON, "upCnxState"); @@ -324,6 +328,10 @@ n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_created_dataJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_created_dataJSON, "n2SmInfoType"); @@ -353,7 +361,6 @@ OpenAPI_ebi_arp_mapping_t *allocated_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(allocated_ebi_list_local); if (!allocated_ebi_listItem) { ogs_error("No allocated_ebi_listItem"); - OpenAPI_list_free(allocated_ebi_listList); goto end; } OpenAPI_list_add(allocated_ebi_listList, allocated_ebi_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_release_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_release_data.c
Changed
@@ -211,6 +211,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } _5g_mm_cause_value = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "5gMmCauseValue"); @@ -224,6 +228,10 @@ ue_location = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "ueTimeZone"); @@ -237,6 +245,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } vsmf_release_only = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "vsmfReleaseOnly"); @@ -250,6 +262,10 @@ n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_release_dataJSON, "n2SmInfoType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_released_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_released_data.c
Changed
@@ -88,11 +88,19 @@ small_data_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_released_dataJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_released_dataJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } sm_context_released_data_local_var = OpenAPI_sm_context_released_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_retrieve_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_retrieve_data.c
Changed
@@ -136,6 +136,10 @@ target_mme_cap = cJSON_GetObjectItemCaseSensitive(sm_context_retrieve_dataJSON, "targetMmeCap"); if (target_mme_cap) { target_mme_cap_local_nonprim = OpenAPI_mme_capabilities_parseFromJSON(target_mme_cap); + if (!target_mme_cap_local_nonprim) { + ogs_error("OpenAPI_mme_capabilities_parseFromJSON failed target_mme_cap"); + goto end; + } } sm_context_type = cJSON_GetObjectItemCaseSensitive(sm_context_retrieve_dataJSON, "smContextType"); @@ -150,6 +154,10 @@ serving_network = cJSON_GetObjectItemCaseSensitive(sm_context_retrieve_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed serving_network"); + goto end; + } } not_to_transfer_ebi_list = cJSON_GetObjectItemCaseSensitive(sm_context_retrieve_dataJSON, "notToTransferEbiList");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_retrieved_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_retrieved_data.c
Changed
@@ -168,16 +168,28 @@ sm_context = cJSON_GetObjectItemCaseSensitive(sm_context_retrieved_dataJSON, "smContext"); if (sm_context) { sm_context_local_nonprim = OpenAPI_sm_context_parseFromJSON(sm_context); + if (!sm_context_local_nonprim) { + ogs_error("OpenAPI_sm_context_parseFromJSON failed sm_context"); + goto end; + } } small_data_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_retrieved_dataJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_retrieved_dataJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } dl_data_waiting_ind = cJSON_GetObjectItemCaseSensitive(sm_context_retrieved_dataJSON, "dlDataWaitingInd"); @@ -191,6 +203,10 @@ af_coordination_info = cJSON_GetObjectItemCaseSensitive(sm_context_retrieved_dataJSON, "afCoordinationInfo"); if (af_coordination_info) { af_coordination_info_local_nonprim = OpenAPI_af_coordination_info_parseFromJSON(af_coordination_info); + if (!af_coordination_info_local_nonprim) { + ogs_error("OpenAPI_af_coordination_info_parseFromJSON failed af_coordination_info"); + goto end; + } } sm_context_retrieved_data_local_var = OpenAPI_sm_context_retrieved_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_status_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_status_notification.c
Changed
@@ -298,15 +298,27 @@ goto end; } status_info_local_nonprim = OpenAPI_status_info_parseFromJSON(status_info); + if (!status_info_local_nonprim) { + ogs_error("OpenAPI_status_info_parseFromJSON failed status_info"); + goto end; + } small_data_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_status_notificationJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(sm_context_status_notificationJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } ddn_failure_status = cJSON_GetObjectItemCaseSensitive(sm_context_status_notificationJSON, "ddnFailureStatus"); @@ -397,6 +409,10 @@ target_dnai_info = cJSON_GetObjectItemCaseSensitive(sm_context_status_notificationJSON, "targetDnaiInfo"); if (target_dnai_info) { target_dnai_info_local_nonprim = OpenAPI_target_dnai_info_parseFromJSON(target_dnai_info); + if (!target_dnai_info_local_nonprim) { + ogs_error("OpenAPI_target_dnai_info_parseFromJSON failed target_dnai_info"); + goto end; + } } old_pdu_session_ref = cJSON_GetObjectItemCaseSensitive(sm_context_status_notificationJSON, "oldPduSessionRef");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_update_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_update_data.c
Changed
@@ -1007,11 +1007,19 @@ guami = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "guami"); if (guami) { guami_local_nonprim = OpenAPI_guami_parseFromJSON(guami); + if (!guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed guami"); + goto end; + } } serving_network = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } backup_amf_info = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "backupAmfInfo"); @@ -1032,7 +1040,6 @@ OpenAPI_backup_amf_info_t *backup_amf_infoItem = OpenAPI_backup_amf_info_parseFromJSON(backup_amf_info_local); if (!backup_amf_infoItem) { ogs_error("No backup_amf_infoItem"); - OpenAPI_list_free(backup_amf_infoList); goto end; } OpenAPI_list_add(backup_amf_infoList, backup_amf_infoItem); @@ -1087,6 +1094,10 @@ ue_location = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "ueTimeZone"); @@ -1100,6 +1111,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } up_cnx_state = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "upCnxState"); @@ -1139,11 +1154,19 @@ n1_sm_msg = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n1SmMsg"); if (n1_sm_msg) { n1_sm_msg_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_msg); + if (!n1_sm_msg_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_msg"); + goto end; + } } n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n2SmInfoType"); @@ -1158,6 +1181,10 @@ target_id = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "targetId"); if (target_id) { target_id_local_nonprim = OpenAPI_ng_ran_target_id_parseFromJSON(target_id); + if (!target_id_local_nonprim) { + ogs_error("OpenAPI_ng_ran_target_id_parseFromJSON failed target_id"); + goto end; + } } target_serving_nf_id = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "targetServingNfId"); @@ -1187,6 +1214,10 @@ n9_forwarding_tunnel = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n9ForwardingTunnel"); if (n9_forwarding_tunnel) { n9_forwarding_tunnel_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(n9_forwarding_tunnel); + if (!n9_forwarding_tunnel_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed n9_forwarding_tunnel"); + goto end; + } } n9_dl_forwarding_tnl_list = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n9DlForwardingTnlList"); @@ -1207,7 +1238,6 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *n9_dl_forwarding_tnl_listItem = OpenAPI_indirect_data_forwarding_tunnel_info_parseFromJSON(n9_dl_forwarding_tnl_list_local); if (!n9_dl_forwarding_tnl_listItem) { ogs_error("No n9_dl_forwarding_tnl_listItem"); - OpenAPI_list_free(n9_dl_forwarding_tnl_listList); goto end; } OpenAPI_list_add(n9_dl_forwarding_tnl_listList, n9_dl_forwarding_tnl_listItem); @@ -1232,7 +1262,6 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *n9_ul_forwarding_tnl_listItem = OpenAPI_indirect_data_forwarding_tunnel_info_parseFromJSON(n9_ul_forwarding_tnl_list_local); if (!n9_ul_forwarding_tnl_listItem) { ogs_error("No n9_ul_forwarding_tnl_listItem"); - OpenAPI_list_free(n9_ul_forwarding_tnl_listList); goto end; } OpenAPI_list_add(n9_ul_forwarding_tnl_listList, n9_ul_forwarding_tnl_listItem); @@ -1242,6 +1271,10 @@ n9_dl_forwarding_tunnel = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n9DlForwardingTunnel"); if (n9_dl_forwarding_tunnel) { n9_dl_forwarding_tunnel_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(n9_dl_forwarding_tunnel); + if (!n9_dl_forwarding_tunnel_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed n9_dl_forwarding_tunnel"); + goto end; + } } n9_inactivity_timer = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n9InactivityTimer"); @@ -1320,6 +1353,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } _5g_mm_cause_value = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "5gMmCauseValue"); @@ -1333,11 +1370,19 @@ s_nssai = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } eps_interworking_ind = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "epsInterworkingInd"); @@ -1360,6 +1405,10 @@ n2_sm_info_ext1 = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n2SmInfoExt1"); if (n2_sm_info_ext1) { n2_sm_info_ext1_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info_ext1); + if (!n2_sm_info_ext1_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info_ext1"); + goto end; + } } n2_sm_info_type_ext1 = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "n2SmInfoTypeExt1"); @@ -1399,6 +1448,10 @@ exemption_ind = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "exemptionInd"); if (exemption_ind) { exemption_ind_local_nonprim = OpenAPI_exemption_ind_parseFromJSON(exemption_ind); + if (!exemption_ind_local_nonprim) { + ogs_error("OpenAPI_exemption_ind_parseFromJSON failed exemption_ind"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "supportedFeatures"); @@ -1412,6 +1465,10 @@ mo_exp_data_counter = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "moExpDataCounter"); if (mo_exp_data_counter) { mo_exp_data_counter_local_nonprim = OpenAPI_mo_exp_data_counter_parseFromJSON(mo_exp_data_counter); + if (!mo_exp_data_counter_local_nonprim) { + ogs_error("OpenAPI_mo_exp_data_counter_parseFromJSON failed mo_exp_data_counter"); + goto end; + } } extended_nas_sm_timer_ind = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "extendedNasSmTimerInd"); @@ -1454,6 +1511,10 @@ ddn_failure_subs = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "ddnFailureSubs"); if (ddn_failure_subs) { ddn_failure_subs_local_nonprim = OpenAPI_ddn_failure_subs_parseFromJSON(ddn_failure_subs); + if (!ddn_failure_subs_local_nonprim) { + ogs_error("OpenAPI_ddn_failure_subs_parseFromJSON failed ddn_failure_subs"); + goto end; + } } skip_n2_pdu_session_res_rel_ind = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "skipN2PduSessionResRelInd"); @@ -1497,6 +1558,10 @@ pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "pcfUeCallbackInfo"); if (pcf_ue_callback_info) { pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info); + if (!pcf_ue_callback_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_callback_info"); + goto end; + } } satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(sm_context_update_dataJSON, "satelliteBackhaulCat");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_update_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_update_error.c
Changed
@@ -150,15 +150,27 @@ goto end; } error_local_nonprim = OpenAPI_ext_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_ext_problem_details_parseFromJSON failed error"); + goto end; + } n1_sm_msg = cJSON_GetObjectItemCaseSensitive(sm_context_update_errorJSON, "n1SmMsg"); if (n1_sm_msg) { n1_sm_msg_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_msg); + if (!n1_sm_msg_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_msg"); + goto end; + } } n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_update_errorJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_update_errorJSON, "n2SmInfoType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_context_updated_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_context_updated_data.c
Changed
@@ -511,7 +511,6 @@ OpenAPI_ebi_arp_mapping_t *allocated_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(allocated_ebi_list_local); if (!allocated_ebi_listItem) { ogs_error("No allocated_ebi_listItem"); - OpenAPI_list_free(allocated_ebi_listList); goto end; } OpenAPI_list_add(allocated_ebi_listList, allocated_ebi_listItem); @@ -536,7 +535,6 @@ OpenAPI_ebi_arp_mapping_t *modified_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(modified_ebi_list_local); if (!modified_ebi_listItem) { ogs_error("No modified_ebi_listItem"); - OpenAPI_list_free(modified_ebi_listList); goto end; } OpenAPI_list_add(modified_ebi_listList, modified_ebi_listItem); @@ -546,11 +544,19 @@ n1_sm_msg = cJSON_GetObjectItemCaseSensitive(sm_context_updated_dataJSON, "n1SmMsg"); if (n1_sm_msg) { n1_sm_msg_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_msg); + if (!n1_sm_msg_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_msg"); + goto end; + } } n2_sm_info = cJSON_GetObjectItemCaseSensitive(sm_context_updated_dataJSON, "n2SmInfo"); if (n2_sm_info) { n2_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n2_sm_info); + if (!n2_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n2_sm_info"); + goto end; + } } n2_sm_info_type = cJSON_GetObjectItemCaseSensitive(sm_context_updated_dataJSON, "n2SmInfoType"); @@ -609,7 +615,6 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *n3_dl_forwarding_tnl_listItem = OpenAPI_indirect_data_forwarding_tunnel_info_parseFromJSON(n3_dl_forwarding_tnl_list_local); if (!n3_dl_forwarding_tnl_listItem) { ogs_error("No n3_dl_forwarding_tnl_listItem"); - OpenAPI_list_free(n3_dl_forwarding_tnl_listList); goto end; } OpenAPI_list_add(n3_dl_forwarding_tnl_listList, n3_dl_forwarding_tnl_listItem); @@ -634,7 +639,6 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *n3_ul_forwarding_tnl_listItem = OpenAPI_indirect_data_forwarding_tunnel_info_parseFromJSON(n3_ul_forwarding_tnl_list_local); if (!n3_ul_forwarding_tnl_listItem) { ogs_error("No n3_ul_forwarding_tnl_listItem"); - OpenAPI_list_free(n3_ul_forwarding_tnl_listList); goto end; } OpenAPI_list_add(n3_ul_forwarding_tnl_listList, n3_ul_forwarding_tnl_listItem); @@ -644,6 +648,10 @@ n9_ul_forwarding_tunnel = cJSON_GetObjectItemCaseSensitive(sm_context_updated_dataJSON, "n9UlForwardingTunnel"); if (n9_ul_forwarding_tunnel) { n9_ul_forwarding_tunnel_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(n9_ul_forwarding_tunnel); + if (!n9_ul_forwarding_tunnel_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed n9_ul_forwarding_tunnel"); + goto end; + } } cause = cJSON_GetObjectItemCaseSensitive(sm_context_updated_dataJSON, "cause"); @@ -727,6 +735,10 @@ anchor_smf_features = cJSON_GetObjectItemCaseSensitive(sm_context_updated_dataJSON, "anchorSmfFeatures"); if (anchor_smf_features) { anchor_smf_features_local_nonprim = OpenAPI_anchor_smf_features_parseFromJSON(anchor_smf_features); + if (!anchor_smf_features_local_nonprim) { + ogs_error("OpenAPI_anchor_smf_features_parseFromJSON failed anchor_smf_features"); + goto end; + } } sm_context_updated_data_local_var = OpenAPI_sm_context_updated_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_context_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_context_data.c
Changed
@@ -813,11 +813,19 @@ acc_net_ch_id = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "accNetChId"); if (acc_net_ch_id) { acc_net_ch_id_local_nonprim = OpenAPI_acc_net_ch_id_parseFromJSON(acc_net_ch_id); + if (!acc_net_ch_id_local_nonprim) { + ogs_error("OpenAPI_acc_net_ch_id_parseFromJSON failed acc_net_ch_id"); + goto end; + } } charg_entity_addr = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "chargEntityAddr"); if (charg_entity_addr) { charg_entity_addr_local_nonprim = OpenAPI_acc_net_charging_address_parseFromJSON(charg_entity_addr); + if (!charg_entity_addr_local_nonprim) { + ogs_error("OpenAPI_acc_net_charging_address_parseFromJSON failed charg_entity_addr"); + goto end; + } } gpsi = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "gpsi"); @@ -946,16 +954,28 @@ add_access_info = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "addAccessInfo"); if (add_access_info) { add_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(add_access_info); + if (!add_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed add_access_info"); + goto end; + } } serving_network = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } user_location_info = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "userLocationInfo"); if (user_location_info) { user_location_info_local_nonprim = OpenAPI_user_location_parseFromJSON(user_location_info); + if (!user_location_info_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_location_info"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "ueTimeZone"); @@ -1001,6 +1021,10 @@ subs_sess_ambr = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "subsSessAmbr"); if (subs_sess_ambr) { subs_sess_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(subs_sess_ambr); + if (!subs_sess_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed subs_sess_ambr"); + goto end; + } } auth_prof_index = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "authProfIndex"); @@ -1014,11 +1038,19 @@ subs_def_qos = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "subsDefQos"); if (subs_def_qos) { subs_def_qos_local_nonprim = OpenAPI_subscribed_default_qos_parseFromJSON(subs_def_qos); + if (!subs_def_qos_local_nonprim) { + ogs_error("OpenAPI_subscribed_default_qos_parseFromJSON failed subs_def_qos"); + goto end; + } } vplmn_qos = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "vplmnQos"); if (vplmn_qos) { vplmn_qos_local_nonprim = OpenAPI_vplmn_qos_parseFromJSON(vplmn_qos); + if (!vplmn_qos_local_nonprim) { + ogs_error("OpenAPI_vplmn_qos_parseFromJSON failed vplmn_qos"); + goto end; + } } num_of_pack_filter = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "numOfPackFilter"); @@ -1064,6 +1096,10 @@ trace_req = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "traceReq"); if (trace_req) { trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req); + if (!trace_req_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_req"); + goto end; + } } slice_info = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "sliceInfo"); @@ -1072,6 +1108,10 @@ goto end; } slice_info_local_nonprim = OpenAPI_snssai_parseFromJSON(slice_info); + if (!slice_info_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed slice_info"); + goto end; + } qos_flow_usage = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "qosFlowUsage"); if (qos_flow_usage) { @@ -1085,6 +1125,10 @@ serv_nf_id = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "servNfId"); if (serv_nf_id) { serv_nf_id_local_nonprim = OpenAPI_serving_nf_identity_parseFromJSON(serv_nf_id); + if (!serv_nf_id_local_nonprim) { + ogs_error("OpenAPI_serving_nf_identity_parseFromJSON failed serv_nf_id"); + goto end; + } } supp_feat = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "suppFeat"); @@ -1183,6 +1227,10 @@ pcf_ue_info = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "pcfUeInfo"); if (pcf_ue_info) { pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info); + if (!pcf_ue_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_info"); + goto end; + } } pvs_info = cJSON_GetObjectItemCaseSensitive(sm_policy_context_dataJSON, "pvsInfo"); @@ -1203,7 +1251,6 @@ OpenAPI_server_addressing_info_t *pvs_infoItem = OpenAPI_server_addressing_info_parseFromJSON(pvs_info_local); if (!pvs_infoItem) { ogs_error("No pvs_infoItem"); - OpenAPI_list_free(pvs_infoList); goto end; } OpenAPI_list_add(pvs_infoList, pvs_infoItem); @@ -1236,7 +1283,6 @@ OpenAPI_nwdaf_data_t *nwdaf_datasItem = OpenAPI_nwdaf_data_parseFromJSON(nwdaf_datas_local); if (!nwdaf_datasItem) { ogs_error("No nwdaf_datasItem"); - OpenAPI_list_free(nwdaf_datasList); goto end; } OpenAPI_list_add(nwdaf_datasList, nwdaf_datasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_control.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_control.c
Changed
@@ -95,6 +95,10 @@ goto end; } context_local_nonprim = OpenAPI_sm_policy_context_data_parseFromJSON(context); + if (!context_local_nonprim) { + ogs_error("OpenAPI_sm_policy_context_data_parseFromJSON failed context"); + goto end; + } policy = cJSON_GetObjectItemCaseSensitive(sm_policy_controlJSON, "policy"); if (!policy) { @@ -102,6 +106,10 @@ goto end; } policy_local_nonprim = OpenAPI_sm_policy_decision_parseFromJSON(policy); + if (!policy_local_nonprim) { + ogs_error("OpenAPI_sm_policy_decision_parseFromJSON failed policy"); + goto end; + } sm_policy_control_local_var = OpenAPI_sm_policy_control_create ( context_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_decision.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_decision.c
Changed
@@ -824,6 +824,10 @@ charging_info = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "chargingInfo"); if (charging_info) { charging_info_local_nonprim = OpenAPI_charging_information_parseFromJSON(charging_info); + if (!charging_info_local_nonprim) { + ogs_error("OpenAPI_charging_information_parseFromJSON failed charging_info"); + goto end; + } } traff_cont_decs = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "traffContDecs"); @@ -1033,7 +1037,6 @@ OpenAPI_requested_rule_data_t *last_req_rule_dataItem = OpenAPI_requested_rule_data_parseFromJSON(last_req_rule_data_local); if (!last_req_rule_dataItem) { ogs_error("No last_req_rule_dataItem"); - OpenAPI_list_free(last_req_rule_dataList); goto end; } OpenAPI_list_add(last_req_rule_dataList, last_req_rule_dataItem); @@ -1043,6 +1046,10 @@ last_req_usage_data = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "lastReqUsageData"); if (last_req_usage_data) { last_req_usage_data_local_nonprim = OpenAPI_requested_usage_data_parseFromJSON(last_req_usage_data); + if (!last_req_usage_data_local_nonprim) { + ogs_error("OpenAPI_requested_usage_data_parseFromJSON failed last_req_usage_data"); + goto end; + } } pra_infos = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "praInfos"); @@ -1116,11 +1123,19 @@ tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(sm_policy_decisionJSON, "tsnPortManContNwtts"); @@ -1141,7 +1156,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_delete_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_delete_data.c
Changed
@@ -208,6 +208,10 @@ user_location_info = cJSON_GetObjectItemCaseSensitive(sm_policy_delete_dataJSON, "userLocationInfo"); if (user_location_info) { user_location_info_local_nonprim = OpenAPI_user_location_parseFromJSON(user_location_info); + if (!user_location_info_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_location_info"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(sm_policy_delete_dataJSON, "ueTimeZone"); @@ -221,6 +225,10 @@ serving_network = cJSON_GetObjectItemCaseSensitive(sm_policy_delete_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } user_location_info_time = cJSON_GetObjectItemCaseSensitive(sm_policy_delete_dataJSON, "userLocationInfoTime"); @@ -249,7 +257,6 @@ OpenAPI_ran_nas_rel_cause_t *ran_nas_rel_causesItem = OpenAPI_ran_nas_rel_cause_parseFromJSON(ran_nas_rel_causes_local); if (!ran_nas_rel_causesItem) { ogs_error("No ran_nas_rel_causesItem"); - OpenAPI_list_free(ran_nas_rel_causesList); goto end; } OpenAPI_list_add(ran_nas_rel_causesList, ran_nas_rel_causesItem); @@ -274,7 +281,6 @@ OpenAPI_accu_usage_report_t *accu_usage_reportsItem = OpenAPI_accu_usage_report_parseFromJSON(accu_usage_reports_local); if (!accu_usage_reportsItem) { ogs_error("No accu_usage_reportsItem"); - OpenAPI_list_free(accu_usage_reportsList); goto end; } OpenAPI_list_add(accu_usage_reportsList, accu_usage_reportsItem); @@ -308,7 +314,6 @@ OpenAPI_qos_monitoring_report_t *qos_mon_reportsItem = OpenAPI_qos_monitoring_report_parseFromJSON(qos_mon_reports_local); if (!qos_mon_reportsItem) { ogs_error("No qos_mon_reportsItem"); - OpenAPI_list_free(qos_mon_reportsList); goto end; } OpenAPI_list_add(qos_mon_reportsList, qos_mon_reportsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_dnn_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_dnn_data.c
Changed
@@ -525,6 +525,10 @@ chf_info = cJSON_GetObjectItemCaseSensitive(sm_policy_dnn_dataJSON, "chfInfo"); if (chf_info) { chf_info_local_nonprim = OpenAPI_charging_information_parseFromJSON(chf_info); + if (!chf_info_local_nonprim) { + ogs_error("OpenAPI_charging_information_parseFromJSON failed chf_info"); + goto end; + } } ref_um_data_limit_ids = cJSON_GetObjectItemCaseSensitive(sm_policy_dnn_dataJSON, "refUmDataLimitIds");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_notification.c
Changed
@@ -89,6 +89,10 @@ sm_policy_decision = cJSON_GetObjectItemCaseSensitive(sm_policy_notificationJSON, "smPolicyDecision"); if (sm_policy_decision) { sm_policy_decision_local_nonprim = OpenAPI_sm_policy_decision_parseFromJSON(sm_policy_decision); + if (!sm_policy_decision_local_nonprim) { + ogs_error("OpenAPI_sm_policy_decision_parseFromJSON failed sm_policy_decision"); + goto end; + } } sm_policy_notification_local_var = OpenAPI_sm_policy_notification_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data.c
Changed
@@ -129,6 +129,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } sm_policy_dnn_data = cJSON_GetObjectItemCaseSensitive(sm_policy_snssai_dataJSON, "smPolicyDnnData"); if (sm_policy_dnn_data) { @@ -159,6 +163,10 @@ ue_slice_mbr = cJSON_GetObjectItemCaseSensitive(sm_policy_snssai_dataJSON, "ueSliceMbr"); if (ue_slice_mbr) { ue_slice_mbr_local_nonprim = OpenAPI_slice_mbr_1_parseFromJSON(ue_slice_mbr); + if (!ue_slice_mbr_local_nonprim) { + ogs_error("OpenAPI_slice_mbr_1_parseFromJSON failed ue_slice_mbr"); + goto end; + } } sm_policy_snssai_data_local_var = OpenAPI_sm_policy_snssai_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c
Changed
@@ -108,6 +108,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } sm_policy_dnn_data = cJSON_GetObjectItemCaseSensitive(sm_policy_snssai_data_patchJSON, "smPolicyDnnData"); if (sm_policy_dnn_data) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_policy_update_context_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_policy_update_context_data.c
Changed
@@ -1144,7 +1144,6 @@ OpenAPI_acc_net_ch_id_t *acc_net_ch_idsItem = OpenAPI_acc_net_ch_id_parseFromJSON(acc_net_ch_ids_local); if (!acc_net_ch_idsItem) { ogs_error("No acc_net_ch_idsItem"); - OpenAPI_list_free(acc_net_ch_idsList); goto end; } OpenAPI_list_add(acc_net_ch_idsList, acc_net_ch_idsItem); @@ -1172,21 +1171,37 @@ add_access_info = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "addAccessInfo"); if (add_access_info) { add_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(add_access_info); + if (!add_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed add_access_info"); + goto end; + } } rel_access_info = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "relAccessInfo"); if (rel_access_info) { rel_access_info_local_nonprim = OpenAPI_additional_access_info_parseFromJSON(rel_access_info); + if (!rel_access_info_local_nonprim) { + ogs_error("OpenAPI_additional_access_info_parseFromJSON failed rel_access_info"); + goto end; + } } serving_network = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } user_location_info = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "userLocationInfo"); if (user_location_info) { user_location_info_local_nonprim = OpenAPI_user_location_parseFromJSON(user_location_info); + if (!user_location_info_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_location_info"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "ueTimeZone"); @@ -1272,6 +1287,10 @@ subs_sess_ambr = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "subsSessAmbr"); if (subs_sess_ambr) { subs_sess_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(subs_sess_ambr); + if (!subs_sess_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed subs_sess_ambr"); + goto end; + } } auth_prof_index = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "authProfIndex"); @@ -1285,11 +1304,19 @@ subs_def_qos = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "subsDefQos"); if (subs_def_qos) { subs_def_qos_local_nonprim = OpenAPI_subscribed_default_qos_parseFromJSON(subs_def_qos); + if (!subs_def_qos_local_nonprim) { + ogs_error("OpenAPI_subscribed_default_qos_parseFromJSON failed subs_def_qos"); + goto end; + } } vplmn_qos = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "vplmnQos"); if (vplmn_qos) { vplmn_qos_local_nonprim = OpenAPI_vplmn_qos_parseFromJSON(vplmn_qos); + if (!vplmn_qos_local_nonprim) { + ogs_error("OpenAPI_vplmn_qos_parseFromJSON failed vplmn_qos"); + goto end; + } } vplmn_qos_not_app = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "vplmnQosNotApp"); @@ -1326,7 +1353,6 @@ OpenAPI_accu_usage_report_t *accu_usage_reportsItem = OpenAPI_accu_usage_report_parseFromJSON(accu_usage_reports_local); if (!accu_usage_reportsItem) { ogs_error("No accu_usage_reportsItem"); - OpenAPI_list_free(accu_usage_reportsList); goto end; } OpenAPI_list_add(accu_usage_reportsList, accu_usage_reportsItem); @@ -1359,7 +1385,6 @@ OpenAPI_app_detection_info_t *app_detection_infosItem = OpenAPI_app_detection_info_parseFromJSON(app_detection_infos_local); if (!app_detection_infosItem) { ogs_error("No app_detection_infosItem"); - OpenAPI_list_free(app_detection_infosList); goto end; } OpenAPI_list_add(app_detection_infosList, app_detection_infosItem); @@ -1384,7 +1409,6 @@ OpenAPI_rule_report_t *rule_reportsItem = OpenAPI_rule_report_parseFromJSON(rule_reports_local); if (!rule_reportsItem) { ogs_error("No rule_reportsItem"); - OpenAPI_list_free(rule_reportsList); goto end; } OpenAPI_list_add(rule_reportsList, rule_reportsItem); @@ -1409,7 +1433,6 @@ OpenAPI_session_rule_report_t *sess_rule_reportsItem = OpenAPI_session_rule_report_parseFromJSON(sess_rule_reports_local); if (!sess_rule_reportsItem) { ogs_error("No sess_rule_reportsItem"); - OpenAPI_list_free(sess_rule_reportsList); goto end; } OpenAPI_list_add(sess_rule_reportsList, sess_rule_reportsItem); @@ -1434,7 +1457,6 @@ OpenAPI_qos_notification_control_info_t *qnc_reportsItem = OpenAPI_qos_notification_control_info_parseFromJSON(qnc_reports_local); if (!qnc_reportsItem) { ogs_error("No qnc_reportsItem"); - OpenAPI_list_free(qnc_reportsList); goto end; } OpenAPI_list_add(qnc_reportsList, qnc_reportsItem); @@ -1459,7 +1481,6 @@ OpenAPI_qos_monitoring_report_t *qos_mon_reportsItem = OpenAPI_qos_monitoring_report_parseFromJSON(qos_mon_reports_local); if (!qos_mon_reportsItem) { ogs_error("No qos_mon_reportsItem"); - OpenAPI_list_free(qos_mon_reportsList); goto end; } OpenAPI_list_add(qos_mon_reportsList, qos_mon_reportsItem); @@ -1503,6 +1524,10 @@ ue_init_res_req = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "ueInitResReq"); if (ue_init_res_req) { ue_init_res_req_local_nonprim = OpenAPI_ue_initiated_resource_request_parseFromJSON(ue_init_res_req); + if (!ue_init_res_req_local_nonprim) { + ogs_error("OpenAPI_ue_initiated_resource_request_parseFromJSON failed ue_init_res_req"); + goto end; + } } ref_qos_indication = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "refQosIndication"); @@ -1534,11 +1559,19 @@ serv_nf_id = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "servNfId"); if (serv_nf_id) { serv_nf_id_local_nonprim = OpenAPI_serving_nf_identity_parseFromJSON(serv_nf_id); + if (!serv_nf_id_local_nonprim) { + ogs_error("OpenAPI_serving_nf_identity_parseFromJSON failed serv_nf_id"); + goto end; + } } trace_req = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "traceReq"); if (trace_req) { trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req); + if (!trace_req_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_req"); + goto end; + } } ma_pdu_ind = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "maPduInd"); @@ -1562,16 +1595,28 @@ tsn_bridge_info = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "tsnBridgeInfo"); if (tsn_bridge_info) { tsn_bridge_info_local_nonprim = OpenAPI_tsn_bridge_info_parseFromJSON(tsn_bridge_info); + if (!tsn_bridge_info_local_nonprim) { + ogs_error("OpenAPI_tsn_bridge_info_parseFromJSON failed tsn_bridge_info"); + goto end; + } } tsn_bridge_man_cont = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "tsnBridgeManCont"); if (tsn_bridge_man_cont) { tsn_bridge_man_cont_local_nonprim = OpenAPI_bridge_management_container_parseFromJSON(tsn_bridge_man_cont); + if (!tsn_bridge_man_cont_local_nonprim) { + ogs_error("OpenAPI_bridge_management_container_parseFromJSON failed tsn_bridge_man_cont"); + goto end; + } } tsn_port_man_cont_dstt = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "tsnPortManContDstt"); if (tsn_port_man_cont_dstt) { tsn_port_man_cont_dstt_local_nonprim = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_dstt); + if (!tsn_port_man_cont_dstt_local_nonprim) { + ogs_error("OpenAPI_port_management_container_parseFromJSON failed tsn_port_man_cont_dstt"); + goto end; + } } tsn_port_man_cont_nwtts = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "tsnPortManContNwtts"); @@ -1592,7 +1637,6 @@ OpenAPI_port_management_container_t *tsn_port_man_cont_nwttsItem = OpenAPI_port_management_container_parseFromJSON(tsn_port_man_cont_nwtts_local); if (!tsn_port_man_cont_nwttsItem) { ogs_error("No tsn_port_man_cont_nwttsItem"); - OpenAPI_list_free(tsn_port_man_cont_nwttsList); goto end; } OpenAPI_list_add(tsn_port_man_cont_nwttsList, tsn_port_man_cont_nwttsItem); @@ -1617,7 +1661,6 @@ OpenAPI_ip_multicast_address_info_t *mul_addr_infosItem = OpenAPI_ip_multicast_address_info_parseFromJSON(mul_addr_infos_local); if (!mul_addr_infosItem) { ogs_error("No mul_addr_infosItem"); - OpenAPI_list_free(mul_addr_infosList); goto end; } OpenAPI_list_add(mul_addr_infosList, mul_addr_infosItem); @@ -1661,7 +1704,6 @@ OpenAPI_invalid_param_t *invalid_policy_decsItem = OpenAPI_invalid_param_parseFromJSON(invalid_policy_decs_local); if (!invalid_policy_decsItem) { ogs_error("No invalid_policy_decsItem"); - OpenAPI_list_free(invalid_policy_decsList); goto end; } OpenAPI_list_add(invalid_policy_decsList, invalid_policy_decsItem); @@ -1686,7 +1728,6 @@ OpenAPI_ddd_traffic_descriptor_t *traffic_descriptorsItem = OpenAPI_ddd_traffic_descriptor_parseFromJSON(traffic_descriptors_local); if (!traffic_descriptorsItem) { ogs_error("No traffic_descriptorsItem"); - OpenAPI_list_free(traffic_descriptorsList); goto end; } OpenAPI_list_add(traffic_descriptorsList, traffic_descriptorsItem); @@ -1753,6 +1794,10 @@ pcf_ue_info = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "pcfUeInfo"); if (pcf_ue_info) { pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info); + if (!pcf_ue_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_info"); + goto end; + } } nwdaf_datas = cJSON_GetObjectItemCaseSensitive(sm_policy_update_context_dataJSON, "nwdafDatas"); @@ -1773,7 +1818,6 @@ OpenAPI_nwdaf_data_t *nwdaf_datasItem = OpenAPI_nwdaf_data_parseFromJSON(nwdaf_datas_local); if (!nwdaf_datasItem) { ogs_error("No nwdaf_datasItem"); - OpenAPI_list_free(nwdaf_datasList); goto end; } OpenAPI_list_add(nwdaf_datasList, nwdaf_datasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sm_subs_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sm_subs_data.c
Changed
@@ -138,7 +138,6 @@ OpenAPI_session_management_subscription_data_t *individual_sm_subs_dataItem = OpenAPI_session_management_subscription_data_parseFromJSON(individual_sm_subs_data_local); if (!individual_sm_subs_dataItem) { ogs_error("No individual_sm_subs_dataItem"); - OpenAPI_list_free(individual_sm_subs_dataList); goto end; } OpenAPI_list_add(individual_sm_subs_dataList, individual_sm_subs_dataItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/small_data_rate_status_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/small_data_rate_status_info.c
Changed
@@ -111,6 +111,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(small_data_rate_status_infoJSON, "Dnn"); if (!dnn) { @@ -128,6 +132,10 @@ goto end; } small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } small_data_rate_status_info_local_var = OpenAPI_small_data_rate_status_info_create ( snssai_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smcce_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smcce_info.c
Changed
@@ -112,6 +112,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(smcce_infoJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } smcce_ue_list = cJSON_GetObjectItemCaseSensitive(smcce_infoJSON, "smcceUeList"); @@ -120,6 +124,10 @@ goto end; } smcce_ue_list_local_nonprim = OpenAPI_smcce_ue_list_parseFromJSON(smcce_ue_list); + if (!smcce_ue_list_local_nonprim) { + ogs_error("OpenAPI_smcce_ue_list_parseFromJSON failed smcce_ue_list"); + goto end; + } smcce_info_local_var = OpenAPI_smcce_info_create ( dnn && !cJSON_IsNull(dnn) ? ogs_strdup(dnn->valuestring) : NULL,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_info.c
Changed
@@ -295,7 +295,6 @@ OpenAPI_snssai_smf_info_item_t *s_nssai_smf_info_listItem = OpenAPI_snssai_smf_info_item_parseFromJSON(s_nssai_smf_info_list_local); if (!s_nssai_smf_info_listItem) { ogs_error("No s_nssai_smf_info_listItem"); - OpenAPI_list_free(s_nssai_smf_info_listList); goto end; } OpenAPI_list_add(s_nssai_smf_info_listList, s_nssai_smf_info_listItem); @@ -319,7 +318,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -344,7 +342,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -377,7 +374,6 @@ OpenAPI_ip_addr_t *pgw_ip_addr_listItem = OpenAPI_ip_addr_parseFromJSON(pgw_ip_addr_list_local); if (!pgw_ip_addr_listItem) { ogs_error("No pgw_ip_addr_listItem"); - OpenAPI_list_free(pgw_ip_addr_listList); goto end; } OpenAPI_list_add(pgw_ip_addr_listList, pgw_ip_addr_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_registration.c
Changed
@@ -409,6 +409,10 @@ goto end; } single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(smf_registrationJSON, "dnn"); if (dnn) { @@ -440,6 +444,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } pgw_fqdn = cJSON_GetObjectItemCaseSensitive(smf_registrationJSON, "pgwFqdn"); if (pgw_fqdn) { @@ -452,6 +460,10 @@ pgw_ip_addr = cJSON_GetObjectItemCaseSensitive(smf_registrationJSON, "pgwIpAddr"); if (pgw_ip_addr) { pgw_ip_addr_local_nonprim = OpenAPI_ip_address_parseFromJSON(pgw_ip_addr); + if (!pgw_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_address_parseFromJSON failed pgw_ip_addr"); + goto end; + } } epdg_ind = cJSON_GetObjectItemCaseSensitive(smf_registrationJSON, "epdgInd"); @@ -490,6 +502,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(smf_registrationJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } pcf_id = cJSON_GetObjectItemCaseSensitive(smf_registrationJSON, "pcfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_registration_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_registration_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_smf_registration_t *smf_registration_listItem = OpenAPI_smf_registration_parseFromJSON(smf_registration_list_local); if (!smf_registration_listItem) { ogs_error("No smf_registration_listItem"); - OpenAPI_list_free(smf_registration_listList); goto end; } OpenAPI_list_add(smf_registration_listList, smf_registration_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_registration_modification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_registration_modification.c
Changed
@@ -115,6 +115,10 @@ pgw_fqdn = cJSON_GetObjectItemCaseSensitive(smf_registration_modificationJSON, "pgwFqdn"); if (pgw_fqdn) { pgw_fqdn_local_nonprim = OpenAPI_fqdn_rm_parseFromJSON(pgw_fqdn); + if (!pgw_fqdn_local_nonprim) { + ogs_error("OpenAPI_fqdn_rm_parseFromJSON failed pgw_fqdn"); + goto end; + } } smf_registration_modification_local_var = OpenAPI_smf_registration_modification_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_selection_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_selection_data.c
Changed
@@ -184,11 +184,19 @@ snssai = cJSON_GetObjectItemCaseSensitive(smf_selection_dataJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } mapping_snssai = cJSON_GetObjectItemCaseSensitive(smf_selection_dataJSON, "mappingSnssai"); if (mapping_snssai) { mapping_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(mapping_snssai); + if (!mapping_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed mapping_snssai"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(smf_selection_dataJSON, "dnn");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_subscription_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_subscription_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_smf_subscription_item_t *smf_subscription_listItem = OpenAPI_smf_subscription_item_parseFromJSON(smf_subscription_list_local); if (!smf_subscription_listItem) { ogs_error("No smf_subscription_listItem"); - OpenAPI_list_free(smf_subscription_listList); goto end; } OpenAPI_list_add(smf_subscription_listList, smf_subscription_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smf_subscription_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smf_subscription_item.c
Changed
@@ -119,6 +119,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(smf_subscription_itemJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } smf_subscription_item_local_var = OpenAPI_smf_subscription_item_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sms_management_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sms_management_subscription_data.c
Changed
@@ -255,6 +255,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(sms_management_subscription_dataJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } sms_management_subscription_data_local_var = OpenAPI_sms_management_subscription_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sms_management_subscription_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sms_management_subscription_data_1.c
Changed
@@ -255,6 +255,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(sms_management_subscription_data_1JSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } sms_management_subscription_data_1_local_var = OpenAPI_sms_management_subscription_data_1_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sms_router_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sms_router_info.c
Changed
@@ -145,6 +145,10 @@ diameter_address = cJSON_GetObjectItemCaseSensitive(sms_router_infoJSON, "diameterAddress"); if (diameter_address) { diameter_address_local_nonprim = OpenAPI_network_node_diameter_address_parseFromJSON(diameter_address); + if (!diameter_address_local_nonprim) { + ogs_error("OpenAPI_network_node_diameter_address_parseFromJSON failed diameter_address"); + goto end; + } } map_address = cJSON_GetObjectItemCaseSensitive(sms_router_infoJSON, "mapAddress");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smsc_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smsc_data.c
Changed
@@ -89,6 +89,10 @@ smsc_diameter_address = cJSON_GetObjectItemCaseSensitive(smsc_dataJSON, "smscDiameterAddress"); if (smsc_diameter_address) { smsc_diameter_address_local_nonprim = OpenAPI_network_node_diameter_address_1_parseFromJSON(smsc_diameter_address); + if (!smsc_diameter_address_local_nonprim) { + ogs_error("OpenAPI_network_node_diameter_address_1_parseFromJSON failed smsc_diameter_address"); + goto end; + } } smsc_data_local_var = OpenAPI_smsc_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smsf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smsf_info.c
Changed
@@ -112,6 +112,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } smsf_set_id = cJSON_GetObjectItemCaseSensitive(smsf_infoJSON, "smsfSetId"); if (smsf_set_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/smsf_registration.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/smsf_registration.c
Changed
@@ -289,6 +289,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } smsf_map_address = cJSON_GetObjectItemCaseSensitive(smsf_registrationJSON, "smsfMAPAddress"); if (smsf_map_address) { @@ -301,6 +305,10 @@ smsf_diameter_address = cJSON_GetObjectItemCaseSensitive(smsf_registrationJSON, "smsfDiameterAddress"); if (smsf_diameter_address) { smsf_diameter_address_local_nonprim = OpenAPI_network_node_diameter_address_parseFromJSON(smsf_diameter_address); + if (!smsf_diameter_address_local_nonprim) { + ogs_error("OpenAPI_network_node_diameter_address_parseFromJSON failed smsf_diameter_address"); + goto end; + } } registration_time = cJSON_GetObjectItemCaseSensitive(smsf_registrationJSON, "registrationTime"); @@ -314,6 +322,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(smsf_registrationJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } data_restoration_callback_uri = cJSON_GetObjectItemCaseSensitive(smsf_registrationJSON, "dataRestorationCallbackUri");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_dnn_pair.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_dnn_pair.c
Changed
@@ -98,6 +98,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } snssai_dnn_pair_local_var = OpenAPI_snssai_dnn_pair_create ( ogs_strdup(dnn->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_easdf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_easdf_info_item.c
Changed
@@ -101,6 +101,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_ext_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_ext_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn_easdf_info_list = cJSON_GetObjectItemCaseSensitive(snssai_easdf_info_itemJSON, "dnnEasdfInfoList"); if (!dnn_easdf_info_list) { @@ -123,7 +127,6 @@ OpenAPI_dnn_easdf_info_item_t *dnn_easdf_info_listItem = OpenAPI_dnn_easdf_info_item_parseFromJSON(dnn_easdf_info_list_local); if (!dnn_easdf_info_listItem) { ogs_error("No dnn_easdf_info_listItem"); - OpenAPI_list_free(dnn_easdf_info_listList); goto end; } OpenAPI_list_add(dnn_easdf_info_listList, dnn_easdf_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_extension.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_extension.c
Changed
@@ -122,7 +122,6 @@ OpenAPI_sd_range_t *sd_rangesItem = OpenAPI_sd_range_parseFromJSON(sd_ranges_local); if (!sd_rangesItem) { ogs_error("No sd_rangesItem"); - OpenAPI_list_free(sd_rangesList); goto end; } OpenAPI_list_add(sd_rangesList, sd_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_info.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_dnn_info_t *dnn_infosItem = OpenAPI_dnn_info_parseFromJSON(dnn_infos_local); if (!dnn_infosItem) { ogs_error("No dnn_infosItem"); - OpenAPI_list_free(dnn_infosList); goto end; } OpenAPI_list_add(dnn_infosList, dnn_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_info_item.c
Changed
@@ -101,6 +101,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_ext_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_ext_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn_info_list = cJSON_GetObjectItemCaseSensitive(snssai_info_itemJSON, "dnnInfoList"); if (!dnn_info_list) { @@ -123,7 +127,6 @@ OpenAPI_dnn_info_item_t *dnn_info_listItem = OpenAPI_dnn_info_item_parseFromJSON(dnn_info_list_local); if (!dnn_info_listItem) { ogs_error("No dnn_info_listItem"); - OpenAPI_list_free(dnn_info_listList); goto end; } OpenAPI_list_add(dnn_info_listList, dnn_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_mb_smf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_mb_smf_info_item.c
Changed
@@ -101,6 +101,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_ext_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_ext_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn_info_list = cJSON_GetObjectItemCaseSensitive(snssai_mb_smf_info_itemJSON, "dnnInfoList"); if (!dnn_info_list) { @@ -123,7 +127,6 @@ OpenAPI_dnn_mb_smf_info_item_t *dnn_info_listItem = OpenAPI_dnn_mb_smf_info_item_parseFromJSON(dnn_info_list_local); if (!dnn_info_listItem) { ogs_error("No dnn_info_listItem"); - OpenAPI_list_free(dnn_info_listList); goto end; } OpenAPI_list_add(dnn_info_listList, dnn_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_route_selection_descriptor.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_route_selection_descriptor.c
Changed
@@ -99,6 +99,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } dnn_route_sel_descs = cJSON_GetObjectItemCaseSensitive(snssai_route_selection_descriptorJSON, "dnnRouteSelDescs"); if (dnn_route_sel_descs) { @@ -118,7 +122,6 @@ OpenAPI_dnn_route_selection_descriptor_t *dnn_route_sel_descsItem = OpenAPI_dnn_route_selection_descriptor_parseFromJSON(dnn_route_sel_descs_local); if (!dnn_route_sel_descsItem) { ogs_error("No dnn_route_sel_descsItem"); - OpenAPI_list_free(dnn_route_sel_descsList); goto end; } OpenAPI_list_add(dnn_route_sel_descsList, dnn_route_sel_descsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_smf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_smf_info_item.c
Changed
@@ -101,6 +101,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_ext_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_ext_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn_smf_info_list = cJSON_GetObjectItemCaseSensitive(snssai_smf_info_itemJSON, "dnnSmfInfoList"); if (!dnn_smf_info_list) { @@ -123,7 +127,6 @@ OpenAPI_dnn_smf_info_item_t *dnn_smf_info_listItem = OpenAPI_dnn_smf_info_item_parseFromJSON(dnn_smf_info_list_local); if (!dnn_smf_info_listItem) { ogs_error("No dnn_smf_info_listItem"); - OpenAPI_list_free(dnn_smf_info_listList); goto end; } OpenAPI_list_add(dnn_smf_info_listList, dnn_smf_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_tsctsf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_tsctsf_info_item.c
Changed
@@ -101,6 +101,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_ext_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_ext_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn_info_list = cJSON_GetObjectItemCaseSensitive(snssai_tsctsf_info_itemJSON, "dnnInfoList"); if (!dnn_info_list) { @@ -123,7 +127,6 @@ OpenAPI_dnn_tsctsf_info_item_t *dnn_info_listItem = OpenAPI_dnn_tsctsf_info_item_parseFromJSON(dnn_info_list_local); if (!dnn_info_listItem) { ogs_error("No dnn_info_listItem"); - OpenAPI_list_free(dnn_info_listList); goto end; } OpenAPI_list_add(dnn_info_listList, dnn_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/snssai_upf_info_item.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/snssai_upf_info_item.c
Changed
@@ -113,6 +113,10 @@ goto end; } s_nssai_local_nonprim = OpenAPI_ext_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_ext_snssai_parseFromJSON failed s_nssai"); + goto end; + } dnn_upf_info_list = cJSON_GetObjectItemCaseSensitive(snssai_upf_info_itemJSON, "dnnUpfInfoList"); if (!dnn_upf_info_list) { @@ -135,7 +139,6 @@ OpenAPI_dnn_upf_info_item_t *dnn_upf_info_listItem = OpenAPI_dnn_upf_info_item_parseFromJSON(dnn_upf_info_list_local); if (!dnn_upf_info_listItem) { ogs_error("No dnn_upf_info_listItem"); - OpenAPI_list_free(dnn_upf_info_listList); goto end; } OpenAPI_list_add(dnn_upf_info_listList, dnn_upf_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sor_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sor_info.c
Changed
@@ -171,6 +171,10 @@ steering_container = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "steeringContainer"); if (steering_container) { steering_container_local_nonprim = OpenAPI_steering_container_parseFromJSON(steering_container); + if (!steering_container_local_nonprim) { + ogs_error("OpenAPI_steering_container_parseFromJSON failed steering_container"); + goto end; + } } ack_ind = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "ackInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sor_info_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sor_info_1.c
Changed
@@ -171,6 +171,10 @@ steering_container = cJSON_GetObjectItemCaseSensitive(sor_info_1JSON, "steeringContainer"); if (steering_container) { steering_container_local_nonprim = OpenAPI_steering_container_parseFromJSON(steering_container); + if (!steering_container_local_nonprim) { + ogs_error("OpenAPI_steering_container_parseFromJSON failed steering_container"); + goto end; + } } ack_ind = cJSON_GetObjectItemCaseSensitive(sor_info_1JSON, "ackInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/sor_update_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/sor_update_info.c
Changed
@@ -86,6 +86,10 @@ goto end; } vplmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(vplmn_id); + if (!vplmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed vplmn_id"); + goto end; + } supported_features = cJSON_GetObjectItemCaseSensitive(sor_update_infoJSON, "supportedFeatures"); if (supported_features) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/spatial_validity_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/spatial_validity_cond.c
Changed
@@ -134,7 +134,6 @@ OpenAPI_tai_t *tracking_area_listItem = OpenAPI_tai_parseFromJSON(tracking_area_list_local); if (!tracking_area_listItem) { ogs_error("No tracking_area_listItem"); - OpenAPI_list_free(tracking_area_listList); goto end; } OpenAPI_list_add(tracking_area_listList, tracking_area_listItem); @@ -165,6 +164,10 @@ geographical_service_area = cJSON_GetObjectItemCaseSensitive(spatial_validity_condJSON, "geographicalServiceArea"); if (geographical_service_area) { geographical_service_area_local_nonprim = OpenAPI_geo_service_area_parseFromJSON(geographical_service_area); + if (!geographical_service_area_local_nonprim) { + ogs_error("OpenAPI_geo_service_area_parseFromJSON failed geographical_service_area"); + goto end; + } } spatial_validity_cond_local_var = OpenAPI_spatial_validity_cond_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/spatial_validity_cond_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/spatial_validity_cond_1.c
Changed
@@ -134,7 +134,6 @@ OpenAPI_tai_1_t *tracking_area_listItem = OpenAPI_tai_1_parseFromJSON(tracking_area_list_local); if (!tracking_area_listItem) { ogs_error("No tracking_area_listItem"); - OpenAPI_list_free(tracking_area_listList); goto end; } OpenAPI_list_add(tracking_area_listList, tracking_area_listItem); @@ -165,6 +164,10 @@ geographical_service_area = cJSON_GetObjectItemCaseSensitive(spatial_validity_cond_1JSON, "geographicalServiceArea"); if (geographical_service_area) { geographical_service_area_local_nonprim = OpenAPI_geo_service_area_1_parseFromJSON(geographical_service_area); + if (!geographical_service_area_local_nonprim) { + ogs_error("OpenAPI_geo_service_area_1_parseFromJSON failed geographical_service_area"); + goto end; + } } spatial_validity_cond_1_local_var = OpenAPI_spatial_validity_cond_1_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ssm.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ssm.c
Changed
@@ -95,6 +95,10 @@ goto end; } source_ip_addr_local_nonprim = OpenAPI_ip_addr_parseFromJSON(source_ip_addr); + if (!source_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_addr_parseFromJSON failed source_ip_addr"); + goto end; + } dest_ip_addr = cJSON_GetObjectItemCaseSensitive(ssmJSON, "destIpAddr"); if (!dest_ip_addr) { @@ -102,6 +106,10 @@ goto end; } dest_ip_addr_local_nonprim = OpenAPI_ip_addr_parseFromJSON(dest_ip_addr); + if (!dest_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_addr_parseFromJSON failed dest_ip_addr"); + goto end; + } ssm_local_var = OpenAPI_ssm_create ( source_ip_addr_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ssm_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ssm_1.c
Changed
@@ -95,6 +95,10 @@ goto end; } source_ip_addr_local_nonprim = OpenAPI_ip_addr_1_parseFromJSON(source_ip_addr); + if (!source_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_addr_1_parseFromJSON failed source_ip_addr"); + goto end; + } dest_ip_addr = cJSON_GetObjectItemCaseSensitive(ssm_1JSON, "destIpAddr"); if (!dest_ip_addr) { @@ -102,6 +106,10 @@ goto end; } dest_ip_addr_local_nonprim = OpenAPI_ip_addr_1_parseFromJSON(dest_ip_addr); + if (!dest_ip_addr_local_nonprim) { + ogs_error("OpenAPI_ip_addr_1_parseFromJSON failed dest_ip_addr"); + goto end; + } ssm_1_local_var = OpenAPI_ssm_1_create ( source_ip_addr_local_nonprim,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/status_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/status_info.c
Changed
@@ -122,6 +122,10 @@ cn_assisted_ran_para = cJSON_GetObjectItemCaseSensitive(status_infoJSON, "cnAssistedRanPara"); if (cn_assisted_ran_para) { cn_assisted_ran_para_local_nonprim = OpenAPI_cn_assisted_ran_para_parseFromJSON(cn_assisted_ran_para); + if (!cn_assisted_ran_para_local_nonprim) { + ogs_error("OpenAPI_cn_assisted_ran_para_parseFromJSON failed cn_assisted_ran_para"); + goto end; + } } an_type = cJSON_GetObjectItemCaseSensitive(status_infoJSON, "anType");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/status_notification.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/status_notification.c
Changed
@@ -212,20 +212,36 @@ goto end; } status_info_local_nonprim = OpenAPI_status_info_parseFromJSON(status_info); + if (!status_info_local_nonprim) { + ogs_error("OpenAPI_status_info_parseFromJSON failed status_info"); + goto end; + } small_data_rate_status = cJSON_GetObjectItemCaseSensitive(status_notificationJSON, "smallDataRateStatus"); if (small_data_rate_status) { small_data_rate_status_local_nonprim = OpenAPI_small_data_rate_status_parseFromJSON(small_data_rate_status); + if (!small_data_rate_status_local_nonprim) { + ogs_error("OpenAPI_small_data_rate_status_parseFromJSON failed small_data_rate_status"); + goto end; + } } apn_rate_status = cJSON_GetObjectItemCaseSensitive(status_notificationJSON, "apnRateStatus"); if (apn_rate_status) { apn_rate_status_local_nonprim = OpenAPI_apn_rate_status_parseFromJSON(apn_rate_status); + if (!apn_rate_status_local_nonprim) { + ogs_error("OpenAPI_apn_rate_status_parseFromJSON failed apn_rate_status"); + goto end; + } } target_dnai_info = cJSON_GetObjectItemCaseSensitive(status_notificationJSON, "targetDnaiInfo"); if (target_dnai_info) { target_dnai_info_local_nonprim = OpenAPI_target_dnai_info_parseFromJSON(target_dnai_info); + if (!target_dnai_info_local_nonprim) { + ogs_error("OpenAPI_target_dnai_info_parseFromJSON failed target_dnai_info"); + goto end; + } } old_pdu_session_ref = cJSON_GetObjectItemCaseSensitive(status_notificationJSON, "oldPduSessionRef"); @@ -247,6 +263,10 @@ eps_pdn_cnx_info = cJSON_GetObjectItemCaseSensitive(status_notificationJSON, "epsPdnCnxInfo"); if (eps_pdn_cnx_info) { eps_pdn_cnx_info_local_nonprim = OpenAPI_eps_pdn_cnx_info_parseFromJSON(eps_pdn_cnx_info); + if (!eps_pdn_cnx_info_local_nonprim) { + ogs_error("OpenAPI_eps_pdn_cnx_info_parseFromJSON failed eps_pdn_cnx_info"); + goto end; + } } inter_plmn_api_root = cJSON_GetObjectItemCaseSensitive(status_notificationJSON, "interPlmnApiRoot");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/steering_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/steering_info.c
Changed
@@ -99,6 +99,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } access_tech_list = cJSON_GetObjectItemCaseSensitive(steering_infoJSON, "accessTechList"); if (access_tech_list) { @@ -118,7 +122,6 @@ OpenAPI_access_tech_t *access_tech_listItem = OpenAPI_access_tech_parseFromJSON(access_tech_list_local); if (!access_tech_listItem) { ogs_error("No access_tech_listItem"); - OpenAPI_list_free(access_tech_listList); goto end; } OpenAPI_list_add(access_tech_listList, access_tech_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/steering_mode.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/steering_mode.c
Changed
@@ -166,6 +166,10 @@ standby = cJSON_GetObjectItemCaseSensitive(steering_modeJSON, "standby"); if (standby) { standby_local_nonprim = OpenAPI_access_type_rm_parseFromJSON(standby); + if (!standby_local_nonprim) { + ogs_error("OpenAPI_access_type_rm_parseFromJSON failed standby"); + goto end; + } } _3g_load = cJSON_GetObjectItemCaseSensitive(steering_modeJSON, "3gLoad"); @@ -188,6 +192,10 @@ thres_value = cJSON_GetObjectItemCaseSensitive(steering_modeJSON, "thresValue"); if (thres_value) { thres_value_local_nonprim = OpenAPI_threshold_value_parseFromJSON(thres_value); + if (!thres_value_local_nonprim) { + ogs_error("OpenAPI_threshold_value_parseFromJSON failed thres_value"); + goto end; + } } steer_mode_ind = cJSON_GetObjectItemCaseSensitive(steering_modeJSON, "steerModeInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/stored_search_result.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/stored_search_result.c
Changed
@@ -93,7 +93,6 @@ OpenAPI_nf_profile_t *nf_instancesItem = OpenAPI_nf_profile_parseFromJSON(nf_instances_local); if (!nf_instancesItem) { ogs_error("No nf_instancesItem"); - OpenAPI_list_free(nf_instancesList); goto end; } OpenAPI_list_add(nf_instancesList, nf_instancesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscr_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscr_cond.c
Changed
@@ -434,7 +434,6 @@ OpenAPI_guami_t *guami_listItem = OpenAPI_guami_parseFromJSON(guami_list_local); if (!guami_listItem) { ogs_error("No guami_listItem"); - OpenAPI_list_free(guami_listList); goto end; } OpenAPI_list_add(guami_listList, guami_listItem); @@ -459,7 +458,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem); @@ -550,7 +548,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscribed_default_qos.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscribed_default_qos.c
Changed
@@ -102,6 +102,10 @@ goto end; } arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } priority_level = cJSON_GetObjectItemCaseSensitive(subscribed_default_qosJSON, "priorityLevel"); if (priority_level) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscribed_default_qos_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscribed_default_qos_1.c
Changed
@@ -102,6 +102,10 @@ goto end; } arp_local_nonprim = OpenAPI_arp_1_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_1_parseFromJSON failed arp"); + goto end; + } priority_level = cJSON_GetObjectItemCaseSensitive(subscribed_default_qos_1JSON, "priorityLevel"); if (priority_level) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscribed_snssai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscribed_snssai.c
Changed
@@ -109,6 +109,10 @@ goto end; } subscribed_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(subscribed_snssai); + if (!subscribed_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed subscribed_snssai"); + goto end; + } default_indication = cJSON_GetObjectItemCaseSensitive(subscribed_snssaiJSON, "defaultIndication"); if (default_indication) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscription_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscription_context.c
Changed
@@ -93,6 +93,10 @@ subscr_cond = cJSON_GetObjectItemCaseSensitive(subscription_contextJSON, "subscrCond"); if (subscr_cond) { subscr_cond_local_nonprim = OpenAPI_subscr_cond_parseFromJSON(subscr_cond); + if (!subscr_cond_local_nonprim) { + ogs_error("OpenAPI_subscr_cond_parseFromJSON failed subscr_cond"); + goto end; + } } subscription_context_local_var = OpenAPI_subscription_context_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscription_data.c
Changed
@@ -461,6 +461,10 @@ subscr_cond = cJSON_GetObjectItemCaseSensitive(subscription_dataJSON, "subscrCond"); if (subscr_cond) { subscr_cond_local_nonprim = OpenAPI_subscr_cond_parseFromJSON(subscr_cond); + if (!subscr_cond_local_nonprim) { + ogs_error("OpenAPI_subscr_cond_parseFromJSON failed subscr_cond"); + goto end; + } } subscription_id = cJSON_GetObjectItemCaseSensitive(subscription_dataJSON, "subscriptionId"); @@ -501,6 +505,10 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(subscription_dataJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } nid = cJSON_GetObjectItemCaseSensitive(subscription_dataJSON, "nid"); @@ -514,6 +522,10 @@ notif_condition = cJSON_GetObjectItemCaseSensitive(subscription_dataJSON, "notifCondition"); if (notif_condition) { notif_condition_local_nonprim = OpenAPI_notif_condition_parseFromJSON(notif_condition); + if (!notif_condition_local_nonprim) { + ogs_error("OpenAPI_notif_condition_parseFromJSON failed notif_condition"); + goto end; + } } req_nf_type = cJSON_GetObjectItemCaseSensitive(subscription_dataJSON, "reqNfType"); @@ -551,7 +563,6 @@ OpenAPI_ext_snssai_t *req_snssaisItem = OpenAPI_ext_snssai_parseFromJSON(req_snssais_local); if (!req_snssaisItem) { ogs_error("No req_snssaisItem"); - OpenAPI_list_free(req_snssaisList); goto end; } OpenAPI_list_add(req_snssaisList, req_snssaisItem); @@ -576,7 +587,6 @@ OpenAPI_plmn_snssai_t *req_per_plmn_snssaisItem = OpenAPI_plmn_snssai_parseFromJSON(req_per_plmn_snssais_local); if (!req_per_plmn_snssaisItem) { ogs_error("No req_per_plmn_snssaisItem"); - OpenAPI_list_free(req_per_plmn_snssaisList); goto end; } OpenAPI_list_add(req_per_plmn_snssaisList, req_per_plmn_snssaisItem); @@ -601,7 +611,6 @@ OpenAPI_plmn_id_t *req_plmn_listItem = OpenAPI_plmn_id_parseFromJSON(req_plmn_list_local); if (!req_plmn_listItem) { ogs_error("No req_plmn_listItem"); - OpenAPI_list_free(req_plmn_listList); goto end; } OpenAPI_list_add(req_plmn_listList, req_plmn_listItem); @@ -626,7 +635,6 @@ OpenAPI_plmn_id_nid_t *req_snpn_listItem = OpenAPI_plmn_id_nid_parseFromJSON(req_snpn_list_local); if (!req_snpn_listItem) { ogs_error("No req_snpn_listItem"); - OpenAPI_list_free(req_snpn_listList); goto end; } OpenAPI_list_add(req_snpn_listList, req_snpn_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscription_data_sets.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscription_data_sets.c
Changed
@@ -382,81 +382,145 @@ am_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "amData"); if (am_data) { am_data_local_nonprim = OpenAPI_access_and_mobility_subscription_data_parseFromJSON(am_data); + if (!am_data_local_nonprim) { + ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON failed am_data"); + goto end; + } } smf_sel_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "smfSelData"); if (smf_sel_data) { smf_sel_data_local_nonprim = OpenAPI_smf_selection_subscription_data_parseFromJSON(smf_sel_data); + if (!smf_sel_data_local_nonprim) { + ogs_error("OpenAPI_smf_selection_subscription_data_parseFromJSON failed smf_sel_data"); + goto end; + } } uec_amf_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "uecAmfData"); if (uec_amf_data) { uec_amf_data_local_nonprim = OpenAPI_ue_context_in_amf_data_parseFromJSON(uec_amf_data); + if (!uec_amf_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_amf_data_parseFromJSON failed uec_amf_data"); + goto end; + } } uec_smf_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "uecSmfData"); if (uec_smf_data) { uec_smf_data_local_nonprim = OpenAPI_ue_context_in_smf_data_parseFromJSON(uec_smf_data); + if (!uec_smf_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smf_data_parseFromJSON failed uec_smf_data"); + goto end; + } } uec_smsf_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "uecSmsfData"); if (uec_smsf_data) { uec_smsf_data_local_nonprim = OpenAPI_ue_context_in_smsf_data_parseFromJSON(uec_smsf_data); + if (!uec_smsf_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_in_smsf_data_parseFromJSON failed uec_smsf_data"); + goto end; + } } sms_subs_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "smsSubsData"); if (sms_subs_data) { sms_subs_data_local_nonprim = OpenAPI_sms_subscription_data_parseFromJSON(sms_subs_data); + if (!sms_subs_data_local_nonprim) { + ogs_error("OpenAPI_sms_subscription_data_parseFromJSON failed sms_subs_data"); + goto end; + } } sm_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "smData"); if (sm_data) { sm_data_local_nonprim = OpenAPI_sm_subs_data_parseFromJSON(sm_data); + if (!sm_data_local_nonprim) { + ogs_error("OpenAPI_sm_subs_data_parseFromJSON failed sm_data"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } sms_mng_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "smsMngData"); if (sms_mng_data) { sms_mng_data_local_nonprim = OpenAPI_sms_management_subscription_data_parseFromJSON(sms_mng_data); + if (!sms_mng_data_local_nonprim) { + ogs_error("OpenAPI_sms_management_subscription_data_parseFromJSON failed sms_mng_data"); + goto end; + } } lcs_privacy_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "lcsPrivacyData"); if (lcs_privacy_data) { lcs_privacy_data_local_nonprim = OpenAPI_lcs_privacy_data_parseFromJSON(lcs_privacy_data); + if (!lcs_privacy_data_local_nonprim) { + ogs_error("OpenAPI_lcs_privacy_data_parseFromJSON failed lcs_privacy_data"); + goto end; + } } lcs_mo_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "lcsMoData"); if (lcs_mo_data) { lcs_mo_data_local_nonprim = OpenAPI_lcs_mo_data_parseFromJSON(lcs_mo_data); + if (!lcs_mo_data_local_nonprim) { + ogs_error("OpenAPI_lcs_mo_data_parseFromJSON failed lcs_mo_data"); + goto end; + } } v2x_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "v2xData"); if (v2x_data) { v2x_data_local_nonprim = OpenAPI_v2x_subscription_data_parseFromJSON(v2x_data); + if (!v2x_data_local_nonprim) { + ogs_error("OpenAPI_v2x_subscription_data_parseFromJSON failed v2x_data"); + goto end; + } } lcs_broadcast_assistance_types_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "lcsBroadcastAssistanceTypesData"); if (lcs_broadcast_assistance_types_data) { lcs_broadcast_assistance_types_data_local_nonprim = OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON(lcs_broadcast_assistance_types_data); + if (!lcs_broadcast_assistance_types_data_local_nonprim) { + ogs_error("OpenAPI_lcs_broadcast_assistance_types_data_parseFromJSON failed lcs_broadcast_assistance_types_data"); + goto end; + } } prose_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "proseData"); if (prose_data) { prose_data_local_nonprim = OpenAPI_prose_subscription_data_parseFromJSON(prose_data); + if (!prose_data_local_nonprim) { + ogs_error("OpenAPI_prose_subscription_data_parseFromJSON failed prose_data"); + goto end; + } } mbs_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "mbsData"); if (mbs_data) { mbs_data_local_nonprim = OpenAPI_mbs_subscription_data_parseFromJSON(mbs_data); + if (!mbs_data_local_nonprim) { + ogs_error("OpenAPI_mbs_subscription_data_parseFromJSON failed mbs_data"); + goto end; + } } uc_data = cJSON_GetObjectItemCaseSensitive(subscription_data_setsJSON, "ucData"); if (uc_data) { uc_data_local_nonprim = OpenAPI_uc_subscription_data_parseFromJSON(uc_data); + if (!uc_data_local_nonprim) { + ogs_error("OpenAPI_uc_subscription_data_parseFromJSON failed uc_data"); + goto end; + } } subscription_data_sets_local_var = OpenAPI_subscription_data_sets_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/subscription_data_subscriptions.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/subscription_data_subscriptions.c
Changed
@@ -270,11 +270,19 @@ sdm_subscription = cJSON_GetObjectItemCaseSensitive(subscription_data_subscriptionsJSON, "sdmSubscription"); if (sdm_subscription) { sdm_subscription_local_nonprim = OpenAPI_sdm_subscription_1_parseFromJSON(sdm_subscription); + if (!sdm_subscription_local_nonprim) { + ogs_error("OpenAPI_sdm_subscription_1_parseFromJSON failed sdm_subscription"); + goto end; + } } hss_subscription_info = cJSON_GetObjectItemCaseSensitive(subscription_data_subscriptionsJSON, "hssSubscriptionInfo"); if (hss_subscription_info) { hss_subscription_info_local_nonprim = OpenAPI_hss_subscription_info_parseFromJSON(hss_subscription_info); + if (!hss_subscription_info_local_nonprim) { + ogs_error("OpenAPI_hss_subscription_info_parseFromJSON failed hss_subscription_info"); + goto end; + } } subscription_id = cJSON_GetObjectItemCaseSensitive(subscription_data_subscriptionsJSON, "subscriptionId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tai.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tai.c
Changed
@@ -102,6 +102,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } tac = cJSON_GetObjectItemCaseSensitive(taiJSON, "tac"); if (!tac) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tai_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tai_1.c
Changed
@@ -102,6 +102,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } tac = cJSON_GetObjectItemCaseSensitive(tai_1JSON, "tac"); if (!tac) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tai_range.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tai_range.c
Changed
@@ -115,6 +115,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } tac_range_list = cJSON_GetObjectItemCaseSensitive(tai_rangeJSON, "tacRangeList"); if (!tac_range_list) { @@ -137,7 +141,6 @@ OpenAPI_tac_range_t *tac_range_listItem = OpenAPI_tac_range_parseFromJSON(tac_range_list_local); if (!tac_range_listItem) { ogs_error("No tac_range_listItem"); - OpenAPI_list_free(tac_range_listList); goto end; } OpenAPI_list_add(tac_range_listList, tac_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/target_area.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/target_area.c
Changed
@@ -127,7 +127,6 @@ OpenAPI_tai_t *ta_listItem = OpenAPI_tai_parseFromJSON(ta_list_local); if (!ta_listItem) { ogs_error("No ta_listItem"); - OpenAPI_list_free(ta_listList); goto end; } OpenAPI_list_add(ta_listList, ta_listItem); @@ -152,7 +151,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/time_period.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/time_period.c
Changed
@@ -84,6 +84,10 @@ goto end; } period_local_nonprim = OpenAPI_periodicity_parseFromJSON(period); + if (!period_local_nonprim) { + ogs_error("OpenAPI_periodicity_parseFromJSON failed period"); + goto end; + } max_num_period = cJSON_GetObjectItemCaseSensitive(time_periodJSON, "maxNumPeriod"); if (max_num_period) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tmgi.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tmgi.c
Changed
@@ -98,6 +98,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } tmgi_local_var = OpenAPI_tmgi_create ( ogs_strdup(mbs_service_id->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tmgi_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tmgi_1.c
Changed
@@ -98,6 +98,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_1_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_1_parseFromJSON failed plmn_id"); + goto end; + } tmgi_1_local_var = OpenAPI_tmgi_1_create ( ogs_strdup(mbs_service_id->valuestring),
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tmgi_range.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tmgi_range.c
Changed
@@ -138,6 +138,10 @@ goto end; } plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } nid = cJSON_GetObjectItemCaseSensitive(tmgi_rangeJSON, "nid"); if (nid) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/top_application.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/top_application.c
Changed
@@ -101,6 +101,10 @@ ip_traffic_filter = cJSON_GetObjectItemCaseSensitive(top_applicationJSON, "ipTrafficFilter"); if (ip_traffic_filter) { ip_traffic_filter_local_nonprim = OpenAPI_flow_info_parseFromJSON(ip_traffic_filter); + if (!ip_traffic_filter_local_nonprim) { + ogs_error("OpenAPI_flow_info_parseFromJSON failed ip_traffic_filter"); + goto end; + } } ratio = cJSON_GetObjectItemCaseSensitive(top_applicationJSON, "ratio");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/trace_data_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/trace_data_response.c
Changed
@@ -81,6 +81,10 @@ trace_data = cJSON_GetObjectItemCaseSensitive(trace_data_responseJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } shared_trace_data_id = cJSON_GetObjectItemCaseSensitive(trace_data_responseJSON, "sharedTraceDataId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_characterization.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_characterization.c
Changed
@@ -178,6 +178,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(traffic_characterizationJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } app_id = cJSON_GetObjectItemCaseSensitive(traffic_characterizationJSON, "appId"); @@ -206,7 +210,6 @@ OpenAPI_ip_eth_flow_description_t *f_descsItem = OpenAPI_ip_eth_flow_description_parseFromJSON(f_descs_local); if (!f_descsItem) { ogs_error("No f_descsItem"); - OpenAPI_list_free(f_descsList); goto end; } OpenAPI_list_add(f_descsList, f_descsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_control_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_control_data.c
Changed
@@ -367,6 +367,10 @@ redirect_info = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "redirectInfo"); if (redirect_info) { redirect_info_local_nonprim = OpenAPI_redirect_information_parseFromJSON(redirect_info); + if (!redirect_info_local_nonprim) { + ogs_error("OpenAPI_redirect_information_parseFromJSON failed redirect_info"); + goto end; + } } add_redirect_info = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "addRedirectInfo"); @@ -387,7 +391,6 @@ OpenAPI_redirect_information_t *add_redirect_infoItem = OpenAPI_redirect_information_parseFromJSON(add_redirect_info_local); if (!add_redirect_infoItem) { ogs_error("No add_redirect_infoItem"); - OpenAPI_list_free(add_redirect_infoList); goto end; } OpenAPI_list_add(add_redirect_infoList, add_redirect_infoItem); @@ -436,7 +439,6 @@ OpenAPI_route_to_location_t *route_to_locsItem = OpenAPI_route_to_location_parseFromJSON(route_to_locs_local); if (!route_to_locsItem) { ogs_error("No route_to_locsItem"); - OpenAPI_list_free(route_to_locsList); goto end; } OpenAPI_list_add(route_to_locsList, route_to_locsItem); @@ -469,7 +471,6 @@ OpenAPI_eas_ip_replacement_info_t *eas_ip_replace_infosItem = OpenAPI_eas_ip_replacement_info_parseFromJSON(eas_ip_replace_infos_local); if (!eas_ip_replace_infosItem) { ogs_error("No eas_ip_replace_infosItem"); - OpenAPI_list_free(eas_ip_replace_infosList); goto end; } OpenAPI_list_add(eas_ip_replace_infosList, eas_ip_replace_infosItem); @@ -503,6 +504,10 @@ up_path_chg_event = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "upPathChgEvent"); if (up_path_chg_event) { up_path_chg_event_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_event); + if (!up_path_chg_event_local_nonprim) { + ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed up_path_chg_event"); + goto end; + } } steer_fun = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "steerFun"); @@ -517,11 +522,19 @@ steer_mode_dl = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "steerModeDl"); if (steer_mode_dl) { steer_mode_dl_local_nonprim = OpenAPI_steering_mode_parseFromJSON(steer_mode_dl); + if (!steer_mode_dl_local_nonprim) { + ogs_error("OpenAPI_steering_mode_parseFromJSON failed steer_mode_dl"); + goto end; + } } steer_mode_ul = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "steerModeUl"); if (steer_mode_ul) { steer_mode_ul_local_nonprim = OpenAPI_steering_mode_parseFromJSON(steer_mode_ul); + if (!steer_mode_ul_local_nonprim) { + ogs_error("OpenAPI_steering_mode_parseFromJSON failed steer_mode_ul"); + goto end; + } } mul_acc_ctrl = cJSON_GetObjectItemCaseSensitive(traffic_control_dataJSON, "mulAccCtrl");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_descriptor.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_descriptor.c
Changed
@@ -116,6 +116,10 @@ s_nssai = cJSON_GetObjectItemCaseSensitive(traffic_descriptorJSON, "sNssai"); if (s_nssai) { s_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(s_nssai); + if (!s_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed s_nssai"); + goto end; + } } ddd_traffic_descriptor_list = cJSON_GetObjectItemCaseSensitive(traffic_descriptorJSON, "dddTrafficDescriptorList"); @@ -136,7 +140,6 @@ OpenAPI_ddd_traffic_descriptor_t *ddd_traffic_descriptor_listItem = OpenAPI_ddd_traffic_descriptor_parseFromJSON(ddd_traffic_descriptor_list_local); if (!ddd_traffic_descriptor_listItem) { ogs_error("No ddd_traffic_descriptor_listItem"); - OpenAPI_list_free(ddd_traffic_descriptor_listList); goto end; } OpenAPI_list_add(ddd_traffic_descriptor_listList, ddd_traffic_descriptor_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_descriptor_components.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_descriptor_components.c
Changed
@@ -294,7 +294,6 @@ OpenAPI_eth_flow_description_t *eth_flow_descsItem = OpenAPI_eth_flow_description_parseFromJSON(eth_flow_descs_local); if (!eth_flow_descsItem) { ogs_error("No eth_flow_descsItem"); - OpenAPI_list_free(eth_flow_descsList); goto end; } OpenAPI_list_add(eth_flow_descsList, eth_flow_descsItem); @@ -340,7 +339,6 @@ OpenAPI_connection_capabilities_t *conn_capsItem = OpenAPI_connection_capabilities_parseFromJSON(conn_caps_local); if (!conn_capsItem) { ogs_error("No conn_capsItem"); - OpenAPI_list_free(conn_capsList); goto end; } OpenAPI_list_add(conn_capsList, conn_capsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_influ_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_influ_data.c
Changed
@@ -555,7 +555,6 @@ OpenAPI_eth_flow_description_t *eth_traffic_filtersItem = OpenAPI_eth_flow_description_parseFromJSON(eth_traffic_filters_local); if (!eth_traffic_filtersItem) { ogs_error("No eth_traffic_filtersItem"); - OpenAPI_list_free(eth_traffic_filtersList); goto end; } OpenAPI_list_add(eth_traffic_filtersList, eth_traffic_filtersItem); @@ -565,6 +564,10 @@ snssai = cJSON_GetObjectItemCaseSensitive(traffic_influ_dataJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } inter_group_id = cJSON_GetObjectItemCaseSensitive(traffic_influ_dataJSON, "interGroupId"); @@ -601,7 +604,6 @@ OpenAPI_flow_info_t *traffic_filtersItem = OpenAPI_flow_info_parseFromJSON(traffic_filters_local); if (!traffic_filtersItem) { ogs_error("No traffic_filtersItem"); - OpenAPI_list_free(traffic_filtersList); goto end; } OpenAPI_list_add(traffic_filtersList, traffic_filtersItem); @@ -626,7 +628,6 @@ OpenAPI_route_to_location_t *traffic_routesItem = OpenAPI_route_to_location_parseFromJSON(traffic_routes_local); if (!traffic_routesItem) { ogs_error("No traffic_routesItem"); - OpenAPI_list_free(traffic_routesList); goto end; } OpenAPI_list_add(traffic_routesList, traffic_routesItem); @@ -675,7 +676,6 @@ OpenAPI_temporal_validity_t *temp_validitiesItem = OpenAPI_temporal_validity_parseFromJSON(temp_validities_local); if (!temp_validitiesItem) { ogs_error("No temp_validitiesItem"); - OpenAPI_list_free(temp_validitiesList); goto end; } OpenAPI_list_add(temp_validitiesList, temp_validitiesItem); @@ -685,6 +685,10 @@ nw_area_info = cJSON_GetObjectItemCaseSensitive(traffic_influ_dataJSON, "nwAreaInfo"); if (nw_area_info) { nw_area_info_local_nonprim = OpenAPI_network_area_info_2_parseFromJSON(nw_area_info); + if (!nw_area_info_local_nonprim) { + ogs_error("OpenAPI_network_area_info_2_parseFromJSON failed nw_area_info"); + goto end; + } } up_path_chg_notif_uri = cJSON_GetObjectItemCaseSensitive(traffic_influ_dataJSON, "upPathChgNotifUri"); @@ -734,7 +738,6 @@ OpenAPI_subscribed_event_t *subscribed_eventsItem = OpenAPI_subscribed_event_parseFromJSON(subscribed_events_local); if (!subscribed_eventsItem) { ogs_error("No subscribed_eventsItem"); - OpenAPI_list_free(subscribed_eventsList); goto end; } OpenAPI_list_add(subscribed_eventsList, subscribed_eventsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_influ_data_notif.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_influ_data_notif.c
Changed
@@ -93,6 +93,10 @@ traffic_influ_data = cJSON_GetObjectItemCaseSensitive(traffic_influ_data_notifJSON, "trafficInfluData"); if (traffic_influ_data) { traffic_influ_data_local_nonprim = OpenAPI_traffic_influ_data_parseFromJSON(traffic_influ_data); + if (!traffic_influ_data_local_nonprim) { + ogs_error("OpenAPI_traffic_influ_data_parseFromJSON failed traffic_influ_data"); + goto end; + } } traffic_influ_data_notif_local_var = OpenAPI_traffic_influ_data_notif_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_influ_data_patch.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_influ_data_patch.c
Changed
@@ -371,7 +371,6 @@ OpenAPI_eth_flow_description_t *eth_traffic_filtersItem = OpenAPI_eth_flow_description_parseFromJSON(eth_traffic_filters_local); if (!eth_traffic_filtersItem) { ogs_error("No eth_traffic_filtersItem"); - OpenAPI_list_free(eth_traffic_filtersList); goto end; } OpenAPI_list_add(eth_traffic_filtersList, eth_traffic_filtersItem); @@ -396,7 +395,6 @@ OpenAPI_flow_info_t *traffic_filtersItem = OpenAPI_flow_info_parseFromJSON(traffic_filters_local); if (!traffic_filtersItem) { ogs_error("No traffic_filtersItem"); - OpenAPI_list_free(traffic_filtersList); goto end; } OpenAPI_list_add(traffic_filtersList, traffic_filtersItem); @@ -421,7 +419,6 @@ OpenAPI_route_to_location_t *traffic_routesItem = OpenAPI_route_to_location_parseFromJSON(traffic_routes_local); if (!traffic_routesItem) { ogs_error("No traffic_routesItem"); - OpenAPI_list_free(traffic_routesList); goto end; } OpenAPI_list_add(traffic_routesList, traffic_routesItem); @@ -470,7 +467,6 @@ OpenAPI_temporal_validity_t *temp_validitiesItem = OpenAPI_temporal_validity_parseFromJSON(temp_validities_local); if (!temp_validitiesItem) { ogs_error("No temp_validitiesItem"); - OpenAPI_list_free(temp_validitiesList); goto end; } OpenAPI_list_add(temp_validitiesList, temp_validitiesItem); @@ -480,6 +476,10 @@ nw_area_info = cJSON_GetObjectItemCaseSensitive(traffic_influ_data_patchJSON, "nwAreaInfo"); if (nw_area_info) { nw_area_info_local_nonprim = OpenAPI_network_area_info_2_parseFromJSON(nw_area_info); + if (!nw_area_info_local_nonprim) { + ogs_error("OpenAPI_network_area_info_2_parseFromJSON failed nw_area_info"); + goto end; + } } up_path_chg_notif_uri = cJSON_GetObjectItemCaseSensitive(traffic_influ_data_patchJSON, "upPathChgNotifUri");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/traffic_influ_sub.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/traffic_influ_sub.c
Changed
@@ -253,7 +253,6 @@ OpenAPI_snssai_t *snssaisItem = OpenAPI_snssai_parseFromJSON(snssais_local); if (!snssaisItem) { ogs_error("No snssaisItem"); - OpenAPI_list_free(snssaisList); goto end; } OpenAPI_list_add(snssaisList, snssaisItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/transfer_mo_data_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/transfer_mo_data_req_data.c
Changed
@@ -114,15 +114,27 @@ goto end; } mo_data_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(mo_data); + if (!mo_data_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed mo_data"); + goto end; + } mo_exp_data_counter = cJSON_GetObjectItemCaseSensitive(transfer_mo_data_req_dataJSON, "moExpDataCounter"); if (mo_exp_data_counter) { mo_exp_data_counter_local_nonprim = OpenAPI_mo_exp_data_counter_parseFromJSON(mo_exp_data_counter); + if (!mo_exp_data_counter_local_nonprim) { + ogs_error("OpenAPI_mo_exp_data_counter_parseFromJSON failed mo_exp_data_counter"); + goto end; + } } ue_location = cJSON_GetObjectItemCaseSensitive(transfer_mo_data_req_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } transfer_mo_data_req_data_local_var = OpenAPI_transfer_mo_data_req_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/transfer_mo_data_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/transfer_mo_data_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(transfer_mo_data_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_transfer_mo_data_req_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_transfer_mo_data_req_data_parseFromJSON failed json_data"); + goto end; + } } binary_mo_data = cJSON_GetObjectItemCaseSensitive(transfer_mo_data_requestJSON, "binaryMoData");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/transfer_mt_data_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/transfer_mt_data_error.c
Changed
@@ -312,7 +312,6 @@ OpenAPI_invalid_param_t *invalid_paramsItem = OpenAPI_invalid_param_parseFromJSON(invalid_params_local); if (!invalid_paramsItem) { ogs_error("No invalid_paramsItem"); - OpenAPI_list_free(invalid_paramsList); goto end; } OpenAPI_list_add(invalid_paramsList, invalid_paramsItem); @@ -330,11 +329,19 @@ access_token_error = cJSON_GetObjectItemCaseSensitive(transfer_mt_data_errorJSON, "accessTokenError"); if (access_token_error) { access_token_error_local_nonprim = OpenAPI_access_token_err_parseFromJSON(access_token_error); + if (!access_token_error_local_nonprim) { + ogs_error("OpenAPI_access_token_err_parseFromJSON failed access_token_error"); + goto end; + } } access_token_request = cJSON_GetObjectItemCaseSensitive(transfer_mt_data_errorJSON, "accessTokenRequest"); if (access_token_request) { access_token_request_local_nonprim = OpenAPI_access_token_req_parseFromJSON(access_token_request); + if (!access_token_request_local_nonprim) { + ogs_error("OpenAPI_access_token_req_parseFromJSON failed access_token_request"); + goto end; + } } nrf_id = cJSON_GetObjectItemCaseSensitive(transfer_mt_data_errorJSON, "nrfId");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/transfer_mt_data_ismf_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/transfer_mt_data_ismf_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(transfer_mt_data_ismf_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_transfer_mt_data_req_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_transfer_mt_data_req_data_parseFromJSON failed json_data"); + goto end; + } } binary_mt_data = cJSON_GetObjectItemCaseSensitive(transfer_mt_data_ismf_requestJSON, "binaryMtData");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/transfer_mt_data_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/transfer_mt_data_req_data.c
Changed
@@ -72,6 +72,10 @@ goto end; } mt_data_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(mt_data); + if (!mt_data_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed mt_data"); + goto end; + } transfer_mt_data_req_data_local_var = OpenAPI_transfer_mt_data_req_data_create ( mt_data_local_nonprim
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/transfer_policy.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/transfer_policy.c
Changed
@@ -142,6 +142,10 @@ goto end; } rec_time_int_local_nonprim = OpenAPI_time_window_parseFromJSON(rec_time_int); + if (!rec_time_int_local_nonprim) { + ogs_error("OpenAPI_time_window_parseFromJSON failed rec_time_int"); + goto end; + } trans_policy_id = cJSON_GetObjectItemCaseSensitive(transfer_policyJSON, "transPolicyId"); if (!trans_policy_id) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/trigger.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/trigger.c
Changed
@@ -169,6 +169,10 @@ goto end; } trigger_type_local_nonprim = OpenAPI_trigger_type_parseFromJSON(trigger_type); + if (!trigger_type_local_nonprim) { + ogs_error("OpenAPI_trigger_type_parseFromJSON failed trigger_type"); + goto end; + } trigger_category = cJSON_GetObjectItemCaseSensitive(triggerJSON, "triggerCategory"); if (!trigger_category) { @@ -176,6 +180,10 @@ goto end; } trigger_category_local_nonprim = OpenAPI_trigger_category_parseFromJSON(trigger_category); + if (!trigger_category_local_nonprim) { + ogs_error("OpenAPI_trigger_category_parseFromJSON failed trigger_category"); + goto end; + } time_limit = cJSON_GetObjectItemCaseSensitive(triggerJSON, "timeLimit"); if (time_limit) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/trigger_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/trigger_request.c
Changed
@@ -93,6 +93,10 @@ failed_pcscf = cJSON_GetObjectItemCaseSensitive(trigger_requestJSON, "failedPcscf"); if (failed_pcscf) { failed_pcscf_local_nonprim = OpenAPI_pcscf_address_parseFromJSON(failed_pcscf); + if (!failed_pcscf_local_nonprim) { + ogs_error("OpenAPI_pcscf_address_parseFromJSON failed failed_pcscf"); + goto end; + } } trigger_request_local_var = OpenAPI_trigger_request_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/trust_af_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/trust_af_info.c
Changed
@@ -172,7 +172,6 @@ OpenAPI_snssai_info_item_t *s_nssai_info_listItem = OpenAPI_snssai_info_item_parseFromJSON(s_nssai_info_list_local); if (!s_nssai_info_listItem) { ogs_error("No s_nssai_info_listItem"); - OpenAPI_list_free(s_nssai_info_listList); goto end; } OpenAPI_list_add(s_nssai_info_listList, s_nssai_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/tsctsf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/tsctsf_info.c
Changed
@@ -231,7 +231,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -256,7 +255,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -281,7 +279,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -306,7 +303,6 @@ OpenAPI_internal_group_id_range_t *internal_group_identifiers_rangesItem = OpenAPI_internal_group_id_range_parseFromJSON(internal_group_identifiers_ranges_local); if (!internal_group_identifiers_rangesItem) { ogs_error("No internal_group_identifiers_rangesItem"); - OpenAPI_list_free(internal_group_identifiers_rangesList); goto end; } OpenAPI_list_add(internal_group_identifiers_rangesList, internal_group_identifiers_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/udm_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/udm_info.c
Changed
@@ -243,7 +243,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -268,7 +267,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -293,7 +291,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -339,7 +336,6 @@ OpenAPI_internal_group_id_range_t *internal_group_identifiers_rangesItem = OpenAPI_internal_group_id_range_parseFromJSON(internal_group_identifiers_ranges_local); if (!internal_group_identifiers_rangesItem) { ogs_error("No internal_group_identifiers_rangesItem"); - OpenAPI_list_free(internal_group_identifiers_rangesList); goto end; } OpenAPI_list_add(internal_group_identifiers_rangesList, internal_group_identifiers_rangesItem); @@ -364,7 +360,6 @@ OpenAPI_suci_info_t *suci_infosItem = OpenAPI_suci_info_parseFromJSON(suci_infos_local); if (!suci_infosItem) { ogs_error("No suci_infosItem"); - OpenAPI_list_free(suci_infosList); goto end; } OpenAPI_list_add(suci_infosList, suci_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/udr_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/udr_info.c
Changed
@@ -213,7 +213,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem); @@ -238,7 +237,6 @@ OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local); if (!gpsi_rangesItem) { ogs_error("No gpsi_rangesItem"); - OpenAPI_list_free(gpsi_rangesList); goto end; } OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem); @@ -263,7 +261,6 @@ OpenAPI_identity_range_t *external_group_identifiers_rangesItem = OpenAPI_identity_range_parseFromJSON(external_group_identifiers_ranges_local); if (!external_group_identifiers_rangesItem) { ogs_error("No external_group_identifiers_rangesItem"); - OpenAPI_list_free(external_group_identifiers_rangesList); goto end; } OpenAPI_list_add(external_group_identifiers_rangesList, external_group_identifiers_rangesItem); @@ -307,7 +304,6 @@ OpenAPI_shared_data_id_range_t *shared_data_id_rangesItem = OpenAPI_shared_data_id_range_parseFromJSON(shared_data_id_ranges_local); if (!shared_data_id_rangesItem) { ogs_error("No shared_data_id_rangesItem"); - OpenAPI_list_free(shared_data_id_rangesList); goto end; } OpenAPI_list_add(shared_data_id_rangesList, shared_data_id_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/udsf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/udsf_info.c
Changed
@@ -146,7 +146,6 @@ OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local); if (!supi_rangesItem) { ogs_error("No supi_rangesItem"); - OpenAPI_list_free(supi_rangesList); goto end; } OpenAPI_list_add(supi_rangesList, supi_rangesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_analytics_context_descriptor.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_analytics_context_descriptor.c
Changed
@@ -119,7 +119,6 @@ OpenAPI_nwdaf_event_t *ana_typesItem = OpenAPI_nwdaf_event_parseFromJSON(ana_types_local); if (!ana_typesItem) { ogs_error("No ana_typesItem"); - OpenAPI_list_free(ana_typesList); goto end; } OpenAPI_list_add(ana_typesList, ana_typesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_authentication_ctx.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_authentication_ctx.c
Changed
@@ -148,6 +148,10 @@ goto end; } _5g_auth_data_local_nonprim = OpenAPI_ue_authentication_ctx_5g_auth_data_parseFromJSON(_5g_auth_data); + if (!_5g_auth_data_local_nonprim) { + ogs_error("OpenAPI_ue_authentication_ctx_5g_auth_data_parseFromJSON failed _5g_auth_data"); + goto end; + } _links = cJSON_GetObjectItemCaseSensitive(ue_authentication_ctxJSON, "_links"); if (!_links) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_camping_rep.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_camping_rep.c
Changed
@@ -185,16 +185,28 @@ serv_nf_id = cJSON_GetObjectItemCaseSensitive(ue_camping_repJSON, "servNfId"); if (serv_nf_id) { serv_nf_id_local_nonprim = OpenAPI_serving_nf_identity_parseFromJSON(serv_nf_id); + if (!serv_nf_id_local_nonprim) { + ogs_error("OpenAPI_serving_nf_identity_parseFromJSON failed serv_nf_id"); + goto end; + } } serving_network = cJSON_GetObjectItemCaseSensitive(ue_camping_repJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } user_location_info = cJSON_GetObjectItemCaseSensitive(ue_camping_repJSON, "userLocationInfo"); if (user_location_info) { user_location_info_local_nonprim = OpenAPI_user_location_parseFromJSON(user_location_info); + if (!user_location_info_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed user_location_info"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(ue_camping_repJSON, "ueTimeZone");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_communication.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_communication.c
Changed
@@ -288,11 +288,19 @@ recurring_time = cJSON_GetObjectItemCaseSensitive(ue_communicationJSON, "recurringTime"); if (recurring_time) { recurring_time_local_nonprim = OpenAPI_scheduled_communication_time_1_parseFromJSON(recurring_time); + if (!recurring_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_1_parseFromJSON failed recurring_time"); + goto end; + } } traf_char = cJSON_GetObjectItemCaseSensitive(ue_communicationJSON, "trafChar"); if (traf_char) { traf_char_local_nonprim = OpenAPI_traffic_characterization_parseFromJSON(traf_char); + if (!traf_char_local_nonprim) { + ogs_error("OpenAPI_traffic_characterization_parseFromJSON failed traf_char"); + goto end; + } } ratio = cJSON_GetObjectItemCaseSensitive(ue_communicationJSON, "ratio"); @@ -322,11 +330,19 @@ ana_of_app_list = cJSON_GetObjectItemCaseSensitive(ue_communicationJSON, "anaOfAppList"); if (ana_of_app_list) { ana_of_app_list_local_nonprim = OpenAPI_app_list_for_ue_comm_parseFromJSON(ana_of_app_list); + if (!ana_of_app_list_local_nonprim) { + ogs_error("OpenAPI_app_list_for_ue_comm_parseFromJSON failed ana_of_app_list"); + goto end; + } } sess_inact_timer = cJSON_GetObjectItemCaseSensitive(ue_communicationJSON, "sessInactTimer"); if (sess_inact_timer) { sess_inact_timer_local_nonprim = OpenAPI_sess_inact_timer_for_ue_comm_parseFromJSON(sess_inact_timer); + if (!sess_inact_timer_local_nonprim) { + ogs_error("OpenAPI_sess_inact_timer_for_ue_comm_parseFromJSON failed sess_inact_timer"); + goto end; + } } ue_communication_local_var = OpenAPI_ue_communication_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context.c
Changed
@@ -1597,6 +1597,10 @@ sub_ue_ambr = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "subUeAmbr"); if (sub_ue_ambr) { sub_ue_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(sub_ue_ambr); + if (!sub_ue_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed sub_ue_ambr"); + goto end; + } } sub_ue_slice_mbr_list = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "subUeSliceMbrList"); @@ -1636,6 +1640,10 @@ seaf_data = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "seafData"); if (seaf_data) { seaf_data_local_nonprim = OpenAPI_seaf_data_parseFromJSON(seaf_data); + if (!seaf_data_local_nonprim) { + ogs_error("OpenAPI_seaf_data_parseFromJSON failed seaf_data"); + goto end; + } } _5g_mm_capability = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "5gMmCapability"); @@ -1794,7 +1802,6 @@ OpenAPI_area_t *forbidden_area_listItem = OpenAPI_area_parseFromJSON(forbidden_area_list_local); if (!forbidden_area_listItem) { ogs_error("No forbidden_area_listItem"); - OpenAPI_list_free(forbidden_area_listList); goto end; } OpenAPI_list_add(forbidden_area_listList, forbidden_area_listItem); @@ -1804,6 +1811,10 @@ service_area_restriction = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "serviceAreaRestriction"); if (service_area_restriction) { service_area_restriction_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(service_area_restriction); + if (!service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed service_area_restriction"); + goto end; + } } restricted_core_nw_type_list = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "restrictedCoreNwTypeList"); @@ -1843,7 +1854,6 @@ OpenAPI_ext_amf_event_subscription_t *event_subscription_listItem = OpenAPI_ext_amf_event_subscription_parseFromJSON(event_subscription_list_local); if (!event_subscription_listItem) { ogs_error("No event_subscription_listItem"); - OpenAPI_list_free(event_subscription_listList); goto end; } OpenAPI_list_add(event_subscription_listList, event_subscription_listItem); @@ -1868,7 +1878,6 @@ OpenAPI_mm_context_t *mm_context_listItem = OpenAPI_mm_context_parseFromJSON(mm_context_list_local); if (!mm_context_listItem) { ogs_error("No mm_context_listItem"); - OpenAPI_list_free(mm_context_listList); goto end; } OpenAPI_list_add(mm_context_listList, mm_context_listItem); @@ -1893,7 +1902,6 @@ OpenAPI_pdu_session_context_t *session_context_listItem = OpenAPI_pdu_session_context_parseFromJSON(session_context_list_local); if (!session_context_listItem) { ogs_error("No session_context_listItem"); - OpenAPI_list_free(session_context_listList); goto end; } OpenAPI_list_add(session_context_listList, session_context_listItem); @@ -1903,11 +1911,19 @@ eps_interworking_info = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "epsInterworkingInfo"); if (eps_interworking_info) { eps_interworking_info_local_nonprim = OpenAPI_eps_interworking_info_parseFromJSON(eps_interworking_info); + if (!eps_interworking_info_local_nonprim) { + ogs_error("OpenAPI_eps_interworking_info_parseFromJSON failed eps_interworking_info"); + goto end; + } } trace_data = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "traceData"); if (trace_data) { trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data); + if (!trace_data_local_nonprim) { + ogs_error("OpenAPI_trace_data_parseFromJSON failed trace_data"); + goto end; + } } service_gap_expiry_time = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "serviceGapExpiryTime"); @@ -1981,7 +1997,6 @@ OpenAPI_small_data_rate_status_info_t *small_data_rate_status_infosItem = OpenAPI_small_data_rate_status_info_parseFromJSON(small_data_rate_status_infos_local); if (!small_data_rate_status_infosItem) { ogs_error("No small_data_rate_status_infosItem"); - OpenAPI_list_free(small_data_rate_status_infosList); goto end; } OpenAPI_list_add(small_data_rate_status_infosList, small_data_rate_status_infosItem); @@ -2029,6 +2044,10 @@ v2x_context = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "v2xContext"); if (v2x_context) { v2x_context_local_nonprim = OpenAPI_v2x_context_parseFromJSON(v2x_context); + if (!v2x_context_local_nonprim) { + ogs_error("OpenAPI_v2x_context_parseFromJSON failed v2x_context"); + goto end; + } } lte_cat_m_ind = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "lteCatMInd"); @@ -2050,11 +2069,19 @@ mo_exp_data_counter = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "moExpDataCounter"); if (mo_exp_data_counter) { mo_exp_data_counter_local_nonprim = OpenAPI_mo_exp_data_counter_parseFromJSON(mo_exp_data_counter); + if (!mo_exp_data_counter_local_nonprim) { + ogs_error("OpenAPI_mo_exp_data_counter_parseFromJSON failed mo_exp_data_counter"); + goto end; + } } cag_data = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "cagData"); if (cag_data) { cag_data_local_nonprim = OpenAPI_cag_data_parseFromJSON(cag_data); + if (!cag_data_local_nonprim) { + ogs_error("OpenAPI_cag_data_parseFromJSON failed cag_data"); + goto end; + } } management_mdt_ind = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "managementMdtInd"); @@ -2068,11 +2095,19 @@ immediate_mdt_conf = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "immediateMdtConf"); if (immediate_mdt_conf) { immediate_mdt_conf_local_nonprim = OpenAPI_immediate_mdt_conf_parseFromJSON(immediate_mdt_conf); + if (!immediate_mdt_conf_local_nonprim) { + ogs_error("OpenAPI_immediate_mdt_conf_parseFromJSON failed immediate_mdt_conf"); + goto end; + } } ec_restriction_data_wb = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "ecRestrictionDataWb"); if (ec_restriction_data_wb) { ec_restriction_data_wb_local_nonprim = OpenAPI_ec_restriction_data_wb_parseFromJSON(ec_restriction_data_wb); + if (!ec_restriction_data_wb_local_nonprim) { + ogs_error("OpenAPI_ec_restriction_data_wb_parseFromJSON failed ec_restriction_data_wb"); + goto end; + } } ec_restriction_data_nb = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "ecRestrictionDataNb"); @@ -2094,6 +2129,10 @@ prose_context = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "proseContext"); if (prose_context) { prose_context_local_nonprim = OpenAPI_prose_context_parseFromJSON(prose_context); + if (!prose_context_local_nonprim) { + ogs_error("OpenAPI_prose_context_parseFromJSON failed prose_context"); + goto end; + } } analytics_subscription_list = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "analyticsSubscriptionList"); @@ -2114,7 +2153,6 @@ OpenAPI_analytics_subscription_t *analytics_subscription_listItem = OpenAPI_analytics_subscription_parseFromJSON(analytics_subscription_list_local); if (!analytics_subscription_listItem) { ogs_error("No analytics_subscription_listItem"); - OpenAPI_list_free(analytics_subscription_listList); goto end; } OpenAPI_list_add(analytics_subscription_listList, analytics_subscription_listItem); @@ -2140,6 +2178,10 @@ used_service_area_restriction = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "usedServiceAreaRestriction"); if (used_service_area_restriction) { used_service_area_restriction_local_nonprim = OpenAPI_service_area_restriction_parseFromJSON(used_service_area_restriction); + if (!used_service_area_restriction_local_nonprim) { + ogs_error("OpenAPI_service_area_restriction_parseFromJSON failed used_service_area_restriction"); + goto end; + } } pra_in_am_policy = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "praInAmPolicy"); @@ -2197,6 +2239,10 @@ updp_subscription_data = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "updpSubscriptionData"); if (updp_subscription_data) { updp_subscription_data_local_nonprim = OpenAPI_updp_subscription_data_parseFromJSON(updp_subscription_data); + if (!updp_subscription_data_local_nonprim) { + ogs_error("OpenAPI_updp_subscription_data_parseFromJSON failed updp_subscription_data"); + goto end; + } } sm_policy_notify_pdu_list = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "smPolicyNotifyPduList"); @@ -2217,7 +2263,6 @@ OpenAPI_pdu_session_info_t *sm_policy_notify_pdu_listItem = OpenAPI_pdu_session_info_parseFromJSON(sm_policy_notify_pdu_list_local); if (!sm_policy_notify_pdu_listItem) { ogs_error("No sm_policy_notify_pdu_listItem"); - OpenAPI_list_free(sm_policy_notify_pdu_listList); goto end; } OpenAPI_list_add(sm_policy_notify_pdu_listList, sm_policy_notify_pdu_listItem); @@ -2227,6 +2272,10 @@ pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "pcfUeCallbackInfo"); if (pcf_ue_callback_info) { pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info); + if (!pcf_ue_callback_info_local_nonprim) { + ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed pcf_ue_callback_info"); + goto end; + } } ue_positioning_cap = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "uePositioningCap"); @@ -2264,6 +2313,10 @@ smf_sel_info = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "smfSelInfo"); if (smf_sel_info) { smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info); + if (!smf_sel_info_local_nonprim) { + ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed smf_sel_info"); + goto end; + } } pcf_ue_slice_mbr_list = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "pcfUeSliceMbrList"); @@ -2327,6 +2380,10 @@ disaster_plmn = cJSON_GetObjectItemCaseSensitive(ue_contextJSON, "disasterPlmn"); if (disaster_plmn) { disaster_plmn_local_nonprim = OpenAPI_plmn_id_parseFromJSON(disaster_plmn); + if (!disaster_plmn_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed disaster_plmn"); + goto end; + } } ue_context_local_var = OpenAPI_ue_context_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_cancel_relocate_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_cancel_relocate_data.c
Changed
@@ -94,6 +94,10 @@ goto end; } relocation_cancel_request_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(relocation_cancel_request); + if (!relocation_cancel_request_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed relocation_cancel_request"); + goto end; + } ue_context_cancel_relocate_data_local_var = OpenAPI_ue_context_cancel_relocate_data_create ( supi && !cJSON_IsNull(supi) ? ogs_strdup(supi->valuestring) : NULL,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_create_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_create_data.c
Changed
@@ -259,6 +259,10 @@ goto end; } ue_context_local_nonprim = OpenAPI_ue_context_parseFromJSON(ue_context); + if (!ue_context_local_nonprim) { + ogs_error("OpenAPI_ue_context_parseFromJSON failed ue_context"); + goto end; + } target_id = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "targetId"); if (!target_id) { @@ -266,6 +270,10 @@ goto end; } target_id_local_nonprim = OpenAPI_ng_ran_target_id_parseFromJSON(target_id); + if (!target_id_local_nonprim) { + ogs_error("OpenAPI_ng_ran_target_id_parseFromJSON failed target_id"); + goto end; + } source_to_target_data = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "sourceToTargetData"); if (!source_to_target_data) { @@ -273,6 +281,10 @@ goto end; } source_to_target_data_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(source_to_target_data); + if (!source_to_target_data_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed source_to_target_data"); + goto end; + } pdu_session_list = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "pduSessionList"); if (!pdu_session_list) { @@ -295,7 +307,6 @@ OpenAPI_n2_sm_information_t *pdu_session_listItem = OpenAPI_n2_sm_information_parseFromJSON(pdu_session_list_local); if (!pdu_session_listItem) { ogs_error("No pdu_session_listItem"); - OpenAPI_list_free(pdu_session_listList); goto end; } OpenAPI_list_add(pdu_session_listList, pdu_session_listItem); @@ -312,16 +323,28 @@ ue_radio_capability = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "ueRadioCapability"); if (ue_radio_capability) { ue_radio_capability_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(ue_radio_capability); + if (!ue_radio_capability_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed ue_radio_capability"); + goto end; + } } ue_radio_capability_for_paging = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "ueRadioCapabilityForPaging"); if (ue_radio_capability_for_paging) { ue_radio_capability_for_paging_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(ue_radio_capability_for_paging); + if (!ue_radio_capability_for_paging_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed ue_radio_capability_for_paging"); + goto end; + } } ngap_cause = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "ngapCause"); if (ngap_cause) { ngap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ngap_cause); + if (!ngap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ngap_cause"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "supportedFeatures"); @@ -335,6 +358,10 @@ serving_network = cJSON_GetObjectItemCaseSensitive(ue_context_create_dataJSON, "servingNetwork"); if (serving_network) { serving_network_local_nonprim = OpenAPI_plmn_id_nid_parseFromJSON(serving_network); + if (!serving_network_local_nonprim) { + ogs_error("OpenAPI_plmn_id_nid_parseFromJSON failed serving_network"); + goto end; + } } ue_context_create_data_local_var = OpenAPI_ue_context_create_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_create_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_create_error.c
Changed
@@ -114,15 +114,27 @@ goto end; } error_local_nonprim = OpenAPI_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_problem_details_parseFromJSON failed error"); + goto end; + } ngap_cause = cJSON_GetObjectItemCaseSensitive(ue_context_create_errorJSON, "ngapCause"); if (ngap_cause) { ngap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ngap_cause); + if (!ngap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ngap_cause"); + goto end; + } } target_to_source_failure_data = cJSON_GetObjectItemCaseSensitive(ue_context_create_errorJSON, "targetToSourceFailureData"); if (target_to_source_failure_data) { target_to_source_failure_data_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(target_to_source_failure_data); + if (!target_to_source_failure_data_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed target_to_source_failure_data"); + goto end; + } } ue_context_create_error_local_var = OpenAPI_ue_context_create_error_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_created_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_created_data.c
Changed
@@ -202,6 +202,10 @@ goto end; } ue_context_local_nonprim = OpenAPI_ue_context_parseFromJSON(ue_context); + if (!ue_context_local_nonprim) { + ogs_error("OpenAPI_ue_context_parseFromJSON failed ue_context"); + goto end; + } target_to_source_data = cJSON_GetObjectItemCaseSensitive(ue_context_created_dataJSON, "targetToSourceData"); if (!target_to_source_data) { @@ -209,6 +213,10 @@ goto end; } target_to_source_data_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(target_to_source_data); + if (!target_to_source_data_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed target_to_source_data"); + goto end; + } pdu_session_list = cJSON_GetObjectItemCaseSensitive(ue_context_created_dataJSON, "pduSessionList"); if (!pdu_session_list) { @@ -231,7 +239,6 @@ OpenAPI_n2_sm_information_t *pdu_session_listItem = OpenAPI_n2_sm_information_parseFromJSON(pdu_session_list_local); if (!pdu_session_listItem) { ogs_error("No pdu_session_listItem"); - OpenAPI_list_free(pdu_session_listList); goto end; } OpenAPI_list_add(pdu_session_listList, pdu_session_listItem); @@ -255,7 +262,6 @@ OpenAPI_n2_sm_information_t *failed_session_listItem = OpenAPI_n2_sm_information_parseFromJSON(failed_session_list_local); if (!failed_session_listItem) { ogs_error("No failed_session_listItem"); - OpenAPI_list_free(failed_session_listList); goto end; } OpenAPI_list_add(failed_session_listList, failed_session_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_in_amf_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_in_amf_data.c
Changed
@@ -94,6 +94,10 @@ eps_interworking_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_amf_dataJSON, "epsInterworkingInfo"); if (eps_interworking_info) { eps_interworking_info_local_nonprim = OpenAPI_eps_interworking_info_parseFromJSON(eps_interworking_info); + if (!eps_interworking_info_local_nonprim) { + ogs_error("OpenAPI_eps_interworking_info_parseFromJSON failed eps_interworking_info"); + goto end; + } } amf_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_amf_dataJSON, "amfInfo"); @@ -114,7 +118,6 @@ OpenAPI_nudm_amf_info_t *amf_infoItem = OpenAPI_nudm_amf_info_parseFromJSON(amf_info_local); if (!amf_infoItem) { ogs_error("No amf_infoItem"); - OpenAPI_list_free(amf_infoList); goto end; } OpenAPI_list_add(amf_infoList, amf_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data.c
Changed
@@ -171,7 +171,6 @@ OpenAPI_pgw_info_t *pgw_infoItem = OpenAPI_pgw_info_parseFromJSON(pgw_info_local); if (!pgw_infoItem) { ogs_error("No pgw_infoItem"); - OpenAPI_list_free(pgw_infoList); goto end; } OpenAPI_list_add(pgw_infoList, pgw_infoItem); @@ -181,6 +180,10 @@ emergency_info = cJSON_GetObjectItemCaseSensitive(ue_context_in_smf_dataJSON, "emergencyInfo"); if (emergency_info) { emergency_info_local_nonprim = OpenAPI_emergency_info_parseFromJSON(emergency_info); + if (!emergency_info_local_nonprim) { + ogs_error("OpenAPI_emergency_info_parseFromJSON failed emergency_info"); + goto end; + } } ue_context_in_smf_data_local_var = OpenAPI_ue_context_in_smf_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data_sub_filter.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data_sub_filter.c
Changed
@@ -146,7 +146,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data_sub_filter_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data_sub_filter_1.c
Changed
@@ -146,7 +146,6 @@ OpenAPI_snssai_t *snssai_listItem = OpenAPI_snssai_parseFromJSON(snssai_list_local); if (!snssai_listItem) { ogs_error("No snssai_listItem"); - OpenAPI_list_free(snssai_listList); goto end; } OpenAPI_list_add(snssai_listList, snssai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_in_smsf_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_in_smsf_data.c
Changed
@@ -88,11 +88,19 @@ smsf_info3_gpp_access = cJSON_GetObjectItemCaseSensitive(ue_context_in_smsf_dataJSON, "smsfInfo3GppAccess"); if (smsf_info3_gpp_access) { smsf_info3_gpp_access_local_nonprim = OpenAPI_smsf_info_parseFromJSON(smsf_info3_gpp_access); + if (!smsf_info3_gpp_access_local_nonprim) { + ogs_error("OpenAPI_smsf_info_parseFromJSON failed smsf_info3_gpp_access"); + goto end; + } } smsf_info_non3_gpp_access = cJSON_GetObjectItemCaseSensitive(ue_context_in_smsf_dataJSON, "smsfInfoNon3GppAccess"); if (smsf_info_non3_gpp_access) { smsf_info_non3_gpp_access_local_nonprim = OpenAPI_smsf_info_parseFromJSON(smsf_info_non3_gpp_access); + if (!smsf_info_non3_gpp_access_local_nonprim) { + ogs_error("OpenAPI_smsf_info_parseFromJSON failed smsf_info_non3_gpp_access"); + goto end; + } } ue_context_in_smsf_data_local_var = OpenAPI_ue_context_in_smsf_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_release.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_release.c
Changed
@@ -114,6 +114,10 @@ goto end; } ngap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ngap_cause); + if (!ngap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ngap_cause"); + goto end; + } ue_context_release_local_var = OpenAPI_ue_context_release_create ( supi && !cJSON_IsNull(supi) ? ogs_strdup(supi->valuestring) : NULL,
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_relocate_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_relocate_data.c
Changed
@@ -224,6 +224,10 @@ goto end; } ue_context_local_nonprim = OpenAPI_ue_context_parseFromJSON(ue_context); + if (!ue_context_local_nonprim) { + ogs_error("OpenAPI_ue_context_parseFromJSON failed ue_context"); + goto end; + } target_id = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "targetId"); if (!target_id) { @@ -231,6 +235,10 @@ goto end; } target_id_local_nonprim = OpenAPI_ng_ran_target_id_parseFromJSON(target_id); + if (!target_id_local_nonprim) { + ogs_error("OpenAPI_ng_ran_target_id_parseFromJSON failed target_id"); + goto end; + } source_to_target_data = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "sourceToTargetData"); if (!source_to_target_data) { @@ -238,6 +246,10 @@ goto end; } source_to_target_data_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(source_to_target_data); + if (!source_to_target_data_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed source_to_target_data"); + goto end; + } forward_relocation_request = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "forwardRelocationRequest"); if (!forward_relocation_request) { @@ -245,6 +257,10 @@ goto end; } forward_relocation_request_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(forward_relocation_request); + if (!forward_relocation_request_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed forward_relocation_request"); + goto end; + } pdu_session_list = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "pduSessionList"); if (pdu_session_list) { @@ -264,7 +280,6 @@ OpenAPI_n2_sm_information_t *pdu_session_listItem = OpenAPI_n2_sm_information_parseFromJSON(pdu_session_list_local); if (!pdu_session_listItem) { ogs_error("No pdu_session_listItem"); - OpenAPI_list_free(pdu_session_listList); goto end; } OpenAPI_list_add(pdu_session_listList, pdu_session_listItem); @@ -274,11 +289,19 @@ ue_radio_capability = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "ueRadioCapability"); if (ue_radio_capability) { ue_radio_capability_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(ue_radio_capability); + if (!ue_radio_capability_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed ue_radio_capability"); + goto end; + } } ngap_cause = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "ngapCause"); if (ngap_cause) { ngap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ngap_cause); + if (!ngap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ngap_cause"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ue_context_relocate_dataJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_relocated_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_relocated_data.c
Changed
@@ -72,6 +72,10 @@ goto end; } ue_context_local_nonprim = OpenAPI_ue_context_parseFromJSON(ue_context); + if (!ue_context_local_nonprim) { + ogs_error("OpenAPI_ue_context_parseFromJSON failed ue_context"); + goto end; + } ue_context_relocated_data_local_var = OpenAPI_ue_context_relocated_data_create ( ue_context_local_nonprim
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_transfer_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_transfer_200_response.c
Changed
@@ -118,6 +118,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_200_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_transfer_rsp_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_transfer_rsp_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n2_information = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_200_responseJSON, "binaryDataN2Information");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_transfer_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_transfer_req_data.c
Changed
@@ -150,11 +150,19 @@ plmn_id = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_req_dataJSON, "plmnId"); if (plmn_id) { plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); + if (!plmn_id_local_nonprim) { + ogs_error("OpenAPI_plmn_id_parseFromJSON failed plmn_id"); + goto end; + } } reg_request = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_req_dataJSON, "regRequest"); if (reg_request) { reg_request_local_nonprim = OpenAPI_n1_message_container_parseFromJSON(reg_request); + if (!reg_request_local_nonprim) { + ogs_error("OpenAPI_n1_message_container_parseFromJSON failed reg_request"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_req_dataJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_transfer_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_transfer_request.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_ue_context_transfer_req_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_ue_context_transfer_req_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_message = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_requestJSON, "binaryDataN1Message");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c
Changed
@@ -149,20 +149,36 @@ goto end; } ue_context_local_nonprim = OpenAPI_ue_context_parseFromJSON(ue_context); + if (!ue_context_local_nonprim) { + ogs_error("OpenAPI_ue_context_parseFromJSON failed ue_context"); + goto end; + } ue_radio_capability = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_rsp_dataJSON, "ueRadioCapability"); if (ue_radio_capability) { ue_radio_capability_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(ue_radio_capability); + if (!ue_radio_capability_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed ue_radio_capability"); + goto end; + } } ue_radio_capability_for_paging = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_rsp_dataJSON, "ueRadioCapabilityForPaging"); if (ue_radio_capability_for_paging) { ue_radio_capability_for_paging_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(ue_radio_capability_for_paging); + if (!ue_radio_capability_for_paging_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed ue_radio_capability_for_paging"); + goto end; + } } ue_nbiot_radio_capability = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_rsp_dataJSON, "ueNbiotRadioCapability"); if (ue_nbiot_radio_capability) { ue_nbiot_radio_capability_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(ue_nbiot_radio_capability); + if (!ue_nbiot_radio_capability_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed ue_nbiot_radio_capability"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(ue_context_transfer_rsp_dataJSON, "supportedFeatures");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_differentiation_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_differentiation_info.c
Changed
@@ -164,6 +164,10 @@ scheduled_com_time = cJSON_GetObjectItemCaseSensitive(ue_differentiation_infoJSON, "scheduledComTime"); if (scheduled_com_time) { scheduled_com_time_local_nonprim = OpenAPI_scheduled_communication_time_parseFromJSON(scheduled_com_time); + if (!scheduled_com_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_parseFromJSON failed scheduled_com_time"); + goto end; + } } stationary_ind = cJSON_GetObjectItemCaseSensitive(ue_differentiation_infoJSON, "stationaryInd"); @@ -187,6 +191,10 @@ battery_ind = cJSON_GetObjectItemCaseSensitive(ue_differentiation_infoJSON, "batteryInd"); if (battery_ind) { battery_ind_local_nonprim = OpenAPI_battery_indication_parseFromJSON(battery_ind); + if (!battery_ind_local_nonprim) { + ogs_error("OpenAPI_battery_indication_parseFromJSON failed battery_ind"); + goto end; + } } validity_time = cJSON_GetObjectItemCaseSensitive(ue_differentiation_infoJSON, "validityTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_in_area_filter.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_in_area_filter.c
Changed
@@ -79,6 +79,10 @@ ue_type = cJSON_GetObjectItemCaseSensitive(ue_in_area_filterJSON, "ueType"); if (ue_type) { ue_type_local_nonprim = OpenAPI_ue_type_parseFromJSON(ue_type); + if (!ue_type_local_nonprim) { + ogs_error("OpenAPI_ue_type_parseFromJSON failed ue_type"); + goto end; + } } aerial_srv_dnn_ind = cJSON_GetObjectItemCaseSensitive(ue_in_area_filterJSON, "aerialSrvDnnInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_initiated_resource_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_initiated_resource_request.c
Changed
@@ -180,7 +180,6 @@ OpenAPI_packet_filter_info_t *pack_filt_infoItem = OpenAPI_packet_filter_info_parseFromJSON(pack_filt_info_local); if (!pack_filt_infoItem) { ogs_error("No pack_filt_infoItem"); - OpenAPI_list_free(pack_filt_infoList); goto end; } OpenAPI_list_add(pack_filt_infoList, pack_filt_infoItem); @@ -189,6 +188,10 @@ req_qos = cJSON_GetObjectItemCaseSensitive(ue_initiated_resource_requestJSON, "reqQos"); if (req_qos) { req_qos_local_nonprim = OpenAPI_requested_qos_parseFromJSON(req_qos); + if (!req_qos_local_nonprim) { + ogs_error("OpenAPI_requested_qos_parseFromJSON failed req_qos"); + goto end; + } } ue_initiated_resource_request_local_var = OpenAPI_ue_initiated_resource_request_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_mobility.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_mobility.c
Changed
@@ -140,6 +140,10 @@ recurring_time = cJSON_GetObjectItemCaseSensitive(ue_mobilityJSON, "recurringTime"); if (recurring_time) { recurring_time_local_nonprim = OpenAPI_scheduled_communication_time_1_parseFromJSON(recurring_time); + if (!recurring_time_local_nonprim) { + ogs_error("OpenAPI_scheduled_communication_time_1_parseFromJSON failed recurring_time"); + goto end; + } } duration = cJSON_GetObjectItemCaseSensitive(ue_mobilityJSON, "duration"); @@ -176,7 +180,6 @@ OpenAPI_location_info_t *loc_infosItem = OpenAPI_location_info_parseFromJSON(loc_infos_local); if (!loc_infosItem) { ogs_error("No loc_infosItem"); - OpenAPI_list_free(loc_infosList); goto end; } OpenAPI_list_add(loc_infosList, loc_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c
Changed
@@ -195,6 +195,10 @@ old_guami = cJSON_GetObjectItemCaseSensitive(ue_n1_n2_info_subscription_create_dataJSON, "oldGuami"); if (old_guami) { old_guami_local_nonprim = OpenAPI_guami_parseFromJSON(old_guami); + if (!old_guami_local_nonprim) { + ogs_error("OpenAPI_guami_parseFromJSON failed old_guami"); + goto end; + } } ue_n1_n2_info_subscription_create_data_local_var = OpenAPI_ue_n1_n2_info_subscription_create_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_reg_status_update_req_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_reg_status_update_req_data.c
Changed
@@ -236,7 +236,6 @@ OpenAPI_smf_change_info_t *smf_change_info_listItem = OpenAPI_smf_change_info_parseFromJSON(smf_change_info_list_local); if (!smf_change_info_listItem) { ogs_error("No smf_change_info_listItem"); - OpenAPI_list_free(smf_change_info_listList); goto end; } OpenAPI_list_add(smf_change_info_listList, smf_change_info_listItem); @@ -282,7 +281,6 @@ OpenAPI_release_session_info_t *to_release_session_infoItem = OpenAPI_release_session_info_parseFromJSON(to_release_session_info_local); if (!to_release_session_infoItem) { ogs_error("No to_release_session_infoItem"); - OpenAPI_list_free(to_release_session_infoList); goto end; } OpenAPI_list_add(to_release_session_infoList, to_release_session_infoItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ue_slice_mbr.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ue_slice_mbr.c
Changed
@@ -159,10 +159,18 @@ goto end; } serving_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(serving_snssai); + if (!serving_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed serving_snssai"); + goto end; + } mapped_home_snssai = cJSON_GetObjectItemCaseSensitive(ue_slice_mbrJSON, "mappedHomeSnssai"); if (mapped_home_snssai) { mapped_home_snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(mapped_home_snssai); + if (!mapped_home_snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed mapped_home_snssai"); + goto end; + } } ue_slice_mbr_local_var = OpenAPI_ue_slice_mbr_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/un_trust_af_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/un_trust_af_info.c
Changed
@@ -126,7 +126,6 @@ OpenAPI_snssai_info_item_t *s_nssai_info_listItem = OpenAPI_snssai_info_item_parseFromJSON(s_nssai_info_list_local); if (!s_nssai_info_listItem) { ogs_error("No s_nssai_info_listItem"); - OpenAPI_list_free(s_nssai_info_listList); goto end; } OpenAPI_list_add(s_nssai_info_listList, s_nssai_info_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/unrelated_class.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/unrelated_class.c
Changed
@@ -120,10 +120,18 @@ goto end; } default_unrelated_class_local_nonprim = OpenAPI_default_unrelated_class_parseFromJSON(default_unrelated_class); + if (!default_unrelated_class_local_nonprim) { + ogs_error("OpenAPI_default_unrelated_class_parseFromJSON failed default_unrelated_class"); + goto end; + } external_unrelated_class = cJSON_GetObjectItemCaseSensitive(unrelated_classJSON, "externalUnrelatedClass"); if (external_unrelated_class) { external_unrelated_class_local_nonprim = OpenAPI_external_unrelated_class_parseFromJSON(external_unrelated_class); + if (!external_unrelated_class_local_nonprim) { + ogs_error("OpenAPI_external_unrelated_class_parseFromJSON failed external_unrelated_class"); + goto end; + } } service_type_unrelated_classes = cJSON_GetObjectItemCaseSensitive(unrelated_classJSON, "serviceTypeUnrelatedClasses"); @@ -144,7 +152,6 @@ OpenAPI_service_type_unrelated_class_t *service_type_unrelated_classesItem = OpenAPI_service_type_unrelated_class_parseFromJSON(service_type_unrelated_classes_local); if (!service_type_unrelated_classesItem) { ogs_error("No service_type_unrelated_classesItem"); - OpenAPI_list_free(service_type_unrelated_classesList); goto end; } OpenAPI_list_add(service_type_unrelated_classesList, service_type_unrelated_classesItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/up_security_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/up_security_info.c
Changed
@@ -115,6 +115,10 @@ goto end; } up_security_local_nonprim = OpenAPI_up_security_parseFromJSON(up_security); + if (!up_security_local_nonprim) { + ogs_error("OpenAPI_up_security_parseFromJSON failed up_security"); + goto end; + } max_integrity_protected_data_rate_ul = cJSON_GetObjectItemCaseSensitive(up_security_infoJSON, "maxIntegrityProtectedDataRateUl"); if (max_integrity_protected_data_rate_ul) { @@ -137,6 +141,10 @@ security_result = cJSON_GetObjectItemCaseSensitive(up_security_infoJSON, "securityResult"); if (security_result) { security_result_local_nonprim = OpenAPI_security_result_parseFromJSON(security_result); + if (!security_result_local_nonprim) { + ogs_error("OpenAPI_security_result_parseFromJSON failed security_result"); + goto end; + } } up_security_info_local_var = OpenAPI_up_security_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_nwdaf_registration_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_nwdaf_registration_200_response.c
Changed
@@ -236,7 +236,6 @@ OpenAPI_event_id_t *analytics_idsItem = OpenAPI_event_id_parseFromJSON(analytics_ids_local); if (!analytics_idsItem) { ogs_error("No analytics_idsItem"); - OpenAPI_list_free(analytics_idsList); goto end; } OpenAPI_list_add(analytics_idsList, analytics_idsItem); @@ -261,6 +260,10 @@ context_info = cJSON_GetObjectItemCaseSensitive(update_nwdaf_registration_200_responseJSON, "contextInfo"); if (context_info) { context_info_local_nonprim = OpenAPI_context_info_parseFromJSON(context_info); + if (!context_info_local_nonprim) { + ogs_error("OpenAPI_context_info_parseFromJSON failed context_info"); + goto end; + } } supported_features = cJSON_GetObjectItemCaseSensitive(update_nwdaf_registration_200_responseJSON, "supportedFeatures"); @@ -313,7 +316,6 @@ OpenAPI_report_item_t *reportItem = OpenAPI_report_item_parseFromJSON(report_local); if (!reportItem) { ogs_error("No reportItem"); - OpenAPI_list_free(reportList); goto end; } OpenAPI_list_add(reportList, reportItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_pdu_session_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_pdu_session_200_response.c
Changed
@@ -135,6 +135,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(update_pdu_session_200_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_hsmf_updated_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_hsmf_updated_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(update_pdu_session_200_responseJSON, "binaryDataN1SmInfoToUe");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_pdu_session_400_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_pdu_session_400_response.c
Changed
@@ -84,6 +84,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(update_pdu_session_400_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_hsmf_update_error_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_hsmf_update_error_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(update_pdu_session_400_responseJSON, "binaryDataN1SmInfoToUe");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_pdu_session_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_pdu_session_request.c
Changed
@@ -152,6 +152,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(update_pdu_session_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_hsmf_update_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_hsmf_update_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_sm_info_from_ue = cJSON_GetObjectItemCaseSensitive(update_pdu_session_requestJSON, "binaryDataN1SmInfoFromUe");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_sm_context_200_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_sm_context_200_response.c
Changed
@@ -101,6 +101,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(update_sm_context_200_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_sm_context_updated_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_sm_context_updated_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_sm_message = cJSON_GetObjectItemCaseSensitive(update_sm_context_200_responseJSON, "binaryDataN1SmMessage");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_sm_context_400_response.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_sm_context_400_response.c
Changed
@@ -101,6 +101,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(update_sm_context_400_responseJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_sm_context_update_error_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_sm_context_update_error_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_sm_message = cJSON_GetObjectItemCaseSensitive(update_sm_context_400_responseJSON, "binaryDataN1SmMessage");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/update_sm_context_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/update_sm_context_request.c
Changed
@@ -118,6 +118,10 @@ json_data = cJSON_GetObjectItemCaseSensitive(update_sm_context_requestJSON, "jsonData"); if (json_data) { json_data_local_nonprim = OpenAPI_sm_context_update_data_parseFromJSON(json_data); + if (!json_data_local_nonprim) { + ogs_error("OpenAPI_sm_context_update_data_parseFromJSON failed json_data"); + goto end; + } } binary_data_n1_sm_message = cJSON_GetObjectItemCaseSensitive(update_sm_context_requestJSON, "binaryDataN1SmMessage");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upf_cond.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upf_cond.c
Changed
@@ -181,7 +181,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upf_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upf_info.c
Changed
@@ -391,7 +391,6 @@ OpenAPI_snssai_upf_info_item_t *s_nssai_upf_info_listItem = OpenAPI_snssai_upf_info_item_parseFromJSON(s_nssai_upf_info_list_local); if (!s_nssai_upf_info_listItem) { ogs_error("No s_nssai_upf_info_listItem"); - OpenAPI_list_free(s_nssai_upf_info_listList); goto end; } OpenAPI_list_add(s_nssai_upf_info_listList, s_nssai_upf_info_listItem); @@ -436,7 +435,6 @@ OpenAPI_interface_upf_info_item_t *interface_upf_info_listItem = OpenAPI_interface_upf_info_item_parseFromJSON(interface_upf_info_list_local); if (!interface_upf_info_listItem) { ogs_error("No interface_upf_info_listItem"); - OpenAPI_list_free(interface_upf_info_listList); goto end; } OpenAPI_list_add(interface_upf_info_listList, interface_upf_info_listItem); @@ -473,6 +471,10 @@ atsss_capability = cJSON_GetObjectItemCaseSensitive(upf_infoJSON, "atsssCapability"); if (atsss_capability) { atsss_capability_local_nonprim = OpenAPI_atsss_capability_parseFromJSON(atsss_capability); + if (!atsss_capability_local_nonprim) { + ogs_error("OpenAPI_atsss_capability_parseFromJSON failed atsss_capability"); + goto end; + } } ue_ip_addr_ind = cJSON_GetObjectItemCaseSensitive(upf_infoJSON, "ueIpAddrInd"); @@ -501,7 +503,6 @@ OpenAPI_tai_t *tai_listItem = OpenAPI_tai_parseFromJSON(tai_list_local); if (!tai_listItem) { ogs_error("No tai_listItem"); - OpenAPI_list_free(tai_listList); goto end; } OpenAPI_list_add(tai_listList, tai_listItem); @@ -526,7 +527,6 @@ OpenAPI_tai_range_t *tai_range_listItem = OpenAPI_tai_range_parseFromJSON(tai_range_list_local); if (!tai_range_listItem) { ogs_error("No tai_range_listItem"); - OpenAPI_list_free(tai_range_listList); goto end; } OpenAPI_list_add(tai_range_listList, tai_range_listItem); @@ -536,16 +536,28 @@ w_agf_info = cJSON_GetObjectItemCaseSensitive(upf_infoJSON, "wAgfInfo"); if (w_agf_info) { w_agf_info_local_nonprim = OpenAPI_w_agf_info_parseFromJSON(w_agf_info); + if (!w_agf_info_local_nonprim) { + ogs_error("OpenAPI_w_agf_info_parseFromJSON failed w_agf_info"); + goto end; + } } tngf_info = cJSON_GetObjectItemCaseSensitive(upf_infoJSON, "tngfInfo"); if (tngf_info) { tngf_info_local_nonprim = OpenAPI_tngf_info_parseFromJSON(tngf_info); + if (!tngf_info_local_nonprim) { + ogs_error("OpenAPI_tngf_info_parseFromJSON failed tngf_info"); + goto end; + } } twif_info = cJSON_GetObjectItemCaseSensitive(upf_infoJSON, "twifInfo"); if (twif_info) { twif_info_local_nonprim = OpenAPI_twif_info_parseFromJSON(twif_info); + if (!twif_info_local_nonprim) { + ogs_error("OpenAPI_twif_info_parseFromJSON failed twif_info"); + goto end; + } } priority = cJSON_GetObjectItemCaseSensitive(upf_infoJSON, "priority");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upf_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upf_information.c
Changed
@@ -89,6 +89,10 @@ upf_addr = cJSON_GetObjectItemCaseSensitive(upf_informationJSON, "upfAddr"); if (upf_addr) { upf_addr_local_nonprim = OpenAPI_addr_fqdn_parseFromJSON(upf_addr); + if (!upf_addr_local_nonprim) { + ogs_error("OpenAPI_addr_fqdn_parseFromJSON failed upf_addr"); + goto end; + } } upf_information_local_var = OpenAPI_upf_information_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upu_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upu_data.c
Changed
@@ -124,7 +124,6 @@ OpenAPI_snssai_t *default_conf_nssaiItem = OpenAPI_snssai_parseFromJSON(default_conf_nssai_local); if (!default_conf_nssaiItem) { ogs_error("No default_conf_nssaiItem"); - OpenAPI_list_free(default_conf_nssaiList); goto end; } OpenAPI_list_add(default_conf_nssaiList, default_conf_nssaiItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upu_data_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upu_data_1.c
Changed
@@ -124,7 +124,6 @@ OpenAPI_snssai_t *default_conf_nssaiItem = OpenAPI_snssai_parseFromJSON(default_conf_nssai_local); if (!default_conf_nssaiItem) { ogs_error("No default_conf_nssaiItem"); - OpenAPI_list_free(default_conf_nssaiList); goto end; } OpenAPI_list_add(default_conf_nssaiList, default_conf_nssaiItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upu_data_2.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upu_data_2.c
Changed
@@ -124,7 +124,6 @@ OpenAPI_snssai_t *default_conf_nssaiItem = OpenAPI_snssai_parseFromJSON(default_conf_nssai_local); if (!default_conf_nssaiItem) { ogs_error("No default_conf_nssaiItem"); - OpenAPI_list_free(default_conf_nssaiList); goto end; } OpenAPI_list_add(default_conf_nssaiList, default_conf_nssaiItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upu_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upu_info.c
Changed
@@ -170,7 +170,6 @@ OpenAPI_upu_data_t *upu_data_listItem = OpenAPI_upu_data_parseFromJSON(upu_data_list_local); if (!upu_data_listItem) { ogs_error("No upu_data_listItem"); - OpenAPI_list_free(upu_data_listList); goto end; } OpenAPI_list_add(upu_data_listList, upu_data_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/upu_info_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/upu_info_1.c
Changed
@@ -170,7 +170,6 @@ OpenAPI_upu_data_2_t *upu_data_listItem = OpenAPI_upu_data_2_parseFromJSON(upu_data_list_local); if (!upu_data_listItem) { ogs_error("No upu_data_listItem"); - OpenAPI_list_free(upu_data_listList); goto end; } OpenAPI_list_add(upu_data_listList, upu_data_listItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/ursp_rule_request.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/ursp_rule_request.c
Changed
@@ -106,6 +106,10 @@ traffic_desc = cJSON_GetObjectItemCaseSensitive(ursp_rule_requestJSON, "trafficDesc"); if (traffic_desc) { traffic_desc_local_nonprim = OpenAPI_traffic_descriptor_components_parseFromJSON(traffic_desc); + if (!traffic_desc_local_nonprim) { + ogs_error("OpenAPI_traffic_descriptor_components_parseFromJSON failed traffic_desc"); + goto end; + } } relat_precedence = cJSON_GetObjectItemCaseSensitive(ursp_rule_requestJSON, "relatPrecedence"); @@ -134,7 +138,6 @@ OpenAPI_route_selection_parameter_set_t *route_sel_param_setsItem = OpenAPI_route_selection_parameter_set_parseFromJSON(route_sel_param_sets_local); if (!route_sel_param_setsItem) { ogs_error("No route_sel_param_setsItem"); - OpenAPI_list_free(route_sel_param_setsList); goto end; } OpenAPI_list_add(route_sel_param_setsList, route_sel_param_setsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/usage_mon_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/usage_mon_data.c
Changed
@@ -229,11 +229,19 @@ um_level = cJSON_GetObjectItemCaseSensitive(usage_mon_dataJSON, "umLevel"); if (um_level) { um_level_local_nonprim = OpenAPI_usage_mon_level_parseFromJSON(um_level); + if (!um_level_local_nonprim) { + ogs_error("OpenAPI_usage_mon_level_parseFromJSON failed um_level"); + goto end; + } } allowed_usage = cJSON_GetObjectItemCaseSensitive(usage_mon_dataJSON, "allowedUsage"); if (allowed_usage) { allowed_usage_local_nonprim = OpenAPI_usage_threshold_parseFromJSON(allowed_usage); + if (!allowed_usage_local_nonprim) { + ogs_error("OpenAPI_usage_threshold_parseFromJSON failed allowed_usage"); + goto end; + } } reset_time = cJSON_GetObjectItemCaseSensitive(usage_mon_dataJSON, "resetTime");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/usage_mon_data_limit.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/usage_mon_data_limit.c
Changed
@@ -225,6 +225,10 @@ um_level = cJSON_GetObjectItemCaseSensitive(usage_mon_data_limitJSON, "umLevel"); if (um_level) { um_level_local_nonprim = OpenAPI_usage_mon_level_parseFromJSON(um_level); + if (!um_level_local_nonprim) { + ogs_error("OpenAPI_usage_mon_level_parseFromJSON failed um_level"); + goto end; + } } start_date = cJSON_GetObjectItemCaseSensitive(usage_mon_data_limitJSON, "startDate"); @@ -246,11 +250,19 @@ usage_limit = cJSON_GetObjectItemCaseSensitive(usage_mon_data_limitJSON, "usageLimit"); if (usage_limit) { usage_limit_local_nonprim = OpenAPI_usage_threshold_parseFromJSON(usage_limit); + if (!usage_limit_local_nonprim) { + ogs_error("OpenAPI_usage_threshold_parseFromJSON failed usage_limit"); + goto end; + } } reset_period = cJSON_GetObjectItemCaseSensitive(usage_mon_data_limitJSON, "resetPeriod"); if (reset_period) { reset_period_local_nonprim = OpenAPI_time_period_parseFromJSON(reset_period); + if (!reset_period_local_nonprim) { + ogs_error("OpenAPI_time_period_parseFromJSON failed reset_period"); + goto end; + } } usage_mon_data_limit_local_var = OpenAPI_usage_mon_data_limit_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/usage_mon_data_scope.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/usage_mon_data_scope.c
Changed
@@ -97,6 +97,10 @@ goto end; } snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } dnn = cJSON_GetObjectItemCaseSensitive(usage_mon_data_scopeJSON, "dnn"); if (dnn) {
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/user_data_congestion_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/user_data_congestion_info.c
Changed
@@ -116,6 +116,10 @@ goto end; } network_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(network_area); + if (!network_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed network_area"); + goto end; + } congestion_info = cJSON_GetObjectItemCaseSensitive(user_data_congestion_infoJSON, "congestionInfo"); if (!congestion_info) { @@ -123,10 +127,18 @@ goto end; } congestion_info_local_nonprim = OpenAPI_congestion_info_parseFromJSON(congestion_info); + if (!congestion_info_local_nonprim) { + ogs_error("OpenAPI_congestion_info_parseFromJSON failed congestion_info"); + goto end; + } snssai = cJSON_GetObjectItemCaseSensitive(user_data_congestion_infoJSON, "snssai"); if (snssai) { snssai_local_nonprim = OpenAPI_snssai_parseFromJSON(snssai); + if (!snssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed snssai"); + goto end; + } } user_data_congestion_info_local_var = OpenAPI_user_data_congestion_info_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/user_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/user_location.c
Changed
@@ -151,26 +151,46 @@ eutra_location = cJSON_GetObjectItemCaseSensitive(user_locationJSON, "eutraLocation"); if (eutra_location) { eutra_location_local_nonprim = OpenAPI_eutra_location_parseFromJSON(eutra_location); + if (!eutra_location_local_nonprim) { + ogs_error("OpenAPI_eutra_location_parseFromJSON failed eutra_location"); + goto end; + } } nr_location = cJSON_GetObjectItemCaseSensitive(user_locationJSON, "nrLocation"); if (nr_location) { nr_location_local_nonprim = OpenAPI_nr_location_parseFromJSON(nr_location); + if (!nr_location_local_nonprim) { + ogs_error("OpenAPI_nr_location_parseFromJSON failed nr_location"); + goto end; + } } n3ga_location = cJSON_GetObjectItemCaseSensitive(user_locationJSON, "n3gaLocation"); if (n3ga_location) { n3ga_location_local_nonprim = OpenAPI_n3ga_location_parseFromJSON(n3ga_location); + if (!n3ga_location_local_nonprim) { + ogs_error("OpenAPI_n3ga_location_parseFromJSON failed n3ga_location"); + goto end; + } } utra_location = cJSON_GetObjectItemCaseSensitive(user_locationJSON, "utraLocation"); if (utra_location) { utra_location_local_nonprim = OpenAPI_utra_location_parseFromJSON(utra_location); + if (!utra_location_local_nonprim) { + ogs_error("OpenAPI_utra_location_parseFromJSON failed utra_location"); + goto end; + } } gera_location = cJSON_GetObjectItemCaseSensitive(user_locationJSON, "geraLocation"); if (gera_location) { gera_location_local_nonprim = OpenAPI_gera_location_parseFromJSON(gera_location); + if (!gera_location_local_nonprim) { + ogs_error("OpenAPI_gera_location_parseFromJSON failed gera_location"); + goto end; + } } user_location_local_var = OpenAPI_user_location_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/utra_location.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/utra_location.c
Changed
@@ -184,21 +184,37 @@ cgi = cJSON_GetObjectItemCaseSensitive(utra_locationJSON, "cgi"); if (cgi) { cgi_local_nonprim = OpenAPI_cell_global_id_parseFromJSON(cgi); + if (!cgi_local_nonprim) { + ogs_error("OpenAPI_cell_global_id_parseFromJSON failed cgi"); + goto end; + } } sai = cJSON_GetObjectItemCaseSensitive(utra_locationJSON, "sai"); if (sai) { sai_local_nonprim = OpenAPI_service_area_id_parseFromJSON(sai); + if (!sai_local_nonprim) { + ogs_error("OpenAPI_service_area_id_parseFromJSON failed sai"); + goto end; + } } lai = cJSON_GetObjectItemCaseSensitive(utra_locationJSON, "lai"); if (lai) { lai_local_nonprim = OpenAPI_location_area_id_parseFromJSON(lai); + if (!lai_local_nonprim) { + ogs_error("OpenAPI_location_area_id_parseFromJSON failed lai"); + goto end; + } } rai = cJSON_GetObjectItemCaseSensitive(utra_locationJSON, "rai"); if (rai) { rai_local_nonprim = OpenAPI_routing_area_id_parseFromJSON(rai); + if (!rai_local_nonprim) { + ogs_error("OpenAPI_routing_area_id_parseFromJSON failed rai"); + goto end; + } } age_of_location_information = cJSON_GetObjectItemCaseSensitive(utra_locationJSON, "ageOfLocationInformation");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/v2x_context.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/v2x_context.c
Changed
@@ -137,11 +137,19 @@ nr_v2x_services_auth = cJSON_GetObjectItemCaseSensitive(v2x_contextJSON, "nrV2xServicesAuth"); if (nr_v2x_services_auth) { nr_v2x_services_auth_local_nonprim = OpenAPI_nr_v2x_auth_parseFromJSON(nr_v2x_services_auth); + if (!nr_v2x_services_auth_local_nonprim) { + ogs_error("OpenAPI_nr_v2x_auth_parseFromJSON failed nr_v2x_services_auth"); + goto end; + } } lte_v2x_services_auth = cJSON_GetObjectItemCaseSensitive(v2x_contextJSON, "lteV2xServicesAuth"); if (lte_v2x_services_auth) { lte_v2x_services_auth_local_nonprim = OpenAPI_lte_v2x_auth_parseFromJSON(lte_v2x_services_auth); + if (!lte_v2x_services_auth_local_nonprim) { + ogs_error("OpenAPI_lte_v2x_auth_parseFromJSON failed lte_v2x_services_auth"); + goto end; + } } nr_ue_sidelink_ambr = cJSON_GetObjectItemCaseSensitive(v2x_contextJSON, "nrUeSidelinkAmbr"); @@ -163,6 +171,10 @@ pc5_qo_s_para = cJSON_GetObjectItemCaseSensitive(v2x_contextJSON, "pc5QoSPara"); if (pc5_qo_s_para) { pc5_qo_s_para_local_nonprim = OpenAPI_pc5_qo_s_para_parseFromJSON(pc5_qo_s_para); + if (!pc5_qo_s_para_local_nonprim) { + ogs_error("OpenAPI_pc5_qo_s_para_parseFromJSON failed pc5_qo_s_para"); + goto end; + } } v2x_context_local_var = OpenAPI_v2x_context_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/v2x_information.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/v2x_information.c
Changed
@@ -67,6 +67,10 @@ n2_pc5_pol = cJSON_GetObjectItemCaseSensitive(v2x_informationJSON, "n2Pc5Pol"); if (n2_pc5_pol) { n2_pc5_pol_local_nonprim = OpenAPI_n2_info_content_parseFromJSON(n2_pc5_pol); + if (!n2_pc5_pol_local_nonprim) { + ogs_error("OpenAPI_n2_info_content_parseFromJSON failed n2_pc5_pol"); + goto end; + } } v2x_information_local_var = OpenAPI_v2x_information_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/v2x_subscription_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/v2x_subscription_data.c
Changed
@@ -116,11 +116,19 @@ nr_v2x_services_auth = cJSON_GetObjectItemCaseSensitive(v2x_subscription_dataJSON, "nrV2xServicesAuth"); if (nr_v2x_services_auth) { nr_v2x_services_auth_local_nonprim = OpenAPI_nr_v2x_auth_parseFromJSON(nr_v2x_services_auth); + if (!nr_v2x_services_auth_local_nonprim) { + ogs_error("OpenAPI_nr_v2x_auth_parseFromJSON failed nr_v2x_services_auth"); + goto end; + } } lte_v2x_services_auth = cJSON_GetObjectItemCaseSensitive(v2x_subscription_dataJSON, "lteV2xServicesAuth"); if (lte_v2x_services_auth) { lte_v2x_services_auth_local_nonprim = OpenAPI_lte_v2x_auth_parseFromJSON(lte_v2x_services_auth); + if (!lte_v2x_services_auth_local_nonprim) { + ogs_error("OpenAPI_lte_v2x_auth_parseFromJSON failed lte_v2x_services_auth"); + goto end; + } } nr_ue_pc5_ambr = cJSON_GetObjectItemCaseSensitive(v2x_subscription_dataJSON, "nrUePc5Ambr");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/vn_group_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/vn_group_data.c
Changed
@@ -129,6 +129,10 @@ pdu_session_types = cJSON_GetObjectItemCaseSensitive(vn_group_dataJSON, "pduSessionTypes"); if (pdu_session_types) { pdu_session_types_local_nonprim = OpenAPI_pdu_session_types_parseFromJSON(pdu_session_types); + if (!pdu_session_types_local_nonprim) { + ogs_error("OpenAPI_pdu_session_types_parseFromJSON failed pdu_session_types"); + goto end; + } } dnn = cJSON_GetObjectItemCaseSensitive(vn_group_dataJSON, "dnn"); @@ -142,6 +146,10 @@ single_nssai = cJSON_GetObjectItemCaseSensitive(vn_group_dataJSON, "singleNssai"); if (single_nssai) { single_nssai_local_nonprim = OpenAPI_snssai_parseFromJSON(single_nssai); + if (!single_nssai_local_nonprim) { + ogs_error("OpenAPI_snssai_parseFromJSON failed single_nssai"); + goto end; + } } app_descriptors = cJSON_GetObjectItemCaseSensitive(vn_group_dataJSON, "appDescriptors"); @@ -162,7 +170,6 @@ OpenAPI_app_descriptor_t *app_descriptorsItem = OpenAPI_app_descriptor_parseFromJSON(app_descriptors_local); if (!app_descriptorsItem) { ogs_error("No app_descriptorsItem"); - OpenAPI_list_free(app_descriptorsList); goto end; } OpenAPI_list_add(app_descriptorsList, app_descriptorsItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/vplmn_qos.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/vplmn_qos.c
Changed
@@ -164,11 +164,19 @@ arp = cJSON_GetObjectItemCaseSensitive(vplmn_qosJSON, "arp"); if (arp) { arp_local_nonprim = OpenAPI_arp_parseFromJSON(arp); + if (!arp_local_nonprim) { + ogs_error("OpenAPI_arp_parseFromJSON failed arp"); + goto end; + } } session_ambr = cJSON_GetObjectItemCaseSensitive(vplmn_qosJSON, "sessionAmbr"); if (session_ambr) { session_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed session_ambr"); + goto end; + } } max_fbr_dl = cJSON_GetObjectItemCaseSensitive(vplmn_qosJSON, "maxFbrDl");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/vsmf_update_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/vsmf_update_data.c
Changed
@@ -620,6 +620,10 @@ session_ambr = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "sessionAmbr"); if (session_ambr) { session_ambr_local_nonprim = OpenAPI_ambr_parseFromJSON(session_ambr); + if (!session_ambr_local_nonprim) { + ogs_error("OpenAPI_ambr_parseFromJSON failed session_ambr"); + goto end; + } } qos_flows_add_mod_request_list = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "qosFlowsAddModRequestList"); @@ -640,7 +644,6 @@ OpenAPI_qos_flow_add_modify_request_item_t *qos_flows_add_mod_request_listItem = OpenAPI_qos_flow_add_modify_request_item_parseFromJSON(qos_flows_add_mod_request_list_local); if (!qos_flows_add_mod_request_listItem) { ogs_error("No qos_flows_add_mod_request_listItem"); - OpenAPI_list_free(qos_flows_add_mod_request_listList); goto end; } OpenAPI_list_add(qos_flows_add_mod_request_listList, qos_flows_add_mod_request_listItem); @@ -665,7 +668,6 @@ OpenAPI_qos_flow_release_request_item_t *qos_flows_rel_request_listItem = OpenAPI_qos_flow_release_request_item_parseFromJSON(qos_flows_rel_request_list_local); if (!qos_flows_rel_request_listItem) { ogs_error("No qos_flows_rel_request_listItem"); - OpenAPI_list_free(qos_flows_rel_request_listList); goto end; } OpenAPI_list_add(qos_flows_rel_request_listList, qos_flows_rel_request_listItem); @@ -690,7 +692,6 @@ OpenAPI_eps_bearer_info_t *eps_bearer_infoItem = OpenAPI_eps_bearer_info_parseFromJSON(eps_bearer_info_local); if (!eps_bearer_infoItem) { ogs_error("No eps_bearer_infoItem"); - OpenAPI_list_free(eps_bearer_infoList); goto end; } OpenAPI_list_add(eps_bearer_infoList, eps_bearer_infoItem); @@ -715,7 +716,6 @@ OpenAPI_arp_t *assign_ebi_listItem = OpenAPI_arp_parseFromJSON(assign_ebi_list_local); if (!assign_ebi_listItem) { ogs_error("No assign_ebi_listItem"); - OpenAPI_list_free(assign_ebi_listList); goto end; } OpenAPI_list_add(assign_ebi_listList, assign_ebi_listItem); @@ -767,7 +767,6 @@ OpenAPI_ebi_arp_mapping_t *modified_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(modified_ebi_list_local); if (!modified_ebi_listItem) { ogs_error("No modified_ebi_listItem"); - OpenAPI_list_free(modified_ebi_listList); goto end; } OpenAPI_list_add(modified_ebi_listList, modified_ebi_listItem); @@ -785,6 +784,10 @@ n1_sm_info_to_ue = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "n1SmInfoToUe"); if (n1_sm_info_to_ue) { n1_sm_info_to_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_to_ue); + if (!n1_sm_info_to_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_to_ue"); + goto end; + } } always_on_granted = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "alwaysOnGranted"); @@ -872,6 +875,10 @@ additional_cn_tunnel_info = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "additionalCnTunnelInfo"); if (additional_cn_tunnel_info) { additional_cn_tunnel_info_local_nonprim = OpenAPI_tunnel_info_parseFromJSON(additional_cn_tunnel_info); + if (!additional_cn_tunnel_info_local_nonprim) { + ogs_error("OpenAPI_tunnel_info_parseFromJSON failed additional_cn_tunnel_info"); + goto end; + } } dnai_list = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "dnaiList"); @@ -898,21 +905,37 @@ n4_info = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } n4_info_ext3 = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "n4InfoExt3"); if (n4_info_ext3) { n4_info_ext3_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext3); + if (!n4_info_ext3_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext3"); + goto end; + } } small_data_rate_control_enabled = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "smallDataRateControlEnabled"); @@ -926,11 +949,19 @@ qos_monitoring_info = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "qosMonitoringInfo"); if (qos_monitoring_info) { qos_monitoring_info_local_nonprim = OpenAPI_qos_monitoring_info_parseFromJSON(qos_monitoring_info); + if (!qos_monitoring_info_local_nonprim) { + ogs_error("OpenAPI_qos_monitoring_info_parseFromJSON failed qos_monitoring_info"); + goto end; + } } eps_pdn_cnx_info = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "epsPdnCnxInfo"); if (eps_pdn_cnx_info) { eps_pdn_cnx_info_local_nonprim = OpenAPI_eps_pdn_cnx_info_parseFromJSON(eps_pdn_cnx_info); + if (!eps_pdn_cnx_info_local_nonprim) { + ogs_error("OpenAPI_eps_pdn_cnx_info_parseFromJSON failed eps_pdn_cnx_info"); + goto end; + } } n9_data_forwarding_ind = cJSON_GetObjectItemCaseSensitive(vsmf_update_dataJSON, "n9DataForwardingInd");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/vsmf_update_error.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/vsmf_update_error.c
Changed
@@ -298,6 +298,10 @@ goto end; } error_local_nonprim = OpenAPI_ext_problem_details_parseFromJSON(error); + if (!error_local_nonprim) { + ogs_error("OpenAPI_ext_problem_details_parseFromJSON failed error"); + goto end; + } pti = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "pti"); if (pti) { @@ -318,11 +322,19 @@ n1_sm_info_from_ue = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "n1SmInfoFromUe"); if (n1_sm_info_from_ue) { n1_sm_info_from_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_from_ue); + if (!n1_sm_info_from_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_from_ue"); + goto end; + } } unknown_n1_sm_info = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "unknownN1SmInfo"); if (unknown_n1_sm_info) { unknown_n1_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(unknown_n1_sm_info); + if (!unknown_n1_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed unknown_n1_sm_info"); + goto end; + } } failed_to_assign_ebi_list = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "failedToAssignEbiList"); @@ -343,7 +355,6 @@ OpenAPI_arp_t *failed_to_assign_ebi_listItem = OpenAPI_arp_parseFromJSON(failed_to_assign_ebi_list_local); if (!failed_to_assign_ebi_listItem) { ogs_error("No failed_to_assign_ebi_listItem"); - OpenAPI_list_free(failed_to_assign_ebi_listList); goto end; } OpenAPI_list_add(failed_to_assign_ebi_listList, failed_to_assign_ebi_listItem); @@ -353,6 +364,10 @@ ng_ap_cause = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "ngApCause"); if (ng_ap_cause) { ng_ap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ng_ap_cause); + if (!ng_ap_cause_local_nonprim) { + ogs_error("OpenAPI_ng_ap_cause_parseFromJSON failed ng_ap_cause"); + goto end; + } } _5g_mm_cause_value = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "5gMmCauseValue"); @@ -374,21 +389,37 @@ n4_info = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } n4_info_ext3 = cJSON_GetObjectItemCaseSensitive(vsmf_update_errorJSON, "n4InfoExt3"); if (n4_info_ext3) { n4_info_ext3_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext3); + if (!n4_info_ext3_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext3"); + goto end; + } } vsmf_update_error_local_var = OpenAPI_vsmf_update_error_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/vsmf_updated_data.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/vsmf_updated_data.c
Changed
@@ -484,7 +484,6 @@ OpenAPI_qos_flow_item_t *qos_flows_add_mod_listItem = OpenAPI_qos_flow_item_parseFromJSON(qos_flows_add_mod_list_local); if (!qos_flows_add_mod_listItem) { ogs_error("No qos_flows_add_mod_listItem"); - OpenAPI_list_free(qos_flows_add_mod_listList); goto end; } OpenAPI_list_add(qos_flows_add_mod_listList, qos_flows_add_mod_listItem); @@ -509,7 +508,6 @@ OpenAPI_qos_flow_item_t *qos_flows_rel_listItem = OpenAPI_qos_flow_item_parseFromJSON(qos_flows_rel_list_local); if (!qos_flows_rel_listItem) { ogs_error("No qos_flows_rel_listItem"); - OpenAPI_list_free(qos_flows_rel_listList); goto end; } OpenAPI_list_add(qos_flows_rel_listList, qos_flows_rel_listItem); @@ -534,7 +532,6 @@ OpenAPI_qos_flow_item_t *qos_flows_failedto_add_mod_listItem = OpenAPI_qos_flow_item_parseFromJSON(qos_flows_failedto_add_mod_list_local); if (!qos_flows_failedto_add_mod_listItem) { ogs_error("No qos_flows_failedto_add_mod_listItem"); - OpenAPI_list_free(qos_flows_failedto_add_mod_listList); goto end; } OpenAPI_list_add(qos_flows_failedto_add_mod_listList, qos_flows_failedto_add_mod_listItem); @@ -559,7 +556,6 @@ OpenAPI_qos_flow_item_t *qos_flows_failedto_rel_listItem = OpenAPI_qos_flow_item_parseFromJSON(qos_flows_failedto_rel_list_local); if (!qos_flows_failedto_rel_listItem) { ogs_error("No qos_flows_failedto_rel_listItem"); - OpenAPI_list_free(qos_flows_failedto_rel_listList); goto end; } OpenAPI_list_add(qos_flows_failedto_rel_listList, qos_flows_failedto_rel_listItem); @@ -569,16 +565,28 @@ n1_sm_info_from_ue = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "n1SmInfoFromUe"); if (n1_sm_info_from_ue) { n1_sm_info_from_ue_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(n1_sm_info_from_ue); + if (!n1_sm_info_from_ue_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed n1_sm_info_from_ue"); + goto end; + } } unknown_n1_sm_info = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "unknownN1SmInfo"); if (unknown_n1_sm_info) { unknown_n1_sm_info_local_nonprim = OpenAPI_ref_to_binary_data_parseFromJSON(unknown_n1_sm_info); + if (!unknown_n1_sm_info_local_nonprim) { + ogs_error("OpenAPI_ref_to_binary_data_parseFromJSON failed unknown_n1_sm_info"); + goto end; + } } ue_location = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "ueLocation"); if (ue_location) { ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(ue_location); + if (!ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed ue_location"); + goto end; + } } ue_time_zone = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "ueTimeZone"); @@ -592,6 +600,10 @@ add_ue_location = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "addUeLocation"); if (add_ue_location) { add_ue_location_local_nonprim = OpenAPI_user_location_parseFromJSON(add_ue_location); + if (!add_ue_location_local_nonprim) { + ogs_error("OpenAPI_user_location_parseFromJSON failed add_ue_location"); + goto end; + } } assigned_ebi_list = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "assignedEbiList"); @@ -612,7 +624,6 @@ OpenAPI_ebi_arp_mapping_t *assigned_ebi_listItem = OpenAPI_ebi_arp_mapping_parseFromJSON(assigned_ebi_list_local); if (!assigned_ebi_listItem) { ogs_error("No assigned_ebi_listItem"); - OpenAPI_list_free(assigned_ebi_listList); goto end; } OpenAPI_list_add(assigned_ebi_listList, assigned_ebi_listItem); @@ -637,7 +648,6 @@ OpenAPI_arp_t *failed_to_assign_ebi_listItem = OpenAPI_arp_parseFromJSON(failed_to_assign_ebi_list_local); if (!failed_to_assign_ebi_listItem) { ogs_error("No failed_to_assign_ebi_listItem"); - OpenAPI_list_free(failed_to_assign_ebi_listList); goto end; } OpenAPI_list_add(failed_to_assign_ebi_listList, failed_to_assign_ebi_listItem); @@ -689,7 +699,6 @@ OpenAPI_secondary_rat_usage_report_t *secondary_rat_usage_reportItem = OpenAPI_secondary_rat_usage_report_parseFromJSON(secondary_rat_usage_report_local); if (!secondary_rat_usage_reportItem) { ogs_error("No secondary_rat_usage_reportItem"); - OpenAPI_list_free(secondary_rat_usage_reportList); goto end; } OpenAPI_list_add(secondary_rat_usage_reportList, secondary_rat_usage_reportItem); @@ -714,7 +723,6 @@ OpenAPI_secondary_rat_usage_info_t *secondary_rat_usage_infoItem = OpenAPI_secondary_rat_usage_info_parseFromJSON(secondary_rat_usage_info_local); if (!secondary_rat_usage_infoItem) { ogs_error("No secondary_rat_usage_infoItem"); - OpenAPI_list_free(secondary_rat_usage_infoList); goto end; } OpenAPI_list_add(secondary_rat_usage_infoList, secondary_rat_usage_infoItem); @@ -724,21 +732,37 @@ n4_info = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "n4Info"); if (n4_info) { n4_info_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info); + if (!n4_info_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info"); + goto end; + } } n4_info_ext1 = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "n4InfoExt1"); if (n4_info_ext1) { n4_info_ext1_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext1); + if (!n4_info_ext1_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext1"); + goto end; + } } n4_info_ext2 = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "n4InfoExt2"); if (n4_info_ext2) { n4_info_ext2_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext2); + if (!n4_info_ext2_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext2"); + goto end; + } } n4_info_ext3 = cJSON_GetObjectItemCaseSensitive(vsmf_updated_dataJSON, "n4InfoExt3"); if (n4_info_ext3) { n4_info_ext3_local_nonprim = OpenAPI_n4_information_parseFromJSON(n4_info_ext3); + if (!n4_info_ext3_local_nonprim) { + ogs_error("OpenAPI_n4_information_parseFromJSON failed n4_info_ext3"); + goto end; + } } vsmf_updated_data_local_var = OpenAPI_vsmf_updated_data_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/wireline_service_area_restriction.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/wireline_service_area_restriction.c
Changed
@@ -108,7 +108,6 @@ OpenAPI_wireline_area_t *areasItem = OpenAPI_wireline_area_parseFromJSON(areas_local); if (!areasItem) { ogs_error("No areasItem"); - OpenAPI_list_free(areasList); goto end; } OpenAPI_list_add(areasList, areasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/wireline_service_area_restriction_1.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/wireline_service_area_restriction_1.c
Changed
@@ -108,7 +108,6 @@ OpenAPI_wireline_area_1_t *areasItem = OpenAPI_wireline_area_1_parseFromJSON(areas_local); if (!areasItem) { ogs_error("No areasItem"); - OpenAPI_list_free(areasList); goto end; } OpenAPI_list_add(areasList, areasItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/wlan_per_ss_id_performance_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/wlan_per_ss_id_performance_info.c
Changed
@@ -119,7 +119,6 @@ OpenAPI_wlan_per_ts_performance_info_t *wlan_per_ts_infosItem = OpenAPI_wlan_per_ts_performance_info_parseFromJSON(wlan_per_ts_infos_local); if (!wlan_per_ts_infosItem) { ogs_error("No wlan_per_ts_infosItem"); - OpenAPI_list_free(wlan_per_ts_infosList); goto end; } OpenAPI_list_add(wlan_per_ts_infosList, wlan_per_ts_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/wlan_per_ts_performance_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/wlan_per_ts_performance_info.c
Changed
@@ -175,6 +175,10 @@ traffic_info = cJSON_GetObjectItemCaseSensitive(wlan_per_ts_performance_infoJSON, "trafficInfo"); if (traffic_info) { traffic_info_local_nonprim = OpenAPI_traffic_information_parseFromJSON(traffic_info); + if (!traffic_info_local_nonprim) { + ogs_error("OpenAPI_traffic_information_parseFromJSON failed traffic_info"); + goto end; + } } number_of_ues = cJSON_GetObjectItemCaseSensitive(wlan_per_ts_performance_infoJSON, "numberOfUes");
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/wlan_performance_info.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/wlan_performance_info.c
Changed
@@ -96,6 +96,10 @@ network_area = cJSON_GetObjectItemCaseSensitive(wlan_performance_infoJSON, "networkArea"); if (network_area) { network_area_local_nonprim = OpenAPI_network_area_info_parseFromJSON(network_area); + if (!network_area_local_nonprim) { + ogs_error("OpenAPI_network_area_info_parseFromJSON failed network_area"); + goto end; + } } wlan_per_ssid_infos = cJSON_GetObjectItemCaseSensitive(wlan_performance_infoJSON, "wlanPerSsidInfos"); @@ -119,7 +123,6 @@ OpenAPI_wlan_per_ss_id_performance_info_t *wlan_per_ssid_infosItem = OpenAPI_wlan_per_ss_id_performance_info_parseFromJSON(wlan_per_ssid_infos_local); if (!wlan_per_ssid_infosItem) { ogs_error("No wlan_per_ssid_infosItem"); - OpenAPI_list_free(wlan_per_ssid_infosList); goto end; } OpenAPI_list_add(wlan_per_ssid_infosList, wlan_per_ssid_infosItem);
View file
open5gs_2.6.1.tar.xz/lib/sbi/openapi/model/wlan_performance_req.c -> open5gs_2.6.2.tar.xz/lib/sbi/openapi/model/wlan_performance_req.c
Changed
@@ -180,11 +180,19 @@ wlan_order_criter = cJSON_GetObjectItemCaseSensitive(wlan_performance_reqJSON, "wlanOrderCriter"); if (wlan_order_criter) { wlan_order_criter_local_nonprim = OpenAPI_wlan_ordering_criterion_parseFromJSON(wlan_order_criter); + if (!wlan_order_criter_local_nonprim) { + ogs_error("OpenAPI_wlan_ordering_criterion_parseFromJSON failed wlan_order_criter"); + goto end; + } } order = cJSON_GetObjectItemCaseSensitive(wlan_performance_reqJSON, "order"); if (order) { order_local_nonprim = OpenAPI_matching_direction_parseFromJSON(order); + if (!order_local_nonprim) { + ogs_error("OpenAPI_matching_direction_parseFromJSON failed order"); + goto end; + } } wlan_performance_req_local_var = OpenAPI_wlan_performance_req_create (
View file
open5gs_2.6.1.tar.xz/lib/sbi/support/r17-20230301-openapitools-6.4.0/openapi-generator/templates/model-body.mustache -> open5gs_2.6.2.tar.xz/lib/sbi/support/r17-20230301-openapitools-6.4.0/openapi-generator/templates/model-body.mustache
Changed
@@ -706,6 +706,10 @@ {{^isEnum}} {{#isModel}} {{{name}}}_local_nonprim = OpenAPI_{{complexType}}{{#isFreeFormObject}}object{{/isFreeFormObject}}_parseFromJSON({{{name}}}); + if (!{{{name}}}_local_nonprim) { + ogs_error("OpenAPI_{{complexType}}{{#isFreeFormObject}}object{{/isFreeFormObject}}_parseFromJSON failed {{{name}}}"); + goto end; + } {{/isModel}} {{^isModel}} {{#isUuid}} @@ -808,7 +812,6 @@ OpenAPI_{{complexType}}_t *{{{name}}}Item = OpenAPI_{{complexType}}_parseFromJSON({{{name}}}_local); if (!{{{name}}}Item) { ogs_error("No {{{name}}}Item"); - OpenAPI_list_free({{{name}}}List); goto end; } OpenAPI_list_add({{{name}}}List, {{{name}}}Item);
View file
open5gs_2.6.1.tar.xz/lib/sbi/timer.c -> open5gs_2.6.2.tar.xz/lib/sbi/timer.c
Changed
@@ -31,6 +31,7 @@ case OGS_TIMER_NF_INSTANCE_NO_HEARTBEAT: case OGS_TIMER_NF_INSTANCE_VALIDITY: case OGS_TIMER_SUBSCRIPTION_VALIDITY: + case OGS_TIMER_SUBSCRIPTION_PATCH: case OGS_TIMER_SBI_CLIENT_WAIT: e = ogs_event_new(OGS_EVENT_SBI_TIMER); ogs_assert(e); @@ -76,6 +77,11 @@ timer_send_event(OGS_TIMER_SUBSCRIPTION_VALIDITY, data); } +void ogs_timer_subscription_patch(void *data) +{ + timer_send_event(OGS_TIMER_SUBSCRIPTION_PATCH, data); +} + void ogs_timer_sbi_client_wait_expire(void *data) { timer_send_event(OGS_TIMER_SBI_CLIENT_WAIT, data);
View file
open5gs_2.6.1.tar.xz/lib/sbi/timer.h -> open5gs_2.6.2.tar.xz/lib/sbi/timer.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -33,6 +33,7 @@ void ogs_timer_nf_instance_no_heartbeat(void *data); void ogs_timer_nf_instance_validity(void *data); void ogs_timer_subscription_validity(void *data); +void ogs_timer_subscription_patch(void *data); void ogs_timer_sbi_client_wait_expire(void *data); #ifdef __cplusplus
View file
open5gs_2.6.1.tar.xz/lib/sctp/ogs-usrsctp.c -> open5gs_2.6.2.tar.xz/lib/sctp/ogs-usrsctp.c
Changed
@@ -33,7 +33,7 @@ usrsctp_sysctl_set_sctp_enable_sack_immediately(1); } -void ogs_sctp_final() +void ogs_sctp_final(void) { while (usrsctp_finish() != 0) { ogs_warn("try to finsih SCTP");
View file
open5gs_2.6.1.tar.xz/meson.build -> open5gs_2.6.2.tar.xz/meson.build
Changed
@@ -16,7 +16,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. project('open5gs', 'c', 'cpp', - version : '2.6.1', + version : '2.6.2', license : 'AGPL-3.0-or-later', meson_version : '>= 0.43.0', default_options : @@ -25,7 +25,7 @@ , ) -libogslib_version = '2.6.1' +libogslib_version = '2.6.2' prefix = get_option('prefix') bindir = join_paths(prefix, get_option('bindir'))
View file
open5gs_2.6.1.tar.xz/misc/db/open5gs-dbctl -> open5gs_2.6.2.tar.xz/misc/db/open5gs-dbctl
Changed
@@ -1,6 +1,6 @@ #!/bin/bash -version=0.10.1 +version=0.10.2 display_help() { echo "open5gs-dbctl: Open5GS Database Configuration Tool ($version)" @@ -58,58 +58,69 @@ KI=$3 OPC=$4 - mongo --eval "db.subscribers.update( { \"imsi\" : \"$IMSI\" }, - { \$setOnInsert: - { - \"imsi\" : \"$IMSI\", - \"subscribed_rau_tau_timer\" : NumberInt(12), - \"network_access_mode\" : NumberInt(0), - \"subscriber_status\" : NumberInt(0), - \"access_restriction_data\" : NumberInt(32), - \"slice\" : - { - \"sst\" : NumberInt(1), - \"default_indicator\" : true, - \"_id\" : new ObjectId(), - \"session\" : - { - \"name\" : \"internet\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - }, - }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3),}, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"security\" : - { - \"k\" : \"$KI\", - \"amf\" : \"8000\", - \"op\" : null, - \"opc\" : \"$OPC\" - }, - \"__v\" : 0 - }, - }, - upsert=true);" $DB_URI + mongosh --eval "db.subscribers.insertOne( + { + \"_id\": new ObjectId(), + \"schema_version\": NumberInt(1), + \"imsi\": \"$IMSI\", + \"msisdn\": , + \"imeisv\": , + \"mme_host\": , + \"mm_realm\": , + \"purge_flag\": , + \"slice\": + { + \"sst\": NumberInt(1), + \"default_indicator\": true, + \"session\": + { + \"name\" : \"internet\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + }, + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + }, + \"_id\": new ObjectId(), + }, + \"security\": + { + \"k\" : \"$KI\", + \"op\" : null, + \"opc\" : \"$OPC\", + \"amf\" : \"8000\", + }, + \"ambr\" : + { + \"downlink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)}, + \"uplink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)} + }, + \"access_restriction_data\": 32, + \"network_access_mode\": 0, + \"subscribed_rau_tau_timer\": 12, + \"__v\": 0 + } + );" $DB_URI exit $? fi @@ -119,62 +130,73 @@ KI=$4 OPC=$5 - mongo --eval "db.subscribers.update( { \"imsi\" : \"$IMSI\" }, - { \$setOnInsert: - { - \"imsi\" : \"$IMSI\", - \"subscribed_rau_tau_timer\" : NumberInt(12), - \"network_access_mode\" : NumberInt(0), - \"subscriber_status\" : NumberInt(0), - \"access_restriction_data\" : NumberInt(32), - \"slice\" : - { - \"sst\" : NumberInt(1), - \"default_indicator\" : true, - \"_id\" : new ObjectId(), - \"session\" : - { - \"name\" : \"internet\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ue\" : + mongosh --eval "db.subscribers.insertOne( + { + \"_id\": new ObjectId(), + \"schema_version\": NumberInt(1), + \"imsi\": \"$IMSI\", + \"msisdn\": , + \"imeisv\": , + \"mme_host\": , + \"mm_realm\": , + \"purge_flag\": , + \"slice\": + { + \"sst\": NumberInt(1), + \"default_indicator\": true, + \"session\": + { + \"name\" : \"internet\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": { - \"addr\" : \"$IP\", + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - }, - }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3),}, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"security\" : - { - \"k\" : \"$KI\", - \"amf\" : \"8000\", - \"op\" : null, - \"opc\" : \"$OPC\" - }, - \"__v\" : 0 - }, - }, - upsert=true);" $DB_URI + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"ue\": + { + \"addr\": \"$IP\" + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + }, + \"_id\": new ObjectId(), + }, + \"security\": + { + \"k\" : \"$KI\", + \"op\" : null, + \"opc\" : \"$OPC\", + \"amf\" : \"8000\", + }, + \"ambr\" : + { + \"downlink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)}, + \"uplink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)} + }, + \"access_restriction_data\": 32, + \"network_access_mode\": 0, + \"subscribed_rau_tau_timer\": 12, + \"__v\": 0 + } + );" $DB_URI exit $? fi @@ -188,98 +210,124 @@ KI=$3 OPC=$4 - mongo --eval "db.subscribers.update( { \"imsi\" : \"$IMSI\" }, - { \$setOnInsert: - { - \"imsi\" : \"$IMSI\", - \"subscribed_rau_tau_timer\" : NumberInt(12), - \"network_access_mode\" : NumberInt(0), - \"subscriber_status\" : NumberInt(0), - \"access_restriction_data\" : NumberInt(32), - \"slice\" : - { - \"sst\" : NumberInt(1), - \"default_indicator\" : true, - \"_id\" : new ObjectId(), - \"session\" : - { - \"name\" : \"internet\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - },{ - \"name\" : \"internet1\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - },{ - \"name\" : \"internet2\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - }, - }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3),}, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"security\" : - { - \"k\" : \"$KI\", - \"amf\" : \"8000\", - \"op\" : null, - \"opc\" : \"$OPC\" - }, - \"__v\" : 0 - }, - }, - upsert=true);" $DB_URI + mongosh --eval "db.subscribers.insertOne( + { + \"_id\": new ObjectId(), + \"schema_version\": NumberInt(1), + \"imsi\": \"$IMSI\", + \"msisdn\": , + \"imeisv\": , + \"mme_host\": , + \"mm_realm\": , + \"purge_flag\": , + \"slice\": + { + \"sst\": NumberInt(1), + \"default_indicator\": true, + \"session\": + { + \"name\" : \"internet\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + }, + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + },{ + \"name\" : \"internet1\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + }, + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + },{ + \"name\" : \"internet2\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + }, + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + } + , + \"_id\": new ObjectId(), + }, + \"security\": + { + \"k\" : \"$KI\", + \"op\" : null, + \"opc\" : \"$OPC\", + \"amf\" : \"8000\", + }, + \"ambr\" : + { + \"downlink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)}, + \"uplink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)} + }, + \"access_restriction_data\": 32, + \"network_access_mode\": 0, + \"subscribed_rau_tau_timer\": 12, + \"__v\": 0 + } + );" $DB_URI exit $? fi @@ -289,110 +337,136 @@ KI=$4 OPC=$5 - mongo --eval "db.subscribers.update( { \"imsi\" : \"$IMSI\" }, - { \$setOnInsert: - { - \"imsi\" : \"$IMSI\", - \"subscribed_rau_tau_timer\" : NumberInt(12), - \"network_access_mode\" : NumberInt(0), - \"subscriber_status\" : NumberInt(0), - \"access_restriction_data\" : NumberInt(32), - \"slice\" : - { - \"sst\" : NumberInt(1), - \"default_indicator\" : true, - \"_id\" : new ObjectId(), - \"session\" : - { - \"name\" : \"internet\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ue\" : + mongosh --eval "db.subscribers.insertOne( + { + \"_id\": new ObjectId(), + \"schema_version\": NumberInt(1), + \"imsi\": \"$IMSI\", + \"msisdn\": , + \"imeisv\": , + \"mme_host\": , + \"mm_realm\": , + \"purge_flag\": , + \"slice\": + { + \"sst\": NumberInt(1), + \"default_indicator\": true, + \"session\": + { + \"name\" : \"internet\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": { - \"addr\" : \"$IP\", + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - },{ - \"name\" : \"internet1\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ue\" : + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"ue\": + { + \"addr\": \"$IP\" + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + },{ + \"name\" : \"internet1\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": { - \"addr\" : \"$IP\", + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - },{ - \"name\" : \"internet2\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ue\" : + \"uplink\": { - \"addr\" : \"$IP\", + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"ue\": + { + \"addr\": \"$IP\" + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + },{ + \"name\" : \"internet2\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - }, - }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3),}, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"security\" : - { - \"k\" : \"$KI\", - \"amf\" : \"8000\", - \"op\" : null, - \"opc\" : \"$OPC\" - }, - \"__v\" : 0 - }, - }, - upsert=true);" $DB_URI + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"ue\": + { + \"addr\": \"$IP\" + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + } + , + \"_id\": new ObjectId(), + }, + \"security\": + { + \"k\" : \"$KI\", + \"op\" : null, + \"opc\" : \"$OPC\", + \"amf\" : \"8000\", + }, + \"ambr\" : + { + \"downlink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)}, + \"uplink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)} + }, + \"access_restriction_data\": 32, + \"network_access_mode\": 0, + \"subscribed_rau_tau_timer\": 12, + \"__v\": 0 + } + );" $DB_URI exit $? fi @@ -407,7 +481,7 @@ fi IMSI=$2 - mongo --eval "db.subscribers.remove({\"imsi\": \"$IMSI\"});" $DB_URI + mongosh --eval "db.subscribers.deleteOne({\"imsi\": \"$IMSI\"});" $DB_URI exit $? fi @@ -417,7 +491,7 @@ exit 1 fi - mongo --eval "db.subscribers.remove({});" $DB_URI + mongosh --eval "db.subscribers.deleteMany({});" $DB_URI exit $? fi @@ -429,7 +503,7 @@ IMSI=$2 IP=$3 - mongo --eval "db.subscribers.update({\"imsi\": \"$IMSI\"},{\$set: { \"slice.0.session.0.ue.addr\": \"$IP\" }});" $DB_URI + mongosh --eval "db.subscribers.updateOne({\"imsi\": \"$IMSI\"},{\$set: { \"slice.0.session.0.ue.addr\": \"$IP\" }});" $DB_URI exit $? fi @@ -441,7 +515,7 @@ IMSI=$2 IP=$3 - mongo --eval "db.subscribers.update({\"imsi\": \"$IMSI\"},{\$set: { \"slice.0.session.0.ue.addr6\": \"$IP\" }});" $DB_URI + mongosh --eval "db.subscribers.updateOne({\"imsi\": \"$IMSI\"},{\$set: { \"slice.0.session.0.ue.addr6\": \"$IP\" }});" $DB_URI exit $? fi @@ -453,7 +527,7 @@ IMSI=$2 TYPE=$3 - mongo --eval "db.subscribers.update({\"imsi\": \"$IMSI\"},{\$set: { \"slice.0.session.0.type\": NumberInt($TYPE) }});" $DB_URI + mongosh --eval "db.subscribers.updateOne({\"imsi\": \"$IMSI\"},{\$set: { \"slice.0.session.0.type\": NumberInt($TYPE) }});" $DB_URI exit $? fi @@ -464,58 +538,69 @@ OPC=$4 APN=$5 - mongo --eval "db.subscribers.update( { \"imsi\" : \"$IMSI\" }, - { \$setOnInsert: - { - \"imsi\" : \"$IMSI\", - \"subscribed_rau_tau_timer\" : NumberInt(12), - \"network_access_mode\" : NumberInt(0), - \"subscriber_status\" : NumberInt(0), - \"access_restriction_data\" : NumberInt(32), - \"slice\" : - { - \"sst\" : NumberInt(1), - \"default_indicator\" : true, - \"_id\" : new ObjectId(), - \"session\" : - { - \"name\" : \"$APN\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - }, - }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3),}, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"security\" : - { - \"k\" : \"$KI\", - \"amf\" : \"8000\", - \"op\" : null, - \"opc\" : \"$OPC\" - }, - \"__v\" : 0 - }, - }, - upsert=true);" $DB_URI + mongosh --eval "db.subscribers.insertOne( + { + \"_id\": new ObjectId(), + \"schema_version\": NumberInt(1), + \"imsi\": \"$IMSI\", + \"msisdn\": , + \"imeisv\": , + \"mme_host\": , + \"mm_realm\": , + \"purge_flag\": , + \"slice\": + { + \"sst\": NumberInt(1), + \"default_indicator\": true, + \"session\": + { + \"name\" : \"$APN\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + }, + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + }, + \"_id\": new ObjectId(), + }, + \"security\": + { + \"k\" : \"$KI\", + \"op\" : null, + \"opc\" : \"$OPC\", + \"amf\" : \"8000\", + }, + \"ambr\" : + { + \"downlink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)}, + \"uplink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)} + }, + \"access_restriction_data\": 32, + \"network_access_mode\": 0, + \"subscribed_rau_tau_timer\": 12, + \"__v\": 0 + } + );" $DB_URI exit $? fi @@ -532,59 +617,70 @@ SST=$6 SD=$7 - mongo --eval "db.subscribers.update( { \"imsi\" : \"$IMSI\" }, - { \$setOnInsert: - { - \"imsi\" : \"$IMSI\", - \"subscribed_rau_tau_timer\" : NumberInt(12), - \"network_access_mode\" : NumberInt(0), - \"subscriber_status\" : NumberInt(0), - \"access_restriction_data\" : NumberInt(32), - \"slice\" : - { - \"sst\" : NumberInt($SST), - \"sd\" : \"$SD\", - \"default_indicator\" : true, - \"_id\" : new ObjectId(), - \"session\" : - { - \"name\" : \"$APN\", - \"type\" : NumberInt(3), - \"_id\" : new ObjectId(), - \"pcc_rule\" : , - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"qos\" : - { - \"index\" : NumberInt(9), - \"arp\" : - { - \"priority_level\" : NumberInt(8), - \"pre_emption_capability\" : NumberInt(1), - \"pre_emption_vulnerability\" : NumberInt(1), - }, - }, - }, - }, - \"ambr\" : - { - \"uplink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3),}, - \"downlink\" : { \"value\": NumberInt(1), \"unit\" : NumberInt(3) }, - }, - \"security\" : - { - \"k\" : \"$KI\", - \"amf\" : \"8000\", - \"op\" : null, - \"opc\" : \"$OPC\" - }, - \"__v\" : 0 - }, - }, - upsert=true);" $DB_URI + mongosh --eval "db.subscribers.insertOne( + { + \"_id\": new ObjectId(), + \"schema_version\": NumberInt(1), + \"imsi\": \"$IMSI\", + \"msisdn\": , + \"imeisv\": , + \"mme_host\": , + \"mm_realm\": , + \"purge_flag\": , + \"slice\": + { + \"sst\": NumberInt($SST), + \"sd\": \"$SD\", + \"default_indicator\": true, + \"session\": + { + \"name\" : \"$APN\", + \"type\" : NumberInt(3), + \"qos\" : + { \"index\": NumberInt(9), + \"arp\": + { + \"priority_level\" : NumberInt(8), + \"pre_emption_capability\": NumberInt(1), + \"pre_emption_vulnerability\": NumberInt(2) + } + }, + \"ambr\": + { + \"downlink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + }, + \"uplink\": + { + \"value\": NumberInt(1000000000), + \"unit\": NumberInt(0) + } + }, + \"pcc_rule\": , + \"_id\": new ObjectId(), + }, + \"_id\": new ObjectId(), + }, + \"security\": + { + \"k\" : \"$KI\", + \"op\" : null, + \"opc\" : \"$OPC\", + \"amf\" : \"8000\", + }, + \"ambr\" : + { + \"downlink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)}, + \"uplink\" : { \"value\": NumberInt(1000000000), \"unit\": NumberInt(0)} + }, + \"access_restriction_data\": 32, + \"network_access_mode\": 0, + \"subscribed_rau_tau_timer\": 12, + \"__v\": 0 + } + );" $DB_URI exit $? fi @@ -598,7 +694,7 @@ APN=$3 SLICE_NUM=$4 - mongo --eval "db.subscribers.updateOne({ \"imsi\": \"$IMSI\"}, + mongosh --eval "db.subscribers.updateOne({ \"imsi\": \"$IMSI\"}, {\$push: { \"slice.$SLICE_NUM.session\": { \"name\" : \"$APN\", @@ -637,7 +733,7 @@ SST=$4 SD=$5 - mongo --eval "db.subscribers.updateOne({ \"imsi\": \"$IMSI\"}, + mongosh --eval "db.subscribers.updateOne({ \"imsi\": \"$IMSI\"}, {\$push: { \"slice\": { @@ -668,7 +764,6 @@ }, } } - } });" $DB_URI exit $? @@ -678,15 +773,15 @@ exit 1 fi if "$1" = "showall" ; then - mongo --eval "db.subscribers.find()" $DB_URI + mongosh --eval "db.subscribers.find()" $DB_URI exit $? fi if "$1" = "showpretty" ; then - mongo --eval "db.subscribers.find().pretty()" $DB_URI + mongosh --eval "db.subscribers.find().pretty()" $DB_URI exit $? fi if "$1" = "showfiltered" ; then - mongo --eval "db.subscribers.find({},{'_id':0,'imsi':1,'security.k':1, 'security.opc':1,'slice.session.name':1,'slice.session.ue.addr':1})" $DB_URI + mongosh --eval "db.subscribers.find({},{'_id':0,'imsi':1,'security.k':1, 'security.opc':1,'slice.session.name':1,'slice.session.ue.addr':1})" $DB_URI exit $? fi
View file
open5gs_2.6.1.tar.xz/src/amf/amf-sm.c -> open5gs_2.6.2.tar.xz/src/amf/amf-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -299,8 +299,22 @@ ogs_nnrf_nfm_handle_nf_status_subscribe( subscription_data, &sbi_message); } else { + ogs_error("HTTP response error : %d", + sbi_message.res_status); + } + break; + + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (sbi_message.res_status == OGS_SBI_HTTP_STATUS_OK || + sbi_message.res_status == + OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &sbi_message); + } else { ogs_error("%s HTTP response error %d", - subscription_data->id, sbi_message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + sbi_message.res_status); } break; @@ -310,7 +324,9 @@ ogs_sbi_subscription_data_remove(subscription_data); } else { ogs_error("%s HTTP response error %d", - subscription_data->id, sbi_message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + sbi_message.res_status); } break; @@ -591,11 +607,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/amf/context.c -> open5gs_2.6.2.tar.xz/src/amf/context.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -433,22 +433,24 @@ YAML_SEQUENCE_NODE); } else if (!strcmp(amf_key, "tai")) { int num_of_list0 = 0; + int num_of_list1 = 0; ogs_5gs_tai0_list_t *list0 = NULL; + ogs_5gs_tai1_list_t *list1 = NULL; ogs_5gs_tai2_list_t *list2 = NULL; ogs_assert(self.num_of_served_tai < OGS_MAX_NUM_OF_SERVED_TAI); list0 = &self.served_taiself.num_of_served_tai.list0; - ogs_assert(list0); + list1 = &self.served_taiself.num_of_served_tai.list1; list2 = &self.served_taiself.num_of_served_tai.list2; - ogs_assert(list2); ogs_yaml_iter_t tai_array, tai_iter; ogs_yaml_iter_recurse(&amf_iter, &tai_array); do { const char *mcc = NULL, *mnc = NULL; - ogs_uint24_t tacOGS_MAX_NUM_OF_TAI; int num_of_tac = 0; + ogs_uint24_t startOGS_MAX_NUM_OF_TAI; + ogs_uint24_t endOGS_MAX_NUM_OF_TAI; if (ogs_yaml_iter_type(&tai_array) == YAML_MAPPING_NODE) { @@ -489,23 +491,56 @@ ogs_yaml_iter_t tac_iter; ogs_yaml_iter_recurse(&tai_iter, &tac_iter); ogs_assert(ogs_yaml_iter_type(&tac_iter) != - YAML_MAPPING_NODE); - + YAML_MAPPING_NODE); do { - const char *v = NULL; + char *v = NULL; + char *low = NULL, *high = NULL; - ogs_assert(num_of_tac < - OGS_MAX_NUM_OF_TAI); if (ogs_yaml_iter_type(&tac_iter) == YAML_SEQUENCE_NODE) { if (!ogs_yaml_iter_next(&tac_iter)) break; } - v = ogs_yaml_iter_value(&tac_iter); + v = (char *)ogs_yaml_iter_value( + &tac_iter); if (v) { - tacnum_of_tac.v = atoi(v); - num_of_tac++; + low = strsep(&v, "-"); + if (low && strlen(low) == 0) + low = NULL; + + high = v; + if (high && strlen(high) == 0) + high = NULL; + + if (low) { + ogs_assert(num_of_tac < + OGS_MAX_NUM_OF_TAI); + startnum_of_tac.v = atoi(low); + if (high) { + endnum_of_tac.v = atoi(high); + if (endnum_of_tac.v < + startnum_of_tac.v) + ogs_error( + "Invalid TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else if ( + (endnum_of_tac.v- + startnum_of_tac.v+1) > + OGS_MAX_NUM_OF_TAI) + ogs_error( + "Overflow TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else + num_of_tac++; + } else { + endnum_of_tac.v = + startnum_of_tac.v; + num_of_tac++; + } + } } } while ( ogs_yaml_iter_type(&tac_iter) == @@ -515,31 +550,60 @@ } if (mcc && mnc && num_of_tac) { - if (num_of_tac == 1) { + if (num_of_tac == 1 && start0.v == end0.v) { + ogs_assert(list2->num < OGS_MAX_NUM_OF_TAI); + + list2->type = OGS_TAI2_TYPE; + ogs_plmn_id_build( &list2->tailist2->num.plmn_id, atoi(mcc), atoi(mnc), strlen(mnc)); - list2->tailist2->num.tac.v = tac0.v; + list2->tailist2->num.tac.v = start0.v; list2->num++; - if (list2->num > 1) - list2->type = OGS_TAI2_TYPE; - else - list2->type = OGS_TAI1_TYPE; - } else if (num_of_tac > 1) { - int i; - ogs_plmn_id_build( - &list0->tainum_of_list0.plmn_id, - atoi(mcc), atoi(mnc), strlen(mnc)); - for (i = 0; i < num_of_tac; i++) { - list0->tainum_of_list0.taci.v = - taci.v; - } - list0->tainum_of_list0.num = num_of_tac; - list0->tainum_of_list0.type = OGS_TAI0_TYPE; + } else { + int tac, count = 0; + for (tac = 0; tac < num_of_tac; tac++) { + ogs_assert(endtac.v >= starttac.v); + if (starttac.v == endtac.v) { + ogs_assert(num_of_list0 < + OGS_MAX_NUM_OF_TAI); + + list0->tainum_of_list0.type = + OGS_TAI0_TYPE; + + ogs_plmn_id_build( + &list0->tainum_of_list0.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list0->tainum_of_list0. + taccount.v = starttac.v; + + list0->tainum_of_list0.num = + ++count; + + } else if (starttac.v < endtac.v) { + ogs_assert(num_of_list1 < + OGS_MAX_NUM_OF_TAI); + + list1->tainum_of_list1.type = + OGS_TAI1_TYPE; + + ogs_plmn_id_build( + &list1->tainum_of_list1.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list1->tainum_of_list1.tac.v = + starttac.v; + + list1->tainum_of_list1.num = + endtac.v-starttac.v+1; - num_of_list0++; + num_of_list1++; + } + } + + if (count) + num_of_list0++; } } else { ogs_warn("Ignore tai : mcc(%p), mnc(%p), " @@ -548,7 +612,7 @@ } while (ogs_yaml_iter_type(&tai_array) == YAML_SEQUENCE_NODE); - if (list2->num || num_of_list0) { + if (list2->num || num_of_list1 || num_of_list0) { self.num_of_served_tai++; } } else if (!strcmp(amf_key, "plmn_support")) { @@ -691,6 +755,81 @@ } } while (ogs_yaml_iter_type(&plmn_support_array) == YAML_SEQUENCE_NODE); + } else if (!strcmp(amf_key, "access_control")) { + ogs_yaml_iter_t access_control_array, access_control_iter; + ogs_yaml_iter_recurse(&amf_iter, &access_control_array); + do { + ogs_assert(self.num_of_access_control < + OGS_MAX_NUM_OF_ACCESS_CONTROL); + + if (ogs_yaml_iter_type(&access_control_array) == + YAML_MAPPING_NODE) { + memcpy(&access_control_iter, &access_control_array, + sizeof(ogs_yaml_iter_t)); + } else if (ogs_yaml_iter_type(&access_control_array) == + YAML_SEQUENCE_NODE) { + if (!ogs_yaml_iter_next(&access_control_array)) + break; + ogs_yaml_iter_recurse(&access_control_array, + &access_control_iter); + } else if (ogs_yaml_iter_type(&access_control_array) == + YAML_SCALAR_NODE) { + break; + } else + ogs_assert_if_reached(); + + while (ogs_yaml_iter_next(&access_control_iter)) { + const char *mnc = NULL, *mcc = NULL; + int reject_cause = 0; + const char *access_control_key = + ogs_yaml_iter_key(&access_control_iter); + ogs_assert(access_control_key); + if (!strcmp(access_control_key, + "default_reject_cause")) { + const char *v = ogs_yaml_iter_value( + &access_control_iter); + if (v) self.default_reject_cause = atoi(v); + } else if (!strcmp(access_control_key, "plmn_id")) { + ogs_yaml_iter_t plmn_id_iter; + + ogs_yaml_iter_recurse(&access_control_iter, + &plmn_id_iter); + while (ogs_yaml_iter_next(&plmn_id_iter)) { + const char *plmn_id_key = + ogs_yaml_iter_key(&plmn_id_iter); + ogs_assert(plmn_id_key); + if (!strcmp(plmn_id_key, "reject_cause")) { + const char *v = ogs_yaml_iter_value( + &plmn_id_iter); + if (v) reject_cause = atoi(v); + } else if (!strcmp(plmn_id_key, "mcc")) { + mcc = ogs_yaml_iter_value( + &plmn_id_iter); + } else if (!strcmp(plmn_id_key, "mnc")) { + mnc = ogs_yaml_iter_value( + &plmn_id_iter); + } + } + + if (mcc && mnc) { + ogs_plmn_id_build( + &self.access_control + self.num_of_access_control. + plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + if (reject_cause) + self.access_control + self.num_of_access_control. + reject_cause = reject_cause; + self.num_of_access_control++; + } + } else + ogs_warn("unknown key `%s`", + access_control_key); + } + + } while (ogs_yaml_iter_type(&access_control_array) == + YAML_SEQUENCE_NODE); } else if (!strcmp(amf_key, "security")) { ogs_yaml_iter_t security_iter; ogs_yaml_iter_recurse(&amf_iter, &security_iter); @@ -783,7 +922,8 @@ } while ( ogs_yaml_iter_type(&ciphering_order_iter) == YAML_SEQUENCE_NODE); - } + } else + ogs_warn("unknown key `%s`", security_key); } } else if (!strcmp(amf_key, "network_name")) { ogs_yaml_iter_t network_name_iter; @@ -827,7 +967,8 @@ network_short_name->length = size*2+1; network_short_name->coding_scheme = 1; network_short_name->ext = 1; - } + } else + ogs_warn("unknown key `%s`", network_name_key); } } else if (!strcmp(amf_key, "amf_name")) { self.amf_name = ogs_yaml_iter_value(&amf_iter); @@ -1062,7 +1203,7 @@ ogs_list_count(&self.gnb_list)); } -void amf_gnb_remove_all() +void amf_gnb_remove_all(void) { amf_gnb_t *gnb = NULL, *next_gnb = NULL; @@ -1500,6 +1641,9 @@ ogs_timer_delete(amf_ue->implicit_deregistration.timer); /* Free SBI object memory */ + if (ogs_list_count(&amf_ue->sbi.xact_list)) + ogs_error("UE transaction %d", + ogs_list_count(&amf_ue->sbi.xact_list)); ogs_sbi_object_free(&amf_ue->sbi); amf_ue_deassociate(amf_ue); @@ -1510,7 +1654,7 @@ ogs_list_count(&self.amf_ue_list)); } -void amf_ue_remove_all() +void amf_ue_remove_all(void) { amf_ue_t *amf_ue = NULL, *next = NULL;; @@ -1938,6 +2082,9 @@ ogs_list_remove(&sess->amf_ue->sess_list, sess); /* Free SBI object memory */ + if (ogs_list_count(&sess->sbi.xact_list)) + ogs_error("Session transaction %d", + ogs_list_count(&sess->sbi.xact_list)); ogs_sbi_object_free(&sess->sbi); if (sess->sm_context_ref) @@ -2154,13 +2301,12 @@ for (i = 0; i < self.num_of_served_tai; i++) { ogs_5gs_tai0_list_t *list0 = &self.served_taii.list0; - ogs_assert(list0); + ogs_5gs_tai1_list_t *list1 = &self.served_taii.list1; ogs_5gs_tai2_list_t *list2 = &self.served_taii.list2; - ogs_assert(list2); for (j = 0; list0->taij.num; j++) { ogs_assert(list0->taij.type == OGS_TAI0_TYPE); - ogs_assert(list0->taij.num < OGS_MAX_NUM_OF_TAI); + ogs_assert(list0->taij.num <= OGS_MAX_NUM_OF_TAI); for (k = 0; k < list0->taij.num; k++) { if (memcmp(&list0->taij.plmn_id, @@ -2171,10 +2317,18 @@ } } + for (j = 0; list1->taij.num; j++) { + ogs_assert(list1->taij.type == OGS_TAI1_TYPE); + ogs_assert(list1->taij.num <= OGS_MAX_NUM_OF_TAI); + + if (list1->taij.tac.v <= nr_tai->tac.v && + nr_tai->tac.v < (list1->taij.tac.v+list1->taij.num)) + return i; + } + if (list2->num) { - ogs_assert(list2->type == OGS_TAI1_TYPE || - list2->type == OGS_TAI2_TYPE); - ogs_assert(list2->num < OGS_MAX_NUM_OF_TAI); + ogs_assert(list2->type == OGS_TAI2_TYPE); + ogs_assert(list2->num <= OGS_MAX_NUM_OF_TAI); for (j = 0; j < list2->num; j++) { if (memcmp(&list2->taij.plmn_id, @@ -2214,13 +2368,13 @@ return NULL; } -int amf_m_tmsi_pool_generate() +int amf_m_tmsi_pool_generate(void) { - int i, j; + int j; int index = 0; ogs_trace("M-TMSI Pool try to generate..."); - for (i = 0; index < ogs_app()->max.ue*2; i++) { + while (index < ogs_app()->max.ue*2) { amf_m_tmsi_t *m_tmsi = NULL; int conflict = 0; @@ -2252,7 +2406,7 @@ return OGS_OK; } -amf_m_tmsi_t *amf_m_tmsi_alloc() +amf_m_tmsi_t *amf_m_tmsi_alloc(void) { amf_m_tmsi_t *m_tmsi = NULL; @@ -2334,7 +2488,7 @@ ogs_info("Removed Number of gNB-UEs is now %d", num_of_ran_ue); } -int get_ran_ue_load() +int get_ran_ue_load(void) { return (((ogs_pool_size(&ran_ue_pool) - ogs_pool_avail(&ran_ue_pool)) * 100) /
View file
open5gs_2.6.1.tar.xz/src/amf/context.h -> open5gs_2.6.2.tar.xz/src/amf/context.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -47,37 +47,46 @@ typedef struct amf_context_s { /* Served GUAMI */ - uint8_t num_of_served_guami; + int num_of_served_guami; ogs_guami_t served_guamiOGS_MAX_NUM_OF_SERVED_GUAMI; /* Served TAI */ - uint8_t num_of_served_tai; + int num_of_served_tai; struct { ogs_5gs_tai0_list_t list0; + ogs_5gs_tai1_list_t list1; ogs_5gs_tai2_list_t list2; } served_taiOGS_MAX_NUM_OF_SERVED_TAI; /* PLMN Support */ - uint8_t num_of_plmn_support; + int num_of_plmn_support; struct { ogs_plmn_id_t plmn_id; int num_of_s_nssai; ogs_s_nssai_t s_nssaiOGS_MAX_NUM_OF_SLICE; } plmn_supportOGS_MAX_NUM_OF_PLMN; + /* Access Control */ + int default_reject_cause; + int num_of_access_control; + struct { + int reject_cause; + ogs_plmn_id_t plmn_id; + } access_controlOGS_MAX_NUM_OF_ACCESS_CONTROL; + /* defined in 'nas_ies.h' * #define NAS_SECURITY_ALGORITHMS_EIA0 0 * #define NAS_SECURITY_ALGORITHMS_128_EEA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EEA2 2 * #define NAS_SECURITY_ALGORITHMS_128_EEA3 3 */ - uint8_t num_of_ciphering_order; + int num_of_ciphering_order; uint8_t ciphering_orderOGS_MAX_NUM_OF_ALGORITHM; /* defined in 'nas_ies.h' * #define NAS_SECURITY_ALGORITHMS_EIA0 0 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 2 * #define NAS_SECURITY_ALGORITHMS_128_EIA3 3 */ - uint8_t num_of_integrity_order; + int num_of_integrity_order; uint8_t integrity_orderOGS_MAX_NUM_OF_ALGORITHM; /* Network Name */ @@ -129,16 +138,16 @@ bool ng_setup_success; /* gNB NGAP Setup complete successfuly */ } state; - uint16_t max_num_of_ostreams;/* SCTP Max num of outbound streams */ + int max_num_of_ostreams;/* SCTP Max num of outbound streams */ uint16_t ostream_id; /* gnb_ostream_id generator */ - uint8_t num_of_supported_ta_list; + int num_of_supported_ta_list; struct { ogs_uint24_t tac; - uint8_t num_of_bplmn_list; + int num_of_bplmn_list; struct { ogs_plmn_id_t plmn_id; - uint8_t num_of_s_nssai; + int num_of_s_nssai; ogs_s_nssai_t s_nssaiOGS_MAX_NUM_OF_SLICE; } bplmn_listOGS_MAX_NUM_OF_BPLMN; } supported_ta_listOGS_MAX_NUM_OF_TAI; @@ -481,6 +490,19 @@ bool n1_released; bool n2_released; + /* + * To check if Reactivation Request has been used. + * + * During the PFCP recovery process, + * when a Reactivation Request is sent to PDU session release command, + * the UE simultaneously sends PDU session release complete and + * PDU session establishment request. + * + * In this case, old_gsm_type is PDU session release command and + * current_gsm_type is PDU session establishment request. + */ + uint8_t old_gsm_type, current_gsm_type; + struct { ogs_pkbuf_t *pdu_session_resource_setup_request; ogs_pkbuf_t *pdu_session_resource_modification_command; @@ -753,6 +775,7 @@ sbi_object = &sess->sbi; \ ogs_assert(sbi_object); \ \ + ogs_error("AMF_SESS_CLEAR"); \ if (ogs_list_count(&sbi_object->xact_list)) { \ ogs_error("SBI running %d", \ ogs_list_count(&sbi_object->xact_list)); \
View file
open5gs_2.6.1.tar.xz/src/amf/gmm-build.c -> open5gs_2.6.2.tar.xz/src/amf/gmm-build.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -101,6 +101,7 @@ ogs_assert(OGS_OK == ogs_nas_5gs_tai_list_build(®istration_accept->tai_list, &amf_self()->served_taiserved_tai_index.list0, + &amf_self()->served_taiserved_tai_index.list1, &amf_self()->served_taiserved_tai_index.list2)); /* Set Allowed NSSAI */ @@ -125,7 +126,8 @@ registration_accept->presencemask |= OGS_NAS_5GS_REGISTRATION_ACCEPT_5GS_NETWORK_FEATURE_SUPPORT_PRESENT; network_feature_support->length = 2; - network_feature_support->ims_vops_3gpp = 1; + network_feature_support-> + ims_voice_over_ps_session_over_3gpp_access_indicator = 1; /* Set T3512 */ if (amf_self()->time.t3512.value) {
View file
open5gs_2.6.1.tar.xz/src/amf/gmm-handler.c -> open5gs_2.6.2.tar.xz/src/amf/gmm-handler.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -32,11 +32,14 @@ amf_ue_t *amf_ue, uint8_t message_type, ogs_nas_message_container_t *nas_message_container); +static uint8_t gmm_cause_from_access_control(ogs_plmn_id_t *plmn_id); + ogs_nas_5gmm_cause_t gmm_handle_registration_request(amf_ue_t *amf_ue, ogs_nas_security_header_type_t h, NGAP_ProcedureCode_t ngap_code, ogs_nas_5gs_registration_request_t *registration_request) { int served_tai_index = 0; + uint8_t gmm_cause; ran_ue_t *ran_ue = NULL; ogs_nas_5gs_registration_type_t *registration_type = NULL; @@ -281,6 +284,18 @@ memcpy(&amf_ue->nr_cgi, &ran_ue->saved.nr_cgi, sizeof(ogs_nr_cgi_t)); amf_ue->ue_location_timestamp = ogs_time_now(); + /* Check PLMN-ID access control */ + gmm_cause = gmm_cause_from_access_control(&amf_ue->nr_tai.plmn_id); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in TAI) access control"); + return gmm_cause; + } + gmm_cause = gmm_cause_from_access_control(&amf_ue->nr_cgi.plmn_id); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in CGI) access control"); + return gmm_cause; + } + /* Check TAI */ served_tai_index = amf_find_served_tai(&amf_ue->nr_tai); if (served_tai_index < 0) { @@ -511,6 +526,7 @@ ogs_nas_5gs_service_request_t *service_request) { int served_tai_index = 0; + uint8_t gmm_cause; ran_ue_t *ran_ue = NULL; ogs_nas_key_set_identifier_t *ngksi = NULL; @@ -605,6 +621,18 @@ memcpy(&amf_ue->nr_cgi, &ran_ue->saved.nr_cgi, sizeof(ogs_nr_cgi_t)); amf_ue->ue_location_timestamp = ogs_time_now(); + /* Check PLMN-ID access control */ + gmm_cause = gmm_cause_from_access_control(&amf_ue->nr_tai.plmn_id); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in TAI) access control"); + return gmm_cause; + } + gmm_cause = gmm_cause_from_access_control(&amf_ue->nr_cgi.plmn_id); + if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in CGI) access control"); + return gmm_cause; + } + /* Check TAI */ served_tai_index = amf_find_served_tai(&amf_ue->nr_tai); if (served_tai_index < 0) { @@ -1071,6 +1099,20 @@ } } + /* + * To check if Reactivation Request has been used. + * + * During the PFCP recovery process, + * when a Reactivation Request is sent to PDU session release command, + * the UE simultaneously sends PDU session release complete and + * PDU session establishment request. + * + * In this case, old_gsm_type is PDU session release command and + * current_gsm_type is PDU session establishment request. + */ + sess->old_gsm_type = sess->current_gsm_type; + sess->current_gsm_type = gsm_header->message_type; + if (sess->payload_container) ogs_pkbuf_free(sess->payload_container); @@ -1411,3 +1453,29 @@ ogs_pkbuf_free(nasbuf); return gmm_cause; } + +static uint8_t gmm_cause_from_access_control(ogs_plmn_id_t *plmn_id) +{ + int i; + + ogs_assert(plmn_id); + + /* No Access Control */ + if (amf_self()->num_of_access_control == 0) + return OGS_5GMM_CAUSE_REQUEST_ACCEPTED; + + for (i = 0; i < amf_self()->num_of_access_control; i++) { + if (memcmp(&amf_self()->access_controli.plmn_id, + plmn_id, OGS_PLMN_ID_LEN) == 0) { + if (amf_self()->access_controli.reject_cause) + return amf_self()->access_controli.reject_cause; + else + return OGS_5GMM_CAUSE_REQUEST_ACCEPTED; + } + } + + if (amf_self()->default_reject_cause) + return amf_self()->default_reject_cause; + + return OGS_5GMM_CAUSE_PLMN_NOT_ALLOWED; +}
View file
open5gs_2.6.1.tar.xz/src/amf/gmm-sm.c -> open5gs_2.6.2.tar.xz/src/amf/gmm-sm.c
Changed
@@ -1142,6 +1142,7 @@ ogs_expect(r == OGS_OK); ogs_assert(r != OGS_ERROR); OGS_FSM_TRAN(s, gmm_state_exception); + break; } OGS_FSM_TRAN(s, gmm_state_registered);
View file
open5gs_2.6.1.tar.xz/src/amf/init.c -> open5gs_2.6.2.tar.xz/src/amf/init.c
Changed
@@ -25,7 +25,7 @@ static void amf_main(void *data); static int initialized = 0; -int amf_initialize() +int amf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/amf/metrics.c -> open5gs_2.6.2.tar.xz/src/amf/metrics.c
Changed
@@ -10,6 +10,7 @@ int initial_val; unsigned int num_labels; const char **labels; + ogs_metrics_histogram_params_t histogram_params; } amf_metrics_spec_def_t; /* Helper generic functions: */ @@ -39,8 +40,10 @@ for (i = 0; i < len; i++) { dsti = ogs_metrics_spec_new(ctx, srci.type, srci.name, srci.description, - srci.initial_val, srci.num_labels, srci.labels); + srci.initial_val, srci.num_labels, srci.labels, + &srci.histogram_params); } + return OGS_OK; } @@ -135,6 +138,18 @@ .name = "fivegs_amffunction_mm_confupdatesucc", .description = "Number of UE Configuration Update complete messages received by the AMF", }, +/* Global Histograms: */ +AMF_METR_GLOB_HIST_REG_TIME = { + .type = OGS_METRICS_METRIC_TYPE_HISTOGRAM, + .name = "fivegs_amffunction_rm_regtime", + .description = "Time of registration procedure", + .histogram_params = { + .type = OGS_METRICS_HISTOGRAM_BUCKET_TYPE_EXPONENTIAL, + .count = 8, + .exp.start = 20, + .exp.factor = 2, + }, +}, }; int amf_metrics_init_inst_global(void) {
View file
open5gs_2.6.1.tar.xz/src/amf/metrics.h -> open5gs_2.6.2.tar.xz/src/amf/metrics.h
Changed
@@ -25,6 +25,7 @@ AMF_METR_GLOB_CTR_AMF_AUTH_REJECT, AMF_METR_GLOB_CTR_MM_CONF_UPDATE, AMF_METR_GLOB_CTR_MM_CONF_UPDATE_SUCC, + AMF_METR_GLOB_HIST_REG_TIME, _AMF_METR_GLOB_MAX, } amf_metric_type_global_t; extern ogs_metrics_inst_t *amf_metrics_inst_global_AMF_METR_GLOB_MAX;
View file
open5gs_2.6.1.tar.xz/src/amf/namf-handler.c -> open5gs_2.6.2.tar.xz/src/amf/namf-handler.c
Changed
@@ -498,11 +498,15 @@ * If NOTIFICATION comes after the CLIENT response is received, * sync is done. So, the session context can be removed. */ + ogs_info("%s:%d%d:%d:%s " + "/namf-callback/v1/{supi}/sm-context-status/{psi}", + amf_ue->supi, sess->psi, + sess->n1_released, sess->n2_released, + OpenAPI_resource_status_ToString(sess->resource_status)); + if (sess->n1_released == true && sess->n2_released == true && sess->resource_status == OpenAPI_resource_status_RELEASED) { - - ogs_debug("%s:%d SM context remove", amf_ue->supi, sess->psi); amf_nsmf_pdusession_handle_release_sm_context( sess, AMF_RELEASE_SM_CONTEXT_NO_STATE); } @@ -909,22 +913,31 @@ } if (amf_ue) { - if (amf_ue_is_rat_restricted(amf_ue)) { - /* - * - AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED - * 1. UDM_UECM_DeregistrationNotification - * 2. Deregistration request - * 3. UDM_SDM_Unsubscribe - * 4. UDM_UECM_Deregisration - * 5. PDU session release request - * 6. PDUSessionResourceReleaseCommand + - * PDU session release command - * 7. PDUSessionResourceReleaseResponse - * 8. AM_Policy_Association_Termination - * 9. Deregistration accept - * 10. Signalling Connecion Release - */ - if (CM_CONNECTED(amf_ue)) { + ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue); + if ((!ran_ue) || (amf_ue_is_rat_restricted(amf_ue))) { + + if (!ran_ue) { + ogs_error("NG context has already been removed"); + /* ran_ue is required for amf_ue_is_rat_restricted() */ + + ogs_error("Not implemented : Use Implicit De-registration"); + state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED; + } + else { + /* + * - AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED + * 1. UDM_UECM_DeregistrationNotification + * 2. Deregistration request + * 3. UDM_SDM_Unsubscribe + * 4. UDM_UECM_Deregistration + * 5. PDU session release request + * 6. PDUSessionResourceReleaseCommand + + * PDU session release command + * 7. PDUSessionResourceReleaseResponse + * 8. AM_Policy_Association_Termination + * 9. Deregistration accept + * 10. Signalling Connection Release + */ r = nas_5gs_send_de_registration_request( amf_ue, OpenAPI_deregistration_reason_REREGISTRATION_REQUIRED, 0); @@ -932,29 +945,23 @@ ogs_assert(r != OGS_ERROR); state = AMF_NETWORK_INITIATED_EXPLICIT_DE_REGISTERED; - - } else if (CM_IDLE(amf_ue)) { - ogs_error("Not implemented : Use Implicit De-registration"); - - state = AMF_NETWORK_INITIATED_IMPLICIT_DE_REGISTERED; - - } else { - ogs_fatal("Invalid State"); - ogs_assert_if_reached(); } if (UDM_SDM_SUBSCRIBED(amf_ue)) { - ogs_assert(true == amf_ue_sbi_discover_and_send( + r = amf_ue_sbi_discover_and_send( OGS_SBI_SERVICE_TYPE_NUDM_SDM, NULL, amf_nudm_sdm_build_subscription_delete, - amf_ue, state, NULL)); + amf_ue, state, NULL); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); } else if (PCF_AM_POLICY_ASSOCIATED(amf_ue)) { - ogs_assert(true == - amf_ue_sbi_discover_and_send( + r = amf_ue_sbi_discover_and_send( OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL, amf_npcf_am_policy_control_build_delete, - amf_ue, state, NULL)); + amf_ue, state, NULL); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); } } else if (ambr_changed) {
View file
open5gs_2.6.1.tar.xz/src/amf/ngap-path.c -> open5gs_2.6.2.tar.xz/src/amf/ngap-path.c
Changed
@@ -40,7 +40,7 @@ return OGS_OK; } -void ngap_close() +void ngap_close(void) { ogs_socknode_remove_all(&amf_self()->ngap_list); ogs_socknode_remove_all(&amf_self()->ngap_list6);
View file
open5gs_2.6.1.tar.xz/src/amf/npcf-build.c -> open5gs_2.6.2.tar.xz/src/amf/npcf-build.c
Changed
@@ -47,6 +47,15 @@ message.h.resource.component0 = (char *)OGS_SBI_RESOURCE_NAME_POLICIES; memset(&PolicyAssociationRequest, 0, sizeof(PolicyAssociationRequest)); + memset(&ueLocation, 0, sizeof(ueLocation)); + memset(&UeAmbr, 0, sizeof(UeAmbr)); + + ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue); + if (!ran_ue) { + ogs_error("NG context has already been removed"); + /* ran_ue is required for amf_ue_rat_type() */ + goto end; + } server = ogs_list_first(&ogs_sbi_self()->server_list); if (!server) { @@ -83,7 +92,6 @@ PolicyAssociationRequest.access_type = amf_ue->nas.access_type; PolicyAssociationRequest.pei = amf_ue->pei; - memset(&ueLocation, 0, sizeof(ueLocation)); ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi); if (!ueLocation.nr_location) { @@ -114,7 +122,6 @@ PolicyAssociationRequest.rat_type = amf_ue_rat_type(amf_ue); - memset(&UeAmbr, 0, sizeof(UeAmbr)); if (OGS_SBI_FEATURES_IS_SET(amf_ue->am_policy_control_features, OGS_SBI_NPCF_AM_POLICY_CONTROL_UE_AMBR_AUTHORIZATION)) { if (amf_ue->ue_ambr.uplink) {
View file
open5gs_2.6.1.tar.xz/src/amf/nsmf-build.c -> open5gs_2.6.2.tar.xz/src/amf/nsmf-build.c
Changed
@@ -51,6 +51,17 @@ (char *)OGS_SBI_RESOURCE_NAME_SM_CONTEXTS; memset(&SmContextCreateData, 0, sizeof(SmContextCreateData)); + memset(&sNssai, 0, sizeof(sNssai)); + memset(&hplmnSnssai, 0, sizeof(hplmnSnssai)); + memset(&header, 0, sizeof(header)); + memset(&ueLocation, 0, sizeof(ueLocation)); + + ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue); + if (!ran_ue) { + /* ran_ue is required for amf_ue_rat_type() */ + ogs_error("NG context has already been removed"); + goto end; + } SmContextCreateData.serving_nf_id = NF_INSTANCE_ID(ogs_sbi_self()->nf_instance); @@ -86,12 +97,10 @@ } SmContextCreateData.dnn = sess->dnn; - memset(&sNssai, 0, sizeof(sNssai)); sNssai.sst = sess->s_nssai.sst; sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd); SmContextCreateData.s_nssai = &sNssai; - memset(&hplmnSnssai, 0, sizeof(hplmnSnssai)); if (sess->mapped_hplmn.sst) { hplmnSnssai.sst = sess->mapped_hplmn.sst; hplmnSnssai.sd = ogs_s_nssai_sd_to_string(sess->mapped_hplmn.sd); @@ -105,7 +114,6 @@ } SmContextCreateData.an_type = amf_ue->nas.access_type; - memset(&header, 0, sizeof(header)); header.service.name = (char *)OGS_SBI_SERVICE_NAME_NAMF_CALLBACK; header.api.version = (char *)OGS_SBI_API_V1; header.resource.component0 = amf_ue->supi; @@ -130,7 +138,6 @@ SmContextCreateData.rat_type = amf_ue_rat_type(amf_ue); - memset(&ueLocation, 0, sizeof(ueLocation)); ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi); if (!ueLocation.nr_location) { @@ -244,6 +251,7 @@ message.h.resource.component1 = sess->sm_context_ref; message.h.resource.component2 = (char *)OGS_SBI_RESOURCE_NAME_MODIFY; + memset(&ueLocation, 0, sizeof(ueLocation)); memset(&SmContextUpdateData, 0, sizeof(SmContextUpdateData)); message.SmContextUpdateData = &SmContextUpdateData; @@ -301,7 +309,6 @@ ngApCause.value = param->ngApCause.value; } - memset(&ueLocation, 0, sizeof(ueLocation)); if (param->ue_location) { ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi);
View file
open5gs_2.6.1.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.6.2.tar.xz/src/amf/nsmf-handler.c
Changed
@@ -565,7 +565,7 @@ * 1. PDUSessionResourceReleaseResponse * 2. /nsmf-pdusession/v1/sm-contexts/{smContextRef}/modify */ - ogs_debug("%s:%d Receive Update SM context(N2-RELEASED)", + ogs_info("%s:%d Receive Update SM context(N2-RELEASED)", amf_ue->supi, sess->psi); sess->n2_released = true; @@ -577,7 +577,7 @@ * 2. /nsmf-pdusession/v1/sm-contexts/{smContextRef}/modify */ - ogs_debug("%s:%d Receive Update SM context(N1-RELEASED)", + ogs_info("%s:%d Receive Update SM context(N1-RELEASED)", amf_ue->supi, sess->psi); sess->n1_released = true; @@ -729,11 +729,15 @@ * Remove 'amf_sess_t' context to call * amf_nsmf_pdusession_handle_release_sm_context(). */ + ogs_info("%s:%d:%d%d:%d:%s " + "/nsmf-pdusession/v1/sm-contexts/{smContextRef}/modify", + amf_ue->supi, sess->psi, state, + sess->n1_released, sess->n2_released, + OpenAPI_resource_status_ToString(sess->resource_status)); + if (sess->n1_released == true && sess->n2_released == true && sess->resource_status == OpenAPI_resource_status_RELEASED) { - - ogs_debug("%s:%d SM context remove", amf_ue->supi, sess->psi); amf_nsmf_pdusession_handle_release_sm_context( sess, AMF_RELEASE_SM_CONTEXT_NO_STATE); } @@ -844,7 +848,37 @@ amf_ue = sess->amf_ue; ogs_assert(amf_ue); - amf_sess_remove(sess); + /* + * To check if Reactivation Request has been used. + * + * During the PFCP recovery process, + * when a Reactivation Request is sent to PDU session release command, + * the UE simultaneously sends PDU session release complete and + * PDU session establishment request. + * + * In this case, old_gsm_type is PDU session release command and + * current_gsm_type is PDU session establishment request. + */ + if (sess->old_gsm_type == OGS_NAS_5GS_PDU_SESSION_RELEASE_COMPLETE && + sess->current_gsm_type == + OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_REQUEST) { + ogs_error("%s:%d Do not remove Session due to Reactivation-requested", + amf_ue->supi, sess->psi); + + /* Initialize the context instead of using amf_sess_remove() */ + + sess->old_gsm_type = 0; + sess->current_gsm_type = 0; + + sess->n1_released = false; + sess->n2_released = false; + sess->resource_status = OpenAPI_resource_status_NULL; + + } else { + ogs_info("%s:%d Release SM Context state:%d", + amf_ue->supi, sess->psi, state); + amf_sess_remove(sess); + } if (state == AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT) { /*
View file
open5gs_2.6.1.tar.xz/src/amf/nudm-handler.c -> open5gs_2.6.2.tar.xz/src/amf/nudm-handler.c
Changed
@@ -32,6 +32,14 @@ SWITCH(recvmsg->h.resource.component1) CASE(OGS_SBI_RESOURCE_NAME_AM_DATA) + + ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue); + if (!ran_ue) { + /* ran_ue is required for amf_ue_is_rat_restricted() */ + ogs_error("NG context has already been removed"); + return OGS_ERROR; + } + if (recvmsg->AccessAndMobilitySubscriptionData) { OpenAPI_list_t *gpsiList = recvmsg->AccessAndMobilitySubscriptionData->gpsis;
View file
open5gs_2.6.1.tar.xz/src/amf/timer.c -> open5gs_2.6.2.tar.xz/src/amf/timer.c
Changed
@@ -75,6 +75,8 @@ return OGS_TIMER_NAME_NF_INSTANCE_VALIDITY; case OGS_TIMER_SUBSCRIPTION_VALIDITY: return OGS_TIMER_NAME_SUBSCRIPTION_VALIDITY; + case OGS_TIMER_SUBSCRIPTION_PATCH: + return OGS_TIMER_NAME_SUBSCRIPTION_PATCH; case OGS_TIMER_SBI_CLIENT_WAIT: return OGS_TIMER_NAME_SBI_CLIENT_WAIT; case AMF_TIMER_NG_DELAYED_SEND:
View file
open5gs_2.6.1.tar.xz/src/ausf/ausf-sm.c -> open5gs_2.6.2.tar.xz/src/ausf/ausf-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -219,8 +219,21 @@ ogs_nnrf_nfm_handle_nf_status_subscribe( subscription_data, &message); } else { + ogs_error("HTTP response error : %d", + message.res_status); + } + break; + + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -230,7 +243,9 @@ ogs_sbi_subscription_data_remove(subscription_data); } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -352,11 +367,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/ausf/context.c -> open5gs_2.6.2.tar.xz/src/ausf/context.c
Changed
@@ -183,7 +183,7 @@ ogs_pool_free(&ausf_ue_pool, ausf_ue); } -void ausf_ue_remove_all() +void ausf_ue_remove_all(void) { ausf_ue_t *ausf_ue = NULL, *next = NULL;; @@ -223,7 +223,7 @@ return ogs_pool_cycle(&ausf_ue_pool, ausf_ue); } -int get_ue_load() +int get_ue_load(void) { return (((ogs_pool_size(&ausf_ue_pool) - ogs_pool_avail(&ausf_ue_pool)) * 100) /
View file
open5gs_2.6.1.tar.xz/src/ausf/init.c -> open5gs_2.6.2.tar.xz/src/ausf/init.c
Changed
@@ -23,7 +23,7 @@ static void ausf_main(void *data); static int initialized = 0; -int ausf_initialize() +int ausf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/bsf/bsf-sm.c -> open5gs_2.6.2.tar.xz/src/bsf/bsf-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -245,11 +245,26 @@ } break; + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); + } + break; + CASE(OGS_SBI_HTTP_METHOD_DELETE) if (message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { ogs_sbi_subscription_data_remove(subscription_data); } else { - ogs_error("HTTP response error : %d", + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", message.res_status); } break; @@ -336,11 +351,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/bsf/context.c -> open5gs_2.6.2.tar.xz/src/bsf/context.c
Changed
@@ -341,7 +341,7 @@ &ipv6prefix, (ipv6prefix.len >> 3) + 1); } -int get_sess_load() +int get_sess_load(void) { return (((ogs_pool_size(&bsf_sess_pool) - ogs_pool_avail(&bsf_sess_pool)) * 100) /
View file
open5gs_2.6.1.tar.xz/src/bsf/init.c -> open5gs_2.6.2.tar.xz/src/bsf/init.c
Changed
@@ -25,7 +25,7 @@ static int initialized = 0; -int bsf_initialize() +int bsf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/mme/emm-build.c -> open5gs_2.6.2.tar.xz/src/mme/emm-build.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -161,6 +161,7 @@ ogs_assert(OGS_OK == ogs_nas_tai_list_build(&attach_accept->tai_list, &mme_self()->served_taiserved_tai_index.list0, + &mme_self()->served_taiserved_tai_index.list1, &mme_self()->served_taiserved_tai_index.list2)); attach_accept->esm_message_container.buffer = esmbuf->data; @@ -562,6 +563,7 @@ ogs_assert(OGS_OK == ogs_nas_tai_list_build(&tau_accept->tai_list, &mme_self()->served_taiserved_tai_index.list0, + &mme_self()->served_taiserved_tai_index.list1, &mme_self()->served_taiserved_tai_index.list2)); /* Set EPS bearer context status */
View file
open5gs_2.6.1.tar.xz/src/mme/emm-handler.c -> open5gs_2.6.2.tar.xz/src/mme/emm-handler.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -32,10 +32,13 @@ #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __emm_log_domain +static uint8_t emm_cause_from_access_control(ogs_plmn_id_t *plmn_id); + int emm_handle_attach_request(mme_ue_t *mme_ue, ogs_nas_eps_attach_request_t *attach_request, ogs_pkbuf_t *pkbuf) { int r; + uint8_t emm_cause; int served_tai_index = 0; ogs_nas_eps_mobile_identity_guti_t *eps_mobile_identity_guti = NULL; @@ -56,7 +59,15 @@ ogs_assert(enb_ue); ogs_assert(esm_message_container); - ogs_assert(esm_message_container->length); + if (!esm_message_container->length) { + ogs_error("No ESM Message Container"); + r = nas_eps_send_attach_reject(mme_ue, + OGS_NAS_EMM_CAUSE_SEMANTICALLY_INCORRECT_MESSAGE, + OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } ogs_assert(pkbuf); ogs_assert(pkbuf->data); @@ -124,6 +135,26 @@ memcpy(&mme_ue->e_cgi, &enb_ue->saved.e_cgi, sizeof(ogs_e_cgi_t)); mme_ue->ue_location_timestamp = ogs_time_now(); + /* Check PLMN-ID access control */ + emm_cause = emm_cause_from_access_control(&mme_ue->tai.plmn_id); + if (emm_cause != OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in TAI) access control"); + r = nas_eps_send_attach_reject(mme_ue, + emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } + emm_cause = emm_cause_from_access_control(&mme_ue->e_cgi.plmn_id); + if (emm_cause != OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in CGI) access control"); + r = nas_eps_send_attach_reject(mme_ue, + emm_cause, OGS_NAS_ESM_CAUSE_PROTOCOL_ERROR_UNSPECIFIED); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } + /* Check TAI */ served_tai_index = mme_find_served_tai(&mme_ue->tai); if (served_tai_index < 0) { @@ -496,6 +527,7 @@ { int r; int served_tai_index = 0; + uint8_t emm_cause; ogs_nas_eps_mobile_identity_guti_t *eps_mobile_identity_guti = NULL; ogs_nas_eps_guti_t nas_guti; @@ -562,6 +594,24 @@ memcpy(&mme_ue->e_cgi, &enb_ue->saved.e_cgi, sizeof(ogs_e_cgi_t)); mme_ue->ue_location_timestamp = ogs_time_now(); + /* Check PLMN-ID access control */ + emm_cause = emm_cause_from_access_control(&mme_ue->tai.plmn_id); + if (emm_cause != OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in TAI) access control"); + r = nas_eps_send_tau_reject(mme_ue, emm_cause); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } + emm_cause = emm_cause_from_access_control(&mme_ue->e_cgi.plmn_id); + if (emm_cause != OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in CGI) access control"); + r = nas_eps_send_tau_reject(mme_ue, emm_cause); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } + /* Check TAI */ served_tai_index = mme_find_served_tai(&mme_ue->tai); if (served_tai_index < 0) { @@ -636,6 +686,7 @@ { int r; int served_tai_index = 0; + uint8_t emm_cause; ogs_nas_service_type_t *service_type = &extended_service_request->service_type; @@ -682,6 +733,24 @@ memcpy(&mme_ue->e_cgi, &enb_ue->saved.e_cgi, sizeof(ogs_e_cgi_t)); mme_ue->ue_location_timestamp = ogs_time_now(); + /* Check PLMN-ID access control */ + emm_cause = emm_cause_from_access_control(&mme_ue->tai.plmn_id); + if (emm_cause != OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in TAI) access control"); + r = nas_eps_send_tau_reject(mme_ue, emm_cause); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } + emm_cause = emm_cause_from_access_control(&mme_ue->e_cgi.plmn_id); + if (emm_cause != OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED) { + ogs_error("Rejected by PLMN-ID(in CGI) access control"); + r = nas_eps_send_tau_reject(mme_ue, emm_cause); + ogs_expect(r == OGS_OK); + ogs_assert(r != OGS_ERROR); + return OGS_ERROR; + } + /* Check TAI */ served_tai_index = mme_find_served_tai(&mme_ue->tai); if (served_tai_index < 0) { @@ -759,3 +828,29 @@ return OGS_OK; } + +static uint8_t emm_cause_from_access_control(ogs_plmn_id_t *plmn_id) +{ + int i; + + ogs_assert(plmn_id); + + /* No Access Control */ + if (mme_self()->num_of_access_control == 0) + return OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED; + + for (i = 0; i < mme_self()->num_of_access_control; i++) { + if (memcmp(&mme_self()->access_controli.plmn_id, + plmn_id, OGS_PLMN_ID_LEN) == 0) { + if (mme_self()->access_controli.reject_cause) + return mme_self()->access_controli.reject_cause; + else + return OGS_NAS_EMM_CAUSE_REQUEST_ACCEPTED; + } + } + + if (mme_self()->default_reject_cause) + return mme_self()->default_reject_cause; + + return OGS_NAS_EMM_CAUSE_PLMN_NOT_ALLOWED; +}
View file
open5gs_2.6.1.tar.xz/src/mme/metrics.c -> open5gs_2.6.2.tar.xz/src/mme/metrics.c
Changed
@@ -39,7 +39,8 @@ for (i = 0; i < len; i++) { dsti = ogs_metrics_spec_new(ctx, srci.type, srci.name, srci.description, - srci.initial_val, srci.num_labels, srci.labels); + srci.initial_val, srci.num_labels, srci.labels, + NULL); } return OGS_OK; }
View file
open5gs_2.6.1.tar.xz/src/mme/mme-context.c -> open5gs_2.6.2.tar.xz/src/mme/mme-context.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -63,7 +63,7 @@ static mme_sgw_t *selected_sgw_node(mme_sgw_t *current, enb_ue_t *enb_ue); static mme_sgw_t *changed_sgw_node(mme_sgw_t *current, enb_ue_t *enb_ue); -void mme_context_init() +void mme_context_init(void) { ogs_assert(context_initialized == 0); @@ -120,7 +120,7 @@ context_initialized = 1; } -void mme_context_final() +void mme_context_final(void) { ogs_assert(context_initialized == 1); @@ -270,7 +270,7 @@ return OGS_OK; } -int mme_context_parse_config() +int mme_context_parse_config(void) { int rv; yaml_document_t *document = NULL; @@ -626,8 +626,7 @@ const char *plmn_id_key = ogs_yaml_iter_key(&plmn_id_iter); ogs_assert(plmn_id_key); - if (!strcmp(plmn_id_key, "mcc")) - { + if (!strcmp(plmn_id_key, "mcc")) { mcc = ogs_yaml_iter_value( &plmn_id_iter); } else if (!strcmp( @@ -728,22 +727,24 @@ YAML_SEQUENCE_NODE); } else if (!strcmp(mme_key, "tai")) { int num_of_list0 = 0; + int num_of_list1 = 0; ogs_eps_tai0_list_t *list0 = NULL; + ogs_eps_tai1_list_t *list1 = NULL; ogs_eps_tai2_list_t *list2 = NULL; ogs_assert(self.num_of_served_tai < OGS_MAX_NUM_OF_SERVED_TAI); list0 = &self.served_taiself.num_of_served_tai.list0; - ogs_assert(list0); + list1 = &self.served_taiself.num_of_served_tai.list1; list2 = &self.served_taiself.num_of_served_tai.list2; - ogs_assert(list2); ogs_yaml_iter_t tai_array, tai_iter; ogs_yaml_iter_recurse(&mme_iter, &tai_array); do { const char *mcc = NULL, *mnc = NULL; - uint16_t tacOGS_MAX_NUM_OF_TAI; int num_of_tac = 0; + uint16_t startOGS_MAX_NUM_OF_TAI; + uint16_t endOGS_MAX_NUM_OF_TAI; if (ogs_yaml_iter_type(&tai_array) == YAML_MAPPING_NODE) { @@ -784,23 +785,56 @@ ogs_yaml_iter_t tac_iter; ogs_yaml_iter_recurse(&tai_iter, &tac_iter); ogs_assert(ogs_yaml_iter_type(&tac_iter) != - YAML_MAPPING_NODE); - + YAML_MAPPING_NODE); do { - const char *v = NULL; + char *v = NULL; + char *low = NULL, *high = NULL; - ogs_assert(num_of_tac < - OGS_MAX_NUM_OF_TAI); if (ogs_yaml_iter_type(&tac_iter) == YAML_SEQUENCE_NODE) { if (!ogs_yaml_iter_next(&tac_iter)) break; } - v = ogs_yaml_iter_value(&tac_iter); + v = (char *)ogs_yaml_iter_value( + &tac_iter); if (v) { - tacnum_of_tac = atoi(v); - num_of_tac++; + low = strsep(&v, "-"); + if (low && strlen(low) == 0) + low = NULL; + + high = v; + if (high && strlen(high) == 0) + high = NULL; + + if (low) { + ogs_assert(num_of_tac < + OGS_MAX_NUM_OF_TAI); + startnum_of_tac = atoi(low); + if (high) { + endnum_of_tac = atoi(high); + if (endnum_of_tac < + startnum_of_tac) + ogs_error( + "Invalid TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else if ( + (endnum_of_tac- + startnum_of_tac+1) > + OGS_MAX_NUM_OF_TAI) + ogs_error( + "Overflow TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else + num_of_tac++; + } else { + endnum_of_tac = + startnum_of_tac; + num_of_tac++; + } + } } } while ( ogs_yaml_iter_type(&tac_iter) == @@ -810,30 +844,60 @@ } if (mcc && mnc && num_of_tac) { - if (num_of_tac == 1) { + if (num_of_tac == 1 && start0 == end0) { + ogs_assert(list2->num < OGS_MAX_NUM_OF_TAI); + + list2->type = OGS_TAI2_TYPE; + ogs_plmn_id_build( &list2->tailist2->num.plmn_id, atoi(mcc), atoi(mnc), strlen(mnc)); - list2->tailist2->num.tac = tac0; + list2->tailist2->num.tac = start0; list2->num++; - if (list2->num > 1) - list2->type = OGS_TAI2_TYPE; - else - list2->type = OGS_TAI1_TYPE; - } else if (num_of_tac > 1) { - int i; - ogs_plmn_id_build( - &list0->tainum_of_list0.plmn_id, - atoi(mcc), atoi(mnc), strlen(mnc)); - for (i = 0; i < num_of_tac; i++) { - list0->tainum_of_list0.taci = taci; - } - list0->tainum_of_list0.num = num_of_tac; - list0->tainum_of_list0.type = OGS_TAI0_TYPE; + } else { + int tac, count = 0; + for (tac = 0; tac < num_of_tac; tac++) { + ogs_assert(endtac >= starttac); + if (starttac == endtac) { + ogs_assert(num_of_list0 < + OGS_MAX_NUM_OF_TAI); + + list0->tainum_of_list0.type = + OGS_TAI0_TYPE; + + ogs_plmn_id_build( + &list0->tainum_of_list0.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list0->tainum_of_list0. + taccount = starttac; + + list0->tainum_of_list0.num = + ++count; + + } else if (starttac < endtac) { + ogs_assert(num_of_list1 < + OGS_MAX_NUM_OF_TAI); + + list1->tainum_of_list1.type = + OGS_TAI1_TYPE; + + ogs_plmn_id_build( + &list1->tainum_of_list1.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list1->tainum_of_list1.tac = + starttac; + + list1->tainum_of_list1.num = + endtac-starttac+1; + + num_of_list1++; + } + } - num_of_list0++; + if (count) + num_of_list0++; } } else { ogs_warn("Ignore tai : mcc(%p), mnc(%p), " @@ -842,9 +906,84 @@ } while (ogs_yaml_iter_type(&tai_array) == YAML_SEQUENCE_NODE); - if (list2->num || num_of_list0) { + if (list2->num || num_of_list1 || num_of_list0) { self.num_of_served_tai++; } + } else if (!strcmp(mme_key, "access_control")) { + ogs_yaml_iter_t access_control_array, access_control_iter; + ogs_yaml_iter_recurse(&mme_iter, &access_control_array); + do { + ogs_assert(self.num_of_access_control < + OGS_MAX_NUM_OF_ACCESS_CONTROL); + + if (ogs_yaml_iter_type(&access_control_array) == + YAML_MAPPING_NODE) { + memcpy(&access_control_iter, &access_control_array, + sizeof(ogs_yaml_iter_t)); + } else if (ogs_yaml_iter_type(&access_control_array) == + YAML_SEQUENCE_NODE) { + if (!ogs_yaml_iter_next(&access_control_array)) + break; + ogs_yaml_iter_recurse(&access_control_array, + &access_control_iter); + } else if (ogs_yaml_iter_type(&access_control_array) == + YAML_SCALAR_NODE) { + break; + } else + ogs_assert_if_reached(); + + while (ogs_yaml_iter_next(&access_control_iter)) { + const char *mnc = NULL, *mcc = NULL; + int reject_cause = 0; + const char *access_control_key = + ogs_yaml_iter_key(&access_control_iter); + ogs_assert(access_control_key); + if (!strcmp(access_control_key, + "default_reject_cause")) { + const char *v = ogs_yaml_iter_value( + &access_control_iter); + if (v) self.default_reject_cause = atoi(v); + } else if (!strcmp(access_control_key, "plmn_id")) { + ogs_yaml_iter_t plmn_id_iter; + + ogs_yaml_iter_recurse(&access_control_iter, + &plmn_id_iter); + while (ogs_yaml_iter_next(&plmn_id_iter)) { + const char *plmn_id_key = + ogs_yaml_iter_key(&plmn_id_iter); + ogs_assert(plmn_id_key); + if (!strcmp(plmn_id_key, "reject_cause")) { + const char *v = ogs_yaml_iter_value( + &plmn_id_iter); + if (v) reject_cause = atoi(v); + } else if (!strcmp(plmn_id_key, "mcc")) { + mcc = ogs_yaml_iter_value( + &plmn_id_iter); + } else if (!strcmp(plmn_id_key, "mnc")) { + mnc = ogs_yaml_iter_value( + &plmn_id_iter); + } + } + + if (mcc && mnc) { + ogs_plmn_id_build( + &self.access_control + self.num_of_access_control. + plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + if (reject_cause) + self.access_control + self.num_of_access_control. + reject_cause = reject_cause; + self.num_of_access_control++; + } + } else + ogs_warn("unknown key `%s`", + access_control_key); + } + + } while (ogs_yaml_iter_type(&access_control_array) == + YAML_SEQUENCE_NODE); } else if (!strcmp(mme_key, "security")) { ogs_yaml_iter_t security_iter; ogs_yaml_iter_recurse(&mme_iter, &security_iter); @@ -937,7 +1076,8 @@ } while ( ogs_yaml_iter_type(&ciphering_order_iter) == YAML_SEQUENCE_NODE); - } + } else + ogs_warn("unknown key `%s`", security_key); } } else if (!strcmp(mme_key, "network_name")) { ogs_yaml_iter_t network_name_iter; @@ -981,7 +1121,8 @@ network_short_name->length = size*2+1; network_short_name->coding_scheme = 1; network_short_name->ext = 1; - } + } else + ogs_warn("unknown key `%s`", network_name_key); } } else if (!strcmp(mme_key, "sgsap")) { ogs_yaml_iter_t sgsap_array, sgsap_iter; @@ -1316,9 +1457,9 @@ const char *hostnameOGS_MAX_NUM_OF_HOSTNAME; uint16_t port = ogs_gtp_self()->gtpc_port; uint16_t tacOGS_MAX_NUM_OF_TAI = {0,}; - uint8_t num_of_tac = 0; + int num_of_tac = 0; uint32_t e_cell_idOGS_MAX_NUM_OF_CELL_ID = {0,}; - uint8_t num_of_e_cell_id = 0; + int num_of_e_cell_id = 0; if (ogs_yaml_iter_type(>pc_array) == YAML_MAPPING_NODE) { @@ -1671,7 +1812,7 @@ ogs_pool_free(&mme_sgw_pool, sgw); } -void mme_sgw_remove_all() +void mme_sgw_remove_all(void) { mme_sgw_t *sgw = NULL, *next_sgw = NULL; @@ -1720,7 +1861,7 @@ ogs_pool_free(&mme_pgw_pool, pgw); } -void mme_pgw_remove_all() +void mme_pgw_remove_all(void) { mme_pgw_t *pgw = NULL, *next_pgw = NULL; @@ -1789,7 +1930,7 @@ ogs_pool_free(&mme_vlr_pool, vlr); } -void mme_vlr_remove_all() +void mme_vlr_remove_all(void) { mme_vlr_t *vlr = NULL, *next_vlr = NULL; @@ -1962,7 +2103,7 @@ return OGS_OK; } -int mme_enb_remove_all() +int mme_enb_remove_all(void) { mme_enb_t *enb = NULL, *next_enb = NULL; @@ -3560,13 +3701,12 @@ for (i = 0; i < self.num_of_served_tai; i++) { ogs_eps_tai0_list_t *list0 = &self.served_taii.list0; - ogs_assert(list0); + ogs_eps_tai1_list_t *list1 = &self.served_taii.list1; ogs_eps_tai2_list_t *list2 = &self.served_taii.list2; - ogs_assert(list2); for (j = 0; list0->taij.num; j++) { ogs_assert(list0->taij.type == OGS_TAI0_TYPE); - ogs_assert(list0->taij.num < OGS_MAX_NUM_OF_TAI); + ogs_assert(list0->taij.num <= OGS_MAX_NUM_OF_TAI); for (k = 0; k < list0->taij.num; k++) { if (memcmp(&list0->taij.plmn_id, @@ -3577,10 +3717,18 @@ } } + for (j = 0; list1->taij.num; j++) { + ogs_assert(list1->taij.type == OGS_TAI1_TYPE); + ogs_assert(list1->taij.num <= OGS_MAX_NUM_OF_TAI); + + if (list1->taij.tac <= tai->tac && + tai->tac < (list1->taij.tac+list1->taij.num)) + return i; + } + if (list2->num) { - ogs_assert(list2->type == OGS_TAI1_TYPE || - list2->type == OGS_TAI2_TYPE); - ogs_assert(list2->num < OGS_MAX_NUM_OF_TAI); + ogs_assert(list2->type == OGS_TAI2_TYPE); + ogs_assert(list2->num <= OGS_MAX_NUM_OF_TAI); for (j = 0; j < list2->num; j++) { if (memcmp(&list2->taij.plmn_id, @@ -3595,13 +3743,13 @@ return -1; } -int mme_m_tmsi_pool_generate() +int mme_m_tmsi_pool_generate(void) { - int i, j; + int j; int index = 0; ogs_trace("M-TMSI Pool try to generate..."); - for (i = 0; index < ogs_app()->max.ue*2; i++) { + while (index < ogs_app()->max.ue*2) { mme_m_tmsi_t *m_tmsi = NULL; int conflict = 0; @@ -3633,7 +3781,7 @@ return OGS_OK; } -mme_m_tmsi_t *mme_m_tmsi_alloc() +mme_m_tmsi_t *mme_m_tmsi_alloc(void) { mme_m_tmsi_t *m_tmsi = NULL;
View file
open5gs_2.6.1.tar.xz/src/mme/mme-context.h -> open5gs_2.6.2.tar.xz/src/mme/mme-context.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -66,12 +66,12 @@ typedef uint32_t mme_p_tmsi_t; typedef struct served_gummei_s { - uint32_t num_of_plmn_id; + int num_of_plmn_id; ogs_plmn_id_t plmn_idOGS_MAX_NUM_OF_PLMN; - uint32_t num_of_mme_gid; + int num_of_mme_gid; uint16_t mme_gidGRP_PER_MME; - uint32_t num_of_mme_code; + int num_of_mme_code; uint8_t mme_codeCODE_PER_MME; } served_gummei_t; @@ -98,29 +98,38 @@ ogs_list_t csmap_list; /* TAI-LAI Map List */ /* Served GUMME */ - uint8_t max_num_of_served_gummei; + int max_num_of_served_gummei; served_gummei_t served_gummeiMAX_NUM_OF_SERVED_GUMMEI; /* Served TAI */ - uint8_t num_of_served_tai; + int num_of_served_tai; struct { ogs_eps_tai0_list_t list0; + ogs_eps_tai1_list_t list1; ogs_eps_tai2_list_t list2; } served_taiOGS_MAX_NUM_OF_SERVED_TAI; + /* Access Control */ + int default_reject_cause; + int num_of_access_control; + struct { + int reject_cause; + ogs_plmn_id_t plmn_id; + } access_controlOGS_MAX_NUM_OF_ACCESS_CONTROL; + /* defined in 'nas_ies.h' * #define NAS_SECURITY_ALGORITHMS_EIA0 0 * #define NAS_SECURITY_ALGORITHMS_128_EEA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EEA2 2 * #define NAS_SECURITY_ALGORITHMS_128_EEA3 3 */ - uint8_t num_of_ciphering_order; + int num_of_ciphering_order; uint8_t ciphering_orderOGS_MAX_NUM_OF_ALGORITHM; /* defined in 'nas_ies.h' * #define NAS_SECURITY_ALGORITHMS_EIA0 0 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 1 * #define NAS_SECURITY_ALGORITHMS_128_EIA1 2 * #define NAS_SECURITY_ALGORITHMS_128_EIA3 3 */ - uint8_t num_of_integrity_order; + int num_of_integrity_order; uint8_t integrity_orderOGS_MAX_NUM_OF_ALGORITHM; /* Network Name */ @@ -157,9 +166,9 @@ ogs_gtp_node_t gnode; uint16_t tacOGS_MAX_NUM_OF_TAI; - uint8_t num_of_tac; + int num_of_tac; uint32_t e_cell_idOGS_MAX_NUM_OF_CELL_ID; - uint8_t num_of_e_cell_id; + int num_of_e_cell_id; ogs_list_t sgw_ue_list; } mme_sgw_t; @@ -184,7 +193,7 @@ ogs_timer_t *t_conn; /* client timer to connect to server */ - uint16_t max_num_of_ostreams;/* SCTP Max num of outbound streams */ + int max_num_of_ostreams;/* SCTP Max num of outbound streams */ uint16_t ostream_id; /* vlr_ostream_id generator */ ogs_sockaddr_t *sa_list; /* VLR SGsAP Socket Address List */ @@ -216,10 +225,10 @@ bool s1_setup_success; /* eNB S1AP Setup complete successfuly */ } state; - uint16_t max_num_of_ostreams;/* SCTP Max num of outbound streams */ + int max_num_of_ostreams;/* SCTP Max num of outbound streams */ uint16_t ostream_id; /* enb_ostream_id generator */ - uint8_t num_of_supported_ta_list; + int num_of_supported_ta_list; ogs_eps_tai_t supported_ta_listOGS_MAX_NUM_OF_TAI*OGS_MAX_NUM_OF_BPLMN; ogs_pkbuf_t *s1_reset_ack; /* Reset message */
View file
open5gs_2.6.1.tar.xz/src/mme/mme-init.c -> open5gs_2.6.2.tar.xz/src/mme/mme-init.c
Changed
@@ -36,7 +36,7 @@ static int initialized = 0; -int mme_initialize() +int mme_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/mme/s1ap-path.c -> open5gs_2.6.2.tar.xz/src/mme/s1ap-path.c
Changed
@@ -41,7 +41,7 @@ return OGS_OK; } -void s1ap_close() +void s1ap_close(void) { ogs_socknode_remove_all(&mme_self()->s1ap_list); ogs_socknode_remove_all(&mme_self()->s1ap_list6);
View file
open5gs_2.6.1.tar.xz/src/mme/sgsap-path.c -> open5gs_2.6.2.tar.xz/src/mme/sgsap-path.c
Changed
@@ -24,7 +24,7 @@ #include "sgsap-path.h" -int sgsap_open() +int sgsap_open(void) { mme_vlr_t *vlr = NULL; @@ -40,7 +40,7 @@ return OGS_OK; } -void sgsap_close() +void sgsap_close(void) { mme_vlr_t *vlr = NULL;
View file
open5gs_2.6.1.tar.xz/src/nrf/init.c -> open5gs_2.6.2.tar.xz/src/nrf/init.c
Changed
@@ -23,7 +23,7 @@ static void nrf_main(void *data); static int initialized = 0; -int nrf_initialize() +int nrf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/nrf/nnrf-handler.c -> open5gs_2.6.2.tar.xz/src/nrf/nnrf-handler.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -125,22 +125,39 @@ CASE(OGS_SBI_HTTP_METHOD_PATCH) PatchItemList = recvmsg->PatchItemList; if (!PatchItemList) { + ogs_error("No PatchItemList Array"); ogs_assert(true == ogs_sbi_server_send_error( stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PatchItemList Array", NULL)); + recvmsg, "No PatchItemList", NULL)); return false; } OpenAPI_list_for_each(PatchItemList, node) { OpenAPI_patch_item_t *patch_item = node->data; if (!patch_item) { + ogs_error("No PatchItem"); ogs_assert(true == ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PatchItemList", NULL)); + recvmsg, "No PatchItem", NULL)); return false; } + + if (patch_item->op != OpenAPI_patch_operation_replace) { + ogs_error("Unknown PatchItem.Operation %s", + OpenAPI_patch_operation_ToString(patch_item->op)); + continue; + } + + SWITCH(patch_item->path) + CASE(OGS_SBI_PATCH_PATH_NF_STATUS) + break; + CASE(OGS_SBI_PATCH_PATH_LOAD) + break; + DEFAULT + ogs_error("Unknown PatchItem.Path %s", patch_item->path); + END } response = ogs_sbi_build_response( @@ -171,14 +188,28 @@ OpenAPI_uri_scheme_e scheme = OpenAPI_uri_scheme_NULL; ogs_sockaddr_t *addr = NULL; + ogs_sbi_server_t *server = NULL; + ogs_sbi_header_t header; + ogs_uuid_t uuid; char idOGS_UUID_FORMATTED_LENGTH + 1; ogs_assert(stream); ogs_assert(recvmsg); + if (recvmsg->h.resource.component1) { + ogs_error("Invalid POST Format %s", + recvmsg->h.resource.component1); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Invalid POST Format", + recvmsg->h.resource.component1)); + return false; + } + SubscriptionData = recvmsg->SubscriptionData; if (!SubscriptionData) { + ogs_error("No SubscriptionData"); ogs_assert(true == ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "No SubscriptionData", NULL)); @@ -186,6 +217,7 @@ } if (!SubscriptionData->nf_status_notification_uri) { + ogs_error("No nfStatusNotificationUri"); ogs_assert(true == ogs_sbi_server_send_error( stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, @@ -198,6 +230,7 @@ subscription_data = ogs_sbi_subscription_data_add(); ogs_assert(subscription_data); + ogs_sbi_subscription_data_set_id(subscription_data, id); ogs_assert(subscription_data->id); @@ -276,54 +309,243 @@ OGS_SBI_SETUP_CLIENT(subscription_data, client); ogs_freeaddrinfo(addr); + /* + * The NRF validity is initially set in configuration. + */ + subscription_data->time.validity_duration = + ogs_app()->time.subscription.validity_duration; + if (subscription_data->time.validity_duration) { SubscriptionData->validity_time = ogs_sbi_localtime_string( ogs_time_now() + ogs_time_from_sec( subscription_data->time.validity_duration)); ogs_assert(SubscriptionData->validity_time); - subscription_data->t_validity = ogs_timer_add(ogs_app()->timer_mgr, - nrf_timer_subscription_validity, subscription_data); - ogs_assert(subscription_data->t_validity); + if (!subscription_data->t_validity) { + subscription_data->t_validity = + ogs_timer_add(ogs_app()->timer_mgr, + nrf_timer_subscription_validity, subscription_data); + ogs_assert(subscription_data->t_validity); + } ogs_timer_start(subscription_data->t_validity, ogs_time_from_sec(subscription_data->time.validity_duration)); } - recvmsg->http.location = recvmsg->h.uri; + ogs_info("%s Subscription created until %s validity_duration:%d", + subscription_data->id, + SubscriptionData->validity_time, + subscription_data->time.validity_duration); + + /* Location */ + server = ogs_sbi_server_from_stream(stream); + ogs_assert(server); + + memset(&header, 0, sizeof(header)); + header.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM; + header.api.version = (char *)OGS_SBI_API_V1; + header.resource.component0 = + (char *)OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS; + header.resource.component1 = subscription_data->id; + + recvmsg->http.location = ogs_sbi_server_uri(server, &header); + status = OGS_SBI_HTTP_STATUS_CREATED; response = ogs_sbi_build_response(recvmsg, status); ogs_assert(response); ogs_assert(true == ogs_sbi_server_send_response(stream, response)); + if (recvmsg->http.location) + ogs_free(recvmsg->http.location); + return true; } -bool nrf_nnrf_handle_nf_status_unsubscribe( +bool nrf_nnrf_handle_nf_status_update( ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg) { + ogs_sbi_response_t *response = NULL; + + OpenAPI_list_t *PatchItemList = NULL; + OpenAPI_lnode_t *node; + + ogs_sbi_message_t sendmsg; + OpenAPI_subscription_data_t SubscriptionData; + char *validity_time = NULL; + ogs_sbi_subscription_data_t *subscription_data = NULL; + ogs_assert(stream); ogs_assert(recvmsg); + memset(&SubscriptionData, 0, sizeof(SubscriptionData)); + + if (!recvmsg->h.resource.component1) { + ogs_error("No SubscriptionId"); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No SubscriptionId", NULL)); + return false; + } + subscription_data = ogs_sbi_subscription_data_find( recvmsg->h.resource.component1); - if (subscription_data) { - ogs_sbi_response_t *response = NULL; - ogs_sbi_subscription_data_remove(subscription_data); + if (!subscription_data) { + ogs_error("%s Not found", recvmsg->h.resource.component1); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + recvmsg, "Not found", recvmsg->h.resource.component1)); + return false; + } + ogs_assert(subscription_data->id); - response = ogs_sbi_build_response( - recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); + PatchItemList = recvmsg->PatchItemList; + if (!PatchItemList) { + ogs_error("%s No PatchItemList Array", subscription_data->id); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No PatchItemList", subscription_data->id)); + return false; + } + + OpenAPI_list_for_each(PatchItemList, node) { + OpenAPI_patch_item_t *patch_item = node->data; + if (!patch_item) { + ogs_error("No PatchItem"); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No PatchItem", NULL)); + return false; + } + + if (patch_item->op != OpenAPI_patch_operation_replace) { + ogs_error("Unknown PatchItem.Operation %s", + OpenAPI_patch_operation_ToString(patch_item->op)); + continue; + } + + SWITCH(patch_item->path) + CASE(OGS_SBI_PATCH_PATH_VALIDITY_TIME) + if (patch_item->value && patch_item->value->json) + validity_time = + cJSON_GetStringValue(patch_item->value->json); + break; + DEFAULT + ogs_error("Unknown PatchItem.Path %s", patch_item->path); + END + } + + if (validity_time) { + ogs_time_t time, validity; + + if (ogs_sbi_time_from_string(&time, validity_time) == false) { + ogs_error("%s Subscription updated until %s parser error", + subscription_data->id, validity_time); + goto end; + } + + validity = time - ogs_time_now(); + if (validity < 0) { + ogs_error("%s Subscription updated until %s validity:%d.%06d", + subscription_data->id, validity_time, + (int)ogs_time_sec(validity), (int)ogs_time_usec(validity)); + goto end; + } + + /* + * The NRF validity is updated if NF sent the PATCH Request. + */ + subscription_data->time.validity_duration = + OGS_SBI_VALIDITY_SEC(validity); + + if (!subscription_data->t_validity) { + subscription_data->t_validity = + ogs_timer_add(ogs_app()->timer_mgr, + nrf_timer_subscription_validity, subscription_data); + ogs_assert(subscription_data->t_validity); + } + ogs_timer_start(subscription_data->t_validity, + ogs_time_from_sec(subscription_data->time.validity_duration)); + + ogs_info("%s Subscription updated until %s " + "duration:%d,validity:%d.%06d", + subscription_data->id, validity_time, + subscription_data->time.validity_duration, + (int)ogs_time_sec(validity), (int)ogs_time_usec(validity)); + + /* To send SubscriptionData to the NF */ + memset(&sendmsg, 0, sizeof(sendmsg)); + sendmsg.SubscriptionData = &SubscriptionData; + + /* Mandatory */ + SubscriptionData.nf_status_notification_uri = + subscription_data->notification_uri; + + /* Validity Time */ + SubscriptionData.validity_time = ogs_sbi_localtime_string( + ogs_time_now() + ogs_time_from_sec( + subscription_data->time.validity_duration)); + ogs_assert(SubscriptionData.validity_time); + + response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); ogs_assert(true == ogs_sbi_server_send_response(stream, response)); - } else { - ogs_error("Not found %s", recvmsg->h.resource.component1); + + ogs_free(SubscriptionData.validity_time); + + return true; + } + +end: + response = ogs_sbi_build_response( + recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); + ogs_assert(response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); + + return true; +} + +bool nrf_nnrf_handle_nf_status_unsubscribe( + ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg) +{ + ogs_sbi_response_t *response = NULL; + ogs_sbi_subscription_data_t *subscription_data = NULL; + + ogs_assert(stream); + ogs_assert(recvmsg); + + if (!recvmsg->h.resource.component1) { + ogs_error("No SubscriptionId"); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No SubscriptionId", NULL)); + return false; + } + + subscription_data = ogs_sbi_subscription_data_find( + recvmsg->h.resource.component1); + if (!subscription_data) { + ogs_error("%s Not found", recvmsg->h.resource.component1); ogs_assert(true == ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, recvmsg, "Not found", recvmsg->h.resource.component1)); + return false; } + ogs_assert(subscription_data->id); + ogs_sbi_subscription_data_remove(subscription_data); + + response = ogs_sbi_build_response( + recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); + ogs_assert(response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); + return true; }
View file
open5gs_2.6.1.tar.xz/src/nrf/nnrf-handler.h -> open5gs_2.6.2.tar.xz/src/nrf/nnrf-handler.h
Changed
@@ -34,6 +34,8 @@ bool nrf_nnrf_handle_nf_status_subscribe( ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg); +bool nrf_nnrf_handle_nf_status_update( + ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg); bool nrf_nnrf_handle_nf_status_unsubscribe( ogs_sbi_stream_t *stream, ogs_sbi_message_t *recvmsg);
View file
open5gs_2.6.1.tar.xz/src/nrf/nrf-sm.c -> open5gs_2.6.2.tar.xz/src/nrf/nrf-sm.c
Changed
@@ -166,6 +166,10 @@ nrf_nnrf_handle_nf_status_subscribe(stream, &message); break; + CASE(OGS_SBI_HTTP_METHOD_PATCH) + nrf_nnrf_handle_nf_status_update(stream, &message); + break; + CASE(OGS_SBI_HTTP_METHOD_DELETE) nrf_nnrf_handle_nf_status_unsubscribe(stream, &message); break; @@ -254,7 +258,7 @@ subscription_data = e->subscription_data; ogs_assert(subscription_data); - ogs_info("%s Subscription validity expired", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break;
View file
open5gs_2.6.1.tar.xz/src/nssf/context.c -> open5gs_2.6.2.tar.xz/src/nssf/context.c
Changed
@@ -347,7 +347,7 @@ return ogs_uridup(ogs_app()->sbi.server.no_tls == false, nsi->addr, &h); } -int get_nsi_load() +int get_nsi_load(void) { return (((ogs_pool_size(&nssf_nsi_pool) - ogs_pool_avail(&nssf_nsi_pool)) * 100) /
View file
open5gs_2.6.1.tar.xz/src/nssf/init.c -> open5gs_2.6.2.tar.xz/src/nssf/init.c
Changed
@@ -23,7 +23,7 @@ static void nssf_main(void *data); static int initialized = 0; -int nssf_initialize() +int nssf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/nssf/nssf-sm.c -> open5gs_2.6.2.tar.xz/src/nssf/nssf-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -182,8 +182,21 @@ ogs_nnrf_nfm_handle_nf_status_subscribe( subscription_data, &message); } else { + ogs_error("HTTP response error : %d", + message.res_status); + } + break; + + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -193,7 +206,9 @@ ogs_sbi_subscription_data_remove(subscription_data); } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -252,11 +267,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + default: ogs_error("Unknown timer%s:%d", ogs_timer_get_name(e->h.timer_id), e->h.timer_id);
View file
open5gs_2.6.1.tar.xz/src/pcf/context.c -> open5gs_2.6.2.tar.xz/src/pcf/context.c
Changed
@@ -183,6 +183,9 @@ ogs_fsm_fini(&pcf_ue->sm, &e); /* Free SBI object memory */ + if (ogs_list_count(&pcf_ue->sbi.xact_list)) + ogs_error("UE transaction %d", + ogs_list_count(&pcf_ue->sbi.xact_list)); ogs_sbi_object_free(&pcf_ue->sbi); pcf_sess_remove_all(pcf_ue); @@ -211,7 +214,7 @@ ogs_pool_free(&pcf_ue_pool, pcf_ue); } -void pcf_ue_remove_all() +void pcf_ue_remove_all(void) { pcf_ue_t *pcf_ue = NULL, *next = NULL;; @@ -293,6 +296,9 @@ ogs_fsm_fini(&sess->sm, &e); /* Free SBI object memory */ + if (ogs_list_count(&sess->sbi.xact_list)) + ogs_error("Session transaction %d", + ogs_list_count(&sess->sbi.xact_list)); ogs_sbi_object_free(&sess->sbi); pcf_app_remove_all(sess); @@ -589,7 +595,7 @@ return pcf_app_find(atoll(app_session_id)); } -int get_pcf_load() +int get_pcf_load(void) { if (ogs_pool_avail(&pcf_ue_pool) / ogs_pool_size(&pcf_ue_pool) < ogs_pool_avail(&pcf_sess_pool) /
View file
open5gs_2.6.1.tar.xz/src/pcf/init.c -> open5gs_2.6.2.tar.xz/src/pcf/init.c
Changed
@@ -24,7 +24,7 @@ static void pcf_main(void *data); static int initialized = 0; -int pcf_initialize() +int pcf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/pcf/metrics.c -> open5gs_2.6.2.tar.xz/src/pcf/metrics.c
Changed
@@ -40,7 +40,8 @@ for (i = 0; i < len; i++) { dsti = ogs_metrics_spec_new(ctx, srci.type, srci.name, srci.description, - srci.initial_val, srci.num_labels, srci.labels); + srci.initial_val, srci.num_labels, srci.labels, + NULL); } return OGS_OK; }
View file
open5gs_2.6.1.tar.xz/src/pcf/nbsf-build.c -> open5gs_2.6.2.tar.xz/src/pcf/nbsf-build.c
Changed
@@ -52,6 +52,7 @@ (char *)OGS_SBI_RESOURCE_NAME_PCF_BINDINGS; memset(&PcfBinding, 0, sizeof(PcfBinding)); + memset(&sNssai, 0, sizeof(sNssai)); PcfBinding.supi = pcf_ue->supi; PcfBinding.gpsi = pcf_ue->gpsi; @@ -135,7 +136,6 @@ else OpenAPI_list_free(PcfIpEndPointList); - memset(&sNssai, 0, sizeof(sNssai)); sNssai.sst = sess->s_nssai.sst; sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd); PcfBinding.snssai = &sNssai;
View file
open5gs_2.6.1.tar.xz/src/pcf/npcf-handler.c -> open5gs_2.6.2.tar.xz/src/pcf/npcf-handler.c
Changed
@@ -314,7 +314,7 @@ if (SmPolicyContextData->ipv6_frame_route_list) { OpenAPI_lnode_t *node = NULL; - OpenAPI_clear_and_free_string_list(sess->ipv4_frame_route_list); + OpenAPI_clear_and_free_string_list(sess->ipv6_frame_route_list); sess->ipv6_frame_route_list = OpenAPI_list_create(); OpenAPI_list_for_each(SmPolicyContextData->ipv6_frame_route_list, node) { if (!node->data) @@ -475,6 +475,9 @@ server = ogs_sbi_server_from_stream(stream); ogs_assert(server); + memset(&ims_data, 0, sizeof(ims_data)); + memset(&session_data, 0, sizeof(ogs_session_data_t)); + AppSessionContext = recvmsg->AppSessionContext; if (!AppSessionContext) { strerror = ogs_msprintf("%s:%d No AppSessionContext", @@ -530,8 +533,6 @@ ogs_assert(AscReqData->supp_feat); } - memset(&ims_data, 0, sizeof(ims_data)); - MediaComponentList = AscReqData->med_components; OpenAPI_list_for_each(MediaComponentList, node) { MediaComponentMap = node->data; @@ -613,7 +614,6 @@ OGS_SBI_SETUP_CLIENT(&app_session->naf, client); ogs_freeaddrinfo(addr); - memset(&session_data, 0, sizeof(ogs_session_data_t)); rv = ogs_dbi_session_data( pcf_ue->supi, &sess->s_nssai, sess->dnn, &session_data); if (rv != OGS_OK) { @@ -941,6 +941,9 @@ ogs_assert(stream); ogs_assert(recvmsg); + memset(&ims_data, 0, sizeof(ims_data)); + memset(&session_data, 0, sizeof(ogs_session_data_t)); + AppSessionContextUpdateDataPatch = recvmsg->AppSessionContextUpdateDataPatch; if (!AppSessionContextUpdateDataPatch) { @@ -965,8 +968,6 @@ goto cleanup; } - memset(&ims_data, 0, sizeof(ims_data)); - MediaComponentList = AscUpdateData->med_components; OpenAPI_list_for_each(MediaComponentList, node) { MediaComponentMap = node->data; @@ -1033,7 +1034,6 @@ } } - memset(&session_data, 0, sizeof(ogs_session_data_t)); rv = ogs_dbi_session_data( pcf_ue->supi, &sess->s_nssai, sess->dnn, &session_data); if (rv != OGS_OK) {
View file
open5gs_2.6.1.tar.xz/src/pcf/nsmf-build.c -> open5gs_2.6.2.tar.xz/src/pcf/nsmf-build.c
Changed
@@ -34,6 +34,9 @@ ogs_assert(sess->sm_policy_id); ogs_assert(sess->notification_uri); + memset(&SmPolicyNotification, 0, sizeof(SmPolicyNotification)); + memset(&message, 0, sizeof(message)); + server = ogs_list_first(&ogs_sbi_self()->server_list); if (!server) { ogs_error("No server"); @@ -47,8 +50,6 @@ header.resource.component1 = sess->sm_policy_id; header.resource.component2 = (char *)OGS_SBI_RESOURCE_NAME_UPDATE; - memset(&SmPolicyNotification, 0, sizeof(SmPolicyNotification)); - SmPolicyNotification.resource_uri = ogs_sbi_server_uri(server, &header); if (!SmPolicyNotification.resource_uri) { ogs_error("No resource_uri"); @@ -60,7 +61,6 @@ SmPolicyNotification.sm_policy_decision = SmPolicyDecision; - memset(&message, 0, sizeof(message)); message.h.method = (char *)OGS_SBI_HTTP_METHOD_POST; message.h.uri = ogs_msprintf("%s/%s", sess->notification_uri, OGS_SBI_RESOURCE_NAME_UPDATE);
View file
open5gs_2.6.1.tar.xz/src/pcf/pcf-sm.c -> open5gs_2.6.2.tar.xz/src/pcf/pcf-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -333,8 +333,21 @@ ogs_nnrf_nfm_handle_nf_status_subscribe( subscription_data, &message); } else { + ogs_error("HTTP response error : %d", + message.res_status); + } + break; + + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -344,7 +357,9 @@ ogs_sbi_subscription_data_remove(subscription_data); } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -582,11 +597,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("%s Subscription validity expired", - subscription_data->id); + ogs_error("%s Subscription validity expired", + subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/scp/init.c -> open5gs_2.6.2.tar.xz/src/scp/init.c
Changed
@@ -25,7 +25,7 @@ static int initialized = 0; -int scp_initialize() +int scp_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/scp/scp-sm.c -> open5gs_2.6.2.tar.xz/src/scp/scp-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -177,11 +177,26 @@ } break; + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); + } + break; + CASE(OGS_SBI_HTTP_METHOD_DELETE) if (message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { ogs_sbi_subscription_data_remove(subscription_data); } else { - ogs_error("HTTP response error : %d", + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", message.res_status); } break; @@ -238,11 +253,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/sgwc/init.c -> open5gs_2.6.2.tar.xz/src/sgwc/init.c
Changed
@@ -27,7 +27,7 @@ static int initialized = 0; -int sgwc_initialize() +int sgwc_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/sgwc/pfcp-sm.c -> open5gs_2.6.2.tar.xz/src/sgwc/pfcp-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -124,6 +124,16 @@ ogs_assert(xact); switch (message->h.type) { + case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); + break; + case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); + break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_pfcp_cp_handle_association_setup_request(node, xact, &message->pfcp_association_setup_request); @@ -174,6 +184,13 @@ OGS_PORT(&node->addr)); ogs_timer_start(node->t_no_heartbeat, ogs_app()->time.message.pfcp.no_heartbeat_duration); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); + + if (node->restoration_required == true) { + node->restoration_required = false; + ogs_error("PFCP restoration"); + } break; case OGS_FSM_EXIT_SIG: ogs_info("PFCP de-associated %s:%d", @@ -200,12 +217,12 @@ switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_request(node, xact, &message->pfcp_heartbeat_request)); break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_response(node, xact, &message->pfcp_heartbeat_response)); break;
View file
open5gs_2.6.1.tar.xz/src/sgwu/context.c -> open5gs_2.6.2.tar.xz/src/sgwu/context.c
Changed
@@ -189,7 +189,7 @@ void sgwu_sess_remove_all(void) { - sgwu_sess_t *sess = NULL, *next = NULL;; + sgwu_sess_t *sess = NULL, *next = NULL; ogs_list_for_each_safe(&self.sess_list, next, sess) { sgwu_sess_remove(sess);
View file
open5gs_2.6.1.tar.xz/src/sgwu/init.c -> open5gs_2.6.2.tar.xz/src/sgwu/init.c
Changed
@@ -26,7 +26,7 @@ static int initialized = 0; -int sgwu_initialize() +int sgwu_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/sgwu/pfcp-sm.c -> open5gs_2.6.2.tar.xz/src/sgwu/pfcp-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -20,6 +20,7 @@ #include "pfcp-path.h" #include "sxa-handler.h" +static void pfcp_restoration(ogs_pfcp_node_t *node); static void node_timeout(ogs_pfcp_xact_t *xact, void *data); void sgwu_pfcp_state_initial(ogs_fsm_t *s, sgwu_event_t *e) @@ -120,6 +121,16 @@ ogs_assert(xact); switch (message->h.type) { + case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); + break; + case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); + break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_pfcp_up_handle_association_setup_request(node, xact, &message->pfcp_association_setup_request); @@ -170,6 +181,14 @@ OGS_PORT(&node->addr)); ogs_timer_start(node->t_no_heartbeat, ogs_app()->time.message.pfcp.no_heartbeat_duration); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); + + if (node->restoration_required == true) { + pfcp_restoration(node); + node->restoration_required = false; + ogs_error("PFCP restoration"); + } break; case OGS_FSM_EXIT_SIG: ogs_info("PFCP de-associated %s:%d", @@ -188,14 +207,60 @@ switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_request(node, xact, &message->pfcp_heartbeat_request)); + if (node->restoration_required == true) { + if (node->t_association) { + /* + * node->t_association that the PFCP entity attempts an association. + * + * In this case, even if Remote PFCP entity is restarted, + * PFCP restoration must be performed after PFCP association. + * + * Otherwise, Session related PFCP cannot be initiated + * because the peer PFCP entity is in a de-associated state. + */ + OGS_FSM_TRAN(s, sgwu_pfcp_state_will_associate); + } else { + + /* + * If the peer PFCP entity is performing the association, + * Restoration can be performed immediately. + */ + pfcp_restoration(node); + node->restoration_required = false; + ogs_error("PFCP restoration"); + } + } break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_response(node, xact, &message->pfcp_heartbeat_response)); + if (node->restoration_required == true) { + if (node->t_association) { + /* + * node->t_association that the PFCP entity attempts an association. + * + * In this case, even if Remote PFCP entity is restarted, + * PFCP restoration must be performed after PFCP association. + * + * Otherwise, Session related PFCP cannot be initiated + * because the peer PFCP entity is in a de-associated state. + */ + OGS_FSM_TRAN(s, sgwu_pfcp_state_will_associate); + } else { + + /* + * If the peer PFCP entity is performing the association, + * Restoration can be performed immediately. + */ + pfcp_restoration(node); + node->restoration_required = false; + ogs_error("PFCP restoration"); + } + } break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCPREQ has already been associated %s:%d", @@ -288,6 +353,19 @@ } } +static void pfcp_restoration(ogs_pfcp_node_t *node) +{ + sgwu_sess_t *sess = NULL, *next = NULL; + + ogs_list_for_each_safe(&sgwu_self()->sess_list, next, sess) { + if (node == sess->pfcp_node) { + ogs_info("DELETION: F-SEIDUP:0x%lx CP:0x%lx", + (long)sess->sgwu_sxa_seid, (long)sess->sgwc_sxa_f_seid.seid); + sgwu_sess_remove(sess); + } + } +} + static void node_timeout(ogs_pfcp_xact_t *xact, void *data) { int rv;
View file
open5gs_2.6.1.tar.xz/src/smf/context.c -> open5gs_2.6.2.tar.xz/src/smf/context.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -48,7 +48,7 @@ } /* Shall Gy session be used according to policy and state? 1: yes, 0: no, -1: reject */ -int smf_use_gy_iface() +int smf_use_gy_iface(void) { switch (smf_self()->ctf_config.enabled) { case SMF_CTF_ENABLED_AUTO: @@ -719,8 +719,6 @@ do { const char *mcc = NULL, *mnc = NULL; int num_of_tac = 0; - ogs_uint24_t tacOGS_MAX_NUM_OF_TAI; - int num_of_range = 0; ogs_uint24_t startOGS_MAX_NUM_OF_TAI; ogs_uint24_t endOGS_MAX_NUM_OF_TAI; @@ -767,55 +765,25 @@ } } else if (!strcmp(tai_key, "tac")) { ogs_yaml_iter_t tac_iter; - ogs_yaml_iter_recurse( - &tai_iter, &tac_iter); + ogs_yaml_iter_recurse(&tai_iter, + &tac_iter); ogs_assert(ogs_yaml_iter_type( - &tac_iter) != - YAML_MAPPING_NODE); - - do { - const char *v = NULL; - - ogs_assert(num_of_tac < - OGS_MAX_NUM_OF_TAI); - if (ogs_yaml_iter_type( - &tac_iter) == - YAML_SEQUENCE_NODE) { - if (!ogs_yaml_iter_next( - &tac_iter)) - break; - } - - v = ogs_yaml_iter_value( - &tac_iter); - if (v) { - tacnum_of_tac.v = atoi(v); - num_of_tac++; - } - } while ( - ogs_yaml_iter_type(&tac_iter) == - YAML_SEQUENCE_NODE); - } else if (!strcmp(tai_key, "range")) { - ogs_yaml_iter_t range_iter; - ogs_yaml_iter_recurse( - &tai_iter, &range_iter); - ogs_assert(ogs_yaml_iter_type( - &range_iter) != + &tac_iter) != YAML_MAPPING_NODE); do { char *v = NULL; char *low = NULL, *high = NULL; if (ogs_yaml_iter_type( - &range_iter) == + &tac_iter) == YAML_SEQUENCE_NODE) { if (!ogs_yaml_iter_next( - &range_iter)) + &tac_iter)) break; } v = (char *)ogs_yaml_iter_value( - &range_iter); + &tac_iter); if (v) { low = strsep(&v, "-"); if (low && strlen(low) == 0) @@ -826,20 +794,36 @@ strlen(high) == 0) high = NULL; - if (low && high) { - ogs_assert( - num_of_range < + if (low) { + ogs_assert(num_of_tac < OGS_MAX_NUM_OF_TAI); - startnum_of_range.v = + startnum_of_tac.v = atoi(low); - endnum_of_range.v = - atoi(high); - num_of_range++; + if (high) { + endnum_of_tac.v = + atoi(high); + if (endnum_of_tac. + v < + start + num_of_tac. + v) + ogs_error( + "Invalid TAI " + "range: LOW:%s," + "HIGH:%s", + low, high); + else + num_of_tac++; + } else { + endnum_of_tac.v = + start + num_of_tac.v; + num_of_tac++; + } } } } while ( - ogs_yaml_iter_type( - &range_iter) == + ogs_yaml_iter_type(&tac_iter) == YAML_SEQUENCE_NODE); } else @@ -847,47 +831,55 @@ tai_key); } - if (mcc && mnc) { - int i; - - if (num_of_range) { - ogs_assert(num_of_nr_tai_range < - OGS_MAX_NUM_OF_TAI); - ogs_plmn_id_build( - &smf_info->nr_tai_range - num_of_nr_tai_range. - plmn_id, - atoi(mcc), atoi(mnc), - strlen(mnc)); - for (i = 0; i < num_of_range; i++) { - smf_info->nr_tai_range - num_of_nr_tai_range. - starti.v = starti.v; - smf_info->nr_tai_range - num_of_nr_tai_range. - endi.v = endi.v; - } - smf_info->nr_tai_range - num_of_nr_tai_range. - num_of_tac_range = - num_of_range; - num_of_nr_tai_range++; - } else if (num_of_tac) { - for (i = 0; i < num_of_tac; i++) { + if (mcc && mnc && num_of_tac) { + int tac, num_of_tac_range = 0; + for (tac = 0; tac < num_of_tac; tac++) { + ogs_assert(endtac.v >= + starttac.v); + if (starttac.v == endtac.v) { ogs_assert(num_of_nr_tai < OGS_MAX_NUM_OF_TAI); ogs_plmn_id_build( - &smf_info->nr_tai - num_of_nr_tai.plmn_id, + &smf_info->nr_tai + num_of_nr_tai.plmn_id, atoi(mcc), atoi(mnc), strlen(mnc)); smf_info->nr_tainum_of_nr_tai. - tac.v = taci.v; + tac.v = starttac.v; num_of_nr_tai++; + } else if (starttac.v < + endtac.v) { + ogs_assert(num_of_nr_tai_range < + OGS_MAX_NUM_OF_TAI); + ogs_assert(num_of_tac_range < + OGS_MAX_NUM_OF_TAI); + smf_info->nr_tai_range + num_of_nr_tai_range. + startnum_of_tac_range.v = + starttac.v; + smf_info->nr_tai_range + num_of_nr_tai_range. + endnum_of_tac_range.v = + endtac.v; + num_of_tac_range++; } - } else { - ogs_warn("No TAC info"); } + if (num_of_tac_range) { + ogs_plmn_id_build( + &smf_info->nr_tai_range + num_of_nr_tai_range.plmn_id, + atoi(mcc), atoi(mnc), + strlen(mnc)); + smf_info->nr_tai_range + num_of_nr_tai_range. + num_of_tac_range = + num_of_tac_range; + num_of_nr_tai_range++; + } + } else { + ogs_warn("Ignore tai : mcc(%p), " + "mnc(%p), num_of_tac(%d)", + mcc, mnc, num_of_tac); } } while (ogs_yaml_iter_type(&tai_array) == YAML_SEQUENCE_NODE); @@ -898,7 +890,6 @@ } else ogs_warn("unknown key `%s`", info_key); } - } while (ogs_yaml_iter_type(&info_array) == YAML_SEQUENCE_NODE); @@ -3116,7 +3107,7 @@ ogs_info("Removed Number of SMF-Sessions is now %d", num_of_smf_sess); } -int get_sess_load() +int get_sess_load(void) { return (((ogs_pool_size(&smf_sess_pool) - ogs_pool_avail(&smf_sess_pool)) * 100) /
View file
open5gs_2.6.1.tar.xz/src/smf/gsm-sm.c -> open5gs_2.6.2.tar.xz/src/smf/gsm-sm.c
Changed
@@ -919,7 +919,7 @@ NGAP_Cause_PR_nas, NGAP_CauseNas_normal_release); ogs_assert(param.n2smbuf); - param.skip_ind = false; + param.skip_ind = true; smf_namf_comm_send_n1_n2_message_transfer(sess, ¶m); } else {
View file
open5gs_2.6.1.tar.xz/src/smf/gy-path.c -> open5gs_2.6.2.tar.xz/src/smf/gy-path.c
Changed
@@ -566,7 +566,7 @@ struct sess_state *sess_data = NULL, *svg; struct session *session = NULL; int new; - const char *service_context_id = "open5gs-smfd@open5gs.org"; + const char *service_context_id = "32251@3gpp.org"; uint32_t timestamp; ogs_assert(xact);
View file
open5gs_2.6.1.tar.xz/src/smf/init.c -> open5gs_2.6.2.tar.xz/src/smf/init.c
Changed
@@ -29,7 +29,7 @@ static int initialized = 0; -int smf_initialize() +int smf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/smf/metrics.c -> open5gs_2.6.2.tar.xz/src/smf/metrics.c
Changed
@@ -39,7 +39,8 @@ for (i = 0; i < len; i++) { dsti = ogs_metrics_spec_new(ctx, srci.type, srci.name, srci.description, - srci.initial_val, srci.num_labels, srci.labels); + srci.initial_val, srci.num_labels, srci.labels, + NULL); } return OGS_OK; }
View file
open5gs_2.6.1.tar.xz/src/smf/pfcp-sm.c -> open5gs_2.6.2.tar.xz/src/smf/pfcp-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -22,6 +22,7 @@ #include "n4-handler.h" +static void reselect_upf(ogs_pfcp_node_t *node); static void node_timeout(ogs_pfcp_xact_t *xact, void *data); void smf_pfcp_state_initial(ogs_fsm_t *s, smf_event_t *e) @@ -126,6 +127,16 @@ ogs_assert(xact); switch (message->h.type) { + case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); + break; + case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); + break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_pfcp_cp_handle_association_setup_request(node, xact, &message->pfcp_association_setup_request); @@ -176,6 +187,14 @@ OGS_PORT(&node->addr)); ogs_timer_start(node->t_no_heartbeat, ogs_app()->time.message.pfcp.no_heartbeat_duration); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); + + if (node->restoration_required == true) { + /* PFCP Restoration is being performed after PFCP association */ + node->restoration_required = false; + ogs_error("PFCP restoration"); + } break; case OGS_FSM_EXIT_SIG: ogs_info("PFCP de-associated %s:%d", @@ -204,14 +223,57 @@ switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_request(node, xact, &message->pfcp_heartbeat_request)); + if (node->restoration_required == true) { + if (node->t_association) { + /* + * node->t_association that the PFCP entity attempts an association. + * + * In this case, even if Remote PFCP entity is restarted, + * PFCP restoration must be performed after PFCP association. + * + * Otherwise, Session related PFCP cannot be initiated + * because the peer PFCP entity is in a de-associated state. + */ + OGS_FSM_TRAN(s, smf_pfcp_state_will_associate); + } else { + + /* + * If the peer PFCP entity is performing the association, + * Restoration can be performed immediately. + */ + node->restoration_required = false; + ogs_error("PFCP restoration"); + } + } break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_response(node, xact, &message->pfcp_heartbeat_response)); + if (node->restoration_required == true) { + /* + * node->t_association that the PFCP entity attempts an association. + * + * In this case, even if Remote PFCP entity is restarted, + * PFCP restoration must be performed after PFCP association. + * + * Otherwise, Session related PFCP cannot be initiated + * because the peer PFCP entity is in a de-associated state. + */ + if (node->t_association) { + OGS_FSM_TRAN(s, smf_pfcp_state_will_associate); + } else { + /* + * If the peer PFCP entity is performing the association, + * Restoration can be performed immediately. + */ + node->restoration_required = false; + ogs_error("PFCP restoration"); + } + } break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCPREQ has already been associated %s:%d", @@ -347,34 +409,48 @@ } } -static void node_timeout(ogs_pfcp_xact_t *xact, void *data) +static void reselect_upf(ogs_pfcp_node_t *node) { - int r, rv; - - smf_event_t *e = NULL; - uint8_t type; - ogs_pfcp_node_t *node = NULL; + int r; smf_ue_t *smf_ue = NULL, *next_ue = NULL;; + ogs_pfcp_node_t *iter = NULL; - ogs_assert(xact); - type = xact->seq0.type; + ogs_assert(node); - switch (type) { - case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - node = data; - ogs_assert(node); + if (node->restoration_required == true) { + ogs_error("UPF has already been restarted"); + return; + } + + ogs_list_for_each(&ogs_pfcp_self()->pfcp_peer_list, iter) { + if (iter == node) + continue; + if (OGS_FSM_CHECK(&iter->sm, smf_pfcp_state_associated)) + break; + } - ogs_list_for_each_safe(&smf_self()->smf_ue_list, next_ue, smf_ue) { - smf_sess_t *sess = NULL, *next_sess = NULL;; - ogs_assert(smf_ue); + if (iter == NULL) { + ogs_error("No UPF avaiable"); + return; + } - ogs_list_for_each_safe(&smf_ue->sess_list, next_sess, sess) { - ogs_assert(sess); + ogs_list_for_each_safe(&smf_self()->smf_ue_list, next_ue, smf_ue) { + smf_sess_t *sess = NULL, *next_sess = NULL;; + ogs_assert(smf_ue); + + ogs_list_for_each_safe(&smf_ue->sess_list, next_sess, sess) { + ogs_assert(sess); + if (sess->epc) { + ogs_error("%s:%s EPC restoration is not implemented", + smf_ue->imsi_bcd, sess->session.name); + } else { ogs_assert(sess->sm_context_ref); if (node == sess->pfcp_node) { smf_npcf_smpolicycontrol_param_t param; + ogs_info("%s:%d SMF-initiated Deletion", + smf_ue->supi, sess->psi); ogs_assert(sess->sm_context_ref); memset(¶m, 0, sizeof(param)); r = smf_sbi_discover_and_send( @@ -387,6 +463,35 @@ } } } + } +} + +static void node_timeout(ogs_pfcp_xact_t *xact, void *data) +{ + int rv; + + smf_event_t *e = NULL; + uint8_t type; + + ogs_assert(xact); + type = xact->seq0.type; + + switch (type) { + case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: + ogs_assert(data); + + + /* + * The code below is not secure. + * Session does not differentiate between EPC and 5GC. + * And, it does not check whether there are other PFCP Nodes. + * + * So, UPF redundancy will be implemented later. + * + * We plan to do this again after testing with restoration first + * in case peer PFCP restarts. + */ + reselect_upf(data); e = smf_event_new(SMF_EVT_N4_NO_HEARTBEAT); e->pfcp_node = data;
View file
open5gs_2.6.1.tar.xz/src/smf/smf-sm.c -> open5gs_2.6.2.tar.xz/src/smf/smf-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -695,12 +695,28 @@ } break; + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (sbi_message.res_status == OGS_SBI_HTTP_STATUS_OK || + sbi_message.res_status == + OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &sbi_message); + } else { + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", + sbi_message.res_status); + } + break; + CASE(OGS_SBI_HTTP_METHOD_DELETE) if (sbi_message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { ogs_sbi_subscription_data_remove(subscription_data); } else { - ogs_error("HTTP response error : %d", + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", sbi_message.res_status); } break; @@ -826,11 +842,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/smf/timer.c -> open5gs_2.6.2.tar.xz/src/smf/timer.c
Changed
@@ -32,6 +32,8 @@ return OGS_TIMER_NAME_NF_INSTANCE_VALIDITY; case OGS_TIMER_SUBSCRIPTION_VALIDITY: return OGS_TIMER_NAME_SUBSCRIPTION_VALIDITY; + case OGS_TIMER_SUBSCRIPTION_PATCH: + return OGS_TIMER_NAME_SUBSCRIPTION_PATCH; case OGS_TIMER_SBI_CLIENT_WAIT: return OGS_TIMER_NAME_SBI_CLIENT_WAIT; case SMF_TIMER_PFCP_ASSOCIATION:
View file
open5gs_2.6.1.tar.xz/src/udm/context.c -> open5gs_2.6.2.tar.xz/src/udm/context.c
Changed
@@ -197,7 +197,7 @@ ogs_pool_free(&udm_ue_pool, udm_ue); } -void udm_ue_remove_all() +void udm_ue_remove_all(void) { udm_ue_t *udm_ue = NULL, *next = NULL;; @@ -237,7 +237,7 @@ return ogs_pool_cycle(&udm_ue_pool, udm_ue); } -int get_ue_load() +int get_ue_load(void) { return (((ogs_pool_size(&udm_ue_pool) - ogs_pool_avail(&udm_ue_pool)) * 100) /
View file
open5gs_2.6.1.tar.xz/src/udm/init.c -> open5gs_2.6.2.tar.xz/src/udm/init.c
Changed
@@ -23,7 +23,7 @@ static void udm_main(void *data); static int initialized = 0; -int udm_initialize() +int udm_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/udm/udm-sm.c -> open5gs_2.6.2.tar.xz/src/udm/udm-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -250,8 +250,21 @@ ogs_nnrf_nfm_handle_nf_status_subscribe( subscription_data, &message); } else { + ogs_error("HTTP response error : %d", + message.res_status); + } + break; + + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -261,7 +274,9 @@ ogs_sbi_subscription_data_remove(subscription_data); } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -393,11 +408,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("%s Subscription validity expired", - subscription_data->id); + ogs_error("%s Subscription validity expired", + subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/src/udr/init.c -> open5gs_2.6.2.tar.xz/src/udr/init.c
Changed
@@ -23,7 +23,7 @@ static void udr_main(void *data); static int initialized = 0; -int udr_initialize() +int udr_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/udr/udr-sm.c -> open5gs_2.6.2.tar.xz/src/udr/udr-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -231,8 +231,21 @@ ogs_nnrf_nfm_handle_nf_status_subscribe( subscription_data, &message); } else { + ogs_error("HTTP response error : %d", + message.res_status); + } + break; + + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -242,7 +255,9 @@ ogs_sbi_subscription_data_remove(subscription_data); } else { ogs_error("%s HTTP response error %d", - subscription_data->id, message.res_status); + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); } break; @@ -298,11 +313,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("%s Subscription validity expired", - subscription_data->id); + ogs_error("%s Subscription validity expired", + subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + default: ogs_error("Unknown timer%s:%d", ogs_timer_get_name(e->h.timer_id), e->h.timer_id);
View file
open5gs_2.6.1.tar.xz/src/upf/context.c -> open5gs_2.6.2.tar.xz/src/upf/context.c
Changed
@@ -237,7 +237,7 @@ void upf_sess_remove_all(void) { - upf_sess_t *sess = NULL, *next = NULL;; + upf_sess_t *sess = NULL, *next = NULL; ogs_list_for_each_safe(&self.sess_list, next, sess) { upf_sess_remove(sess);
View file
open5gs_2.6.1.tar.xz/src/upf/gtp-path.c -> open5gs_2.6.2.tar.xz/src/upf/gtp-path.c
Changed
@@ -214,9 +214,18 @@ ogs_assert(true == ogs_pfcp_up_handle_pdr( pdr, OGS_GTPU_MSGTYPE_GPDU, recvbuf, &report)); + /* + * Issue #2210, Discussion #2208, #2209 + * + * Metrics reduce data plane performance. + * It should not be used on the UPF/SGW-U data plane + * until this issue is resolved. + */ +#if 0 upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_GTP_OUTDATAPKTN3UPF); upf_metrics_inst_by_qfi_add(pdr->qer->qfi, UPF_METR_CTR_GTP_OUTDATAVOLUMEQOSLEVELN3UPF, recvbuf->len); +#endif if (report.type.downlink_data_report) { ogs_assert(pdr->sess); @@ -395,9 +404,18 @@ ip_h = (struct ip *)pkbuf->data; ogs_assert(ip_h); + /* + * Issue #2210, Discussion #2208, #2209 + * + * Metrics reduce data plane performance. + * It should not be used on the UPF/SGW-U data plane + * until this issue is resolved. + */ +#if 0 upf_metrics_inst_global_inc(UPF_METR_GLOB_CTR_GTP_INDATAPKTN3UPF); upf_metrics_inst_by_qfi_add(qfi, UPF_METR_CTR_GTP_INDATAVOLUMEQOSLEVELN3UPF, pkbuf->len); +#endif pfcp_object = ogs_pfcp_object_find_by_teid(teid); if (!pfcp_object) {
View file
open5gs_2.6.1.tar.xz/src/upf/init.c -> open5gs_2.6.2.tar.xz/src/upf/init.c
Changed
@@ -27,7 +27,7 @@ static int initialized = 0; -int upf_initialize() +int upf_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/src/upf/metrics.c -> open5gs_2.6.2.tar.xz/src/upf/metrics.c
Changed
@@ -40,7 +40,8 @@ for (i = 0; i < len; i++) { dsti = ogs_metrics_spec_new(ctx, srci.type, srci.name, srci.description, - srci.initial_val, srci.num_labels, srci.labels); + srci.initial_val, srci.num_labels, srci.labels, + NULL); } return OGS_OK; }
View file
open5gs_2.6.1.tar.xz/src/upf/pfcp-sm.c -> open5gs_2.6.2.tar.xz/src/upf/pfcp-sm.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -25,6 +25,7 @@ #include "pfcp-path.h" #include "n4-handler.h" +static void pfcp_restoration(ogs_pfcp_node_t *node); static void node_timeout(ogs_pfcp_xact_t *xact, void *data); void upf_pfcp_state_initial(ogs_fsm_t *s, upf_event_t *e) @@ -125,6 +126,16 @@ ogs_assert(xact); switch (message->h.type) { + case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); + break; + case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: + ogs_expect(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); + break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_pfcp_up_handle_association_setup_request(node, xact, &message->pfcp_association_setup_request); @@ -175,6 +186,14 @@ OGS_PORT(&node->addr)); ogs_timer_start(node->t_no_heartbeat, ogs_app()->time.message.pfcp.no_heartbeat_duration); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); + + if (node->restoration_required == true) { + pfcp_restoration(node); + node->restoration_required = false; + ogs_error("PFCP restoration"); + } break; case OGS_FSM_EXIT_SIG: ogs_info("PFCP de-associated %s:%d", @@ -193,14 +212,59 @@ switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_request(node, xact, &message->pfcp_heartbeat_request)); + if (node->restoration_required == true) { + if (node->t_association) { + /* + * node->t_association that the PFCP entity attempts an association. + * + * In this case, even if Remote PFCP entity is restarted, + * PFCP restoration must be performed after PFCP association. + * + * Otherwise, Session related PFCP cannot be initiated + * because the peer PFCP entity is in a de-associated state. + */ + OGS_FSM_TRAN(s, upf_pfcp_state_will_associate); + } else { + + /* + * If the peer PFCP entity is performing the association, + * Restoration can be performed immediately. + */ + pfcp_restoration(node); + node->restoration_required = false; + ogs_error("PFCP restoration"); + } + } break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_assert(true == + ogs_expect(true == ogs_pfcp_handle_heartbeat_response(node, xact, &message->pfcp_heartbeat_response)); + if (node->restoration_required == true) { + /* + * node->t_association that the PFCP entity attempts an association. + * + * In this case, even if Remote PFCP entity is restarted, + * PFCP restoration must be performed after PFCP association. + * + * Otherwise, Session related PFCP cannot be initiated + * because the peer PFCP entity is in a de-associated state. + */ + if (node->t_association) { + OGS_FSM_TRAN(s, upf_pfcp_state_will_associate); + } else { + /* + * If the peer PFCP entity is performing the association, + * Restoration can be performed immediately. + */ + pfcp_restoration(node); + node->restoration_required = false; + ogs_error("PFCP restoration"); + } + } break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCPREQ has already been associated %s:%d", @@ -293,6 +357,23 @@ } } +static void pfcp_restoration(ogs_pfcp_node_t *node) +{ + upf_sess_t *sess = NULL, *next = NULL; + char buf1OGS_ADDRSTRLEN; + char buf2OGS_ADDRSTRLEN; + + ogs_list_for_each_safe(&upf_self()->sess_list, next, sess) { + if (node == sess->pfcp_node) { + ogs_info("DELETION: F-SEIDUP:0x%lx CP:0x%lx IPv4%s IPv6%s", + (long)sess->upf_n4_seid, (long)sess->smf_n4_f_seid.seid, + sess->ipv4 ? OGS_INET_NTOP(&sess->ipv4->addr, buf1) : "", + sess->ipv6 ? OGS_INET6_NTOP(&sess->ipv6->addr, buf2) : ""); + upf_sess_remove(sess); + } + } +} + static void node_timeout(ogs_pfcp_xact_t *xact, void *data) { int rv;
View file
open5gs_2.6.1.tar.xz/tests/af/af-sm.c -> open5gs_2.6.2.tar.xz/tests/af/af-sm.c
Changed
@@ -238,11 +238,26 @@ } break; + CASE(OGS_SBI_HTTP_METHOD_PATCH) + if (message.res_status == OGS_SBI_HTTP_STATUS_OK || + message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { + ogs_nnrf_nfm_handle_nf_status_update( + subscription_data, &message); + } else { + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", + message.res_status); + } + break; + CASE(OGS_SBI_HTTP_METHOD_DELETE) if (message.res_status == OGS_SBI_HTTP_STATUS_NO_CONTENT) { ogs_sbi_subscription_data_remove(subscription_data); } else { - ogs_error("HTTP response error : %d", + ogs_error("%s HTTP response error %d", + subscription_data->id ? + subscription_data->id : "Unknown", message.res_status); } break; @@ -421,11 +436,22 @@ subscription_data->subscr_cond.nf_type, subscription_data->subscr_cond.service_name)); - ogs_info("Subscription validity expired %s", + ogs_error("%s Subscription validity expired", subscription_data->id); ogs_sbi_subscription_data_remove(subscription_data); break; + case OGS_TIMER_SUBSCRIPTION_PATCH: + subscription_data = e->h.sbi.data; + ogs_assert(subscription_data); + + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_update(subscription_data)); + + ogs_info("%s Need to update Subscription", + subscription_data->id); + break; + case OGS_TIMER_SBI_CLIENT_WAIT: /* * ogs_pollset_poll() receives the time of the expiration
View file
open5gs_2.6.1.tar.xz/tests/af/init.c -> open5gs_2.6.2.tar.xz/tests/af/init.c
Changed
@@ -25,7 +25,7 @@ static int initialized = 0; -int af_initialize() +int af_initialize(void) { int rv;
View file
open5gs_2.6.1.tar.xz/tests/app/5gc-init.c -> open5gs_2.6.2.tar.xz/tests/app/5gc-init.c
Changed
@@ -82,7 +82,7 @@ * * If freeDiameter is not used, it uses a delay of less than 4 seconds. */ - ogs_msleep(500); + ogs_msleep(300); return OGS_OK;; }
View file
open5gs_2.6.1.tar.xz/tests/common/context.c -> open5gs_2.6.2.tar.xz/tests/common/context.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -96,6 +96,7 @@ static int test_context_validation(void) { ogs_socknode_t *snode = NULL; + int index = 0; snode = ogs_list_first(&test_self()->s1ap_list); if (snode) test_self()->s1ap_addr = snode->addr; @@ -107,25 +108,37 @@ snode = ogs_list_first(&test_self()->ngap_list6); if (snode) test_self()->ngap_addr6 = snode->addr; - if (test_self()->e_served_tai0.list2.num) { + if (test_self()->e_served_taiindex.list2.num) { memcpy(&test_self()->e_tai, - &test_self()->e_served_tai0.list2.tai0, sizeof(ogs_5gs_tai_t)); - } else if (test_self()->e_served_tai0.list0.tai0.num) { + &test_self()->e_served_taiindex.list2.tai0, sizeof(ogs_5gs_tai_t)); + } else if (test_self()->e_served_taiindex.list1.tai0.num) { test_self()->e_tai.tac = - test_self()->e_served_tai0.list0.tai0.tac0; + test_self()->e_served_taiindex.list1.tai0.tac; memcpy(&test_self()->e_tai.plmn_id, - &test_self()->e_served_tai0.list0.tai0.plmn_id, + &test_self()->e_served_taiindex.list1.tai0.plmn_id, + OGS_PLMN_ID_LEN); + } else if (test_self()->e_served_taiindex.list0.tai0.num) { + test_self()->e_tai.tac = + test_self()->e_served_taiindex.list0.tai0.tac0; + memcpy(&test_self()->e_tai.plmn_id, + &test_self()->e_served_taiindex.list0.tai0.plmn_id, OGS_PLMN_ID_LEN); } - if (test_self()->nr_served_tai0.list2.num) { + if (test_self()->nr_served_taiindex.list2.num) { memcpy(&test_self()->nr_tai, - &test_self()->nr_served_tai0.list2.tai0, sizeof(ogs_5gs_tai_t)); - } else if (test_self()->nr_served_tai0.list0.tai0.num) { + &test_self()->nr_served_taiindex.list2.tai0, sizeof(ogs_5gs_tai_t)); + } else if (test_self()->nr_served_taiindex.list1.tai0.num) { + test_self()->nr_tai.tac = + test_self()->nr_served_taiindex.list1.tai0.tac; + memcpy(&test_self()->nr_tai.plmn_id, + &test_self()->nr_served_taiindex.list1.tai0.plmn_id, + OGS_PLMN_ID_LEN); + } else if (test_self()->nr_served_taiindex.list0.tai0.num) { test_self()->nr_tai.tac = - test_self()->nr_served_tai0.list0.tai0.tac0; + test_self()->nr_served_taiindex.list0.tai0.tac0; memcpy(&test_self()->nr_tai.plmn_id, - &test_self()->nr_served_tai0.list0.tai0.plmn_id, + &test_self()->nr_served_taiindex.list0.tai0.plmn_id, OGS_PLMN_ID_LEN); } @@ -282,24 +295,27 @@ } } if (!strcmp(amf_key, "tai")) { int num_of_list0 = 0; + int num_of_list1 = 0; ogs_5gs_tai0_list_t *list0 = NULL; + ogs_5gs_tai1_list_t *list1 = NULL; ogs_5gs_tai2_list_t *list2 = NULL; ogs_assert(self.num_of_nr_served_tai <= OGS_MAX_NUM_OF_SERVED_TAI); list0 = &self.nr_served_taiself.num_of_nr_served_tai.list0; - ogs_assert(list0); + list1 = + &self.nr_served_taiself.num_of_nr_served_tai.list1; list2 = &self.nr_served_taiself.num_of_nr_served_tai.list2; - ogs_assert(list2); ogs_yaml_iter_t tai_array, tai_iter; ogs_yaml_iter_recurse(&amf_iter, &tai_array); do { const char *mcc = NULL, *mnc = NULL; - ogs_uint24_t tacOGS_MAX_NUM_OF_TAI; int num_of_tac = 0; + ogs_uint24_t startOGS_MAX_NUM_OF_TAI; + ogs_uint24_t endOGS_MAX_NUM_OF_TAI; if (ogs_yaml_iter_type(&tai_array) == YAML_MAPPING_NODE) { @@ -340,23 +356,56 @@ ogs_yaml_iter_t tac_iter; ogs_yaml_iter_recurse(&tai_iter, &tac_iter); ogs_assert(ogs_yaml_iter_type(&tac_iter) != - YAML_MAPPING_NODE); - + YAML_MAPPING_NODE); do { - const char *v = NULL; + char *v = NULL; + char *low = NULL, *high = NULL; - ogs_assert(num_of_tac <= - OGS_MAX_NUM_OF_TAI); if (ogs_yaml_iter_type(&tac_iter) == YAML_SEQUENCE_NODE) { if (!ogs_yaml_iter_next(&tac_iter)) break; } - v = ogs_yaml_iter_value(&tac_iter); + v = (char *)ogs_yaml_iter_value( + &tac_iter); if (v) { - tacnum_of_tac.v = atoi(v); - num_of_tac++; + low = strsep(&v, "-"); + if (low && strlen(low) == 0) + low = NULL; + + high = v; + if (high && strlen(high) == 0) + high = NULL; + + if (low) { + ogs_assert(num_of_tac < + OGS_MAX_NUM_OF_TAI); + startnum_of_tac.v = atoi(low); + if (high) { + endnum_of_tac.v = atoi(high); + if (endnum_of_tac.v < + startnum_of_tac.v) + ogs_error( + "Invalid TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else if ( + (endnum_of_tac.v- + startnum_of_tac.v+1) > + OGS_MAX_NUM_OF_TAI) + ogs_error( + "Overflow TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else + num_of_tac++; + } else { + endnum_of_tac.v = + startnum_of_tac.v; + num_of_tac++; + } + } } } while ( ogs_yaml_iter_type(&tac_iter) == @@ -366,31 +415,60 @@ } if (mcc && mnc && num_of_tac) { - if (num_of_tac == 1) { + if (num_of_tac == 1 && start0.v == end0.v) { + ogs_assert(list2->num < OGS_MAX_NUM_OF_TAI); + + list2->type = OGS_TAI2_TYPE; + ogs_plmn_id_build( &list2->tailist2->num.plmn_id, atoi(mcc), atoi(mnc), strlen(mnc)); - list2->tailist2->num.tac.v = tac0.v; + list2->tailist2->num.tac.v = start0.v; list2->num++; - if (list2->num > 1) - list2->type = OGS_TAI2_TYPE; - else - list2->type = OGS_TAI1_TYPE; - } else if (num_of_tac > 1) { - int i; - ogs_plmn_id_build( - &list0->tainum_of_list0.plmn_id, - atoi(mcc), atoi(mnc), strlen(mnc)); - for (i = 0; i < num_of_tac; i++) { - list0->tainum_of_list0.taci.v = - taci.v; - } - list0->tainum_of_list0.num = num_of_tac; - list0->tainum_of_list0.type = OGS_TAI0_TYPE; + } else { + int tac, count = 0; + for (tac = 0; tac < num_of_tac; tac++) { + ogs_assert(endtac.v >= starttac.v); + if (starttac.v == endtac.v) { + ogs_assert(num_of_list0 < + OGS_MAX_NUM_OF_TAI); + + list0->tainum_of_list0.type = + OGS_TAI0_TYPE; + + ogs_plmn_id_build( + &list0->tainum_of_list0.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list0->tainum_of_list0. + taccount.v = starttac.v; + + list0->tainum_of_list0.num = + ++count; + + } else if (starttac.v < endtac.v) { + ogs_assert(num_of_list1 < + OGS_MAX_NUM_OF_TAI); + + list1->tainum_of_list1.type = + OGS_TAI1_TYPE; + + ogs_plmn_id_build( + &list1->tainum_of_list1.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list1->tainum_of_list1.tac.v = + starttac.v; + + list1->tainum_of_list1.num = + endtac.v-starttac.v+1; - num_of_list0++; + num_of_list1++; + } + } + + if (count) + num_of_list0++; } } else { ogs_warn("Ignore tai : mcc(%p), mnc(%p), " @@ -399,7 +477,7 @@ } while (ogs_yaml_iter_type(&tai_array) == YAML_SEQUENCE_NODE); - if (list2->num || num_of_list0) { + if (list2->num || num_of_list1 || num_of_list0) { self.num_of_nr_served_tai++; } } else if (!strcmp(amf_key, "plmn_support")) { @@ -677,22 +755,24 @@ } } else if (!strcmp(mme_key, "tai")) { int num_of_list0 = 0; + int num_of_list1 = 0; ogs_eps_tai0_list_t *list0 = NULL; + ogs_eps_tai1_list_t *list1 = NULL; ogs_eps_tai2_list_t *list2 = NULL; ogs_assert(self.num_of_e_served_tai <= OGS_MAX_NUM_OF_SERVED_TAI); list0 = &self.e_served_taiself.num_of_e_served_tai.list0; - ogs_assert(list0); + list1 = &self.e_served_taiself.num_of_e_served_tai.list1; list2 = &self.e_served_taiself.num_of_e_served_tai.list2; - ogs_assert(list2); ogs_yaml_iter_t tai_array, tai_iter; ogs_yaml_iter_recurse(&mme_iter, &tai_array); do { const char *mcc = NULL, *mnc = NULL; - uint16_t tacOGS_MAX_NUM_OF_TAI; int num_of_tac = 0; + uint16_t startOGS_MAX_NUM_OF_TAI; + uint16_t endOGS_MAX_NUM_OF_TAI; if (ogs_yaml_iter_type(&tai_array) == YAML_MAPPING_NODE) { @@ -733,23 +813,56 @@ ogs_yaml_iter_t tac_iter; ogs_yaml_iter_recurse(&tai_iter, &tac_iter); ogs_assert(ogs_yaml_iter_type(&tac_iter) != - YAML_MAPPING_NODE); - + YAML_MAPPING_NODE); do { - const char *v = NULL; + char *v = NULL; + char *low = NULL, *high = NULL; - ogs_assert(num_of_tac <= - OGS_MAX_NUM_OF_TAI); if (ogs_yaml_iter_type(&tac_iter) == YAML_SEQUENCE_NODE) { if (!ogs_yaml_iter_next(&tac_iter)) break; } - v = ogs_yaml_iter_value(&tac_iter); + v = (char *)ogs_yaml_iter_value( + &tac_iter); if (v) { - tacnum_of_tac = atoi(v); - num_of_tac++; + low = strsep(&v, "-"); + if (low && strlen(low) == 0) + low = NULL; + + high = v; + if (high && strlen(high) == 0) + high = NULL; + + if (low) { + ogs_assert(num_of_tac < + OGS_MAX_NUM_OF_TAI); + startnum_of_tac = atoi(low); + if (high) { + endnum_of_tac = atoi(high); + if (endnum_of_tac < + startnum_of_tac) + ogs_error( + "Invalid TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else if ( + (endnum_of_tac- + startnum_of_tac+1) > + OGS_MAX_NUM_OF_TAI) + ogs_error( + "Overflow TAI range: " + "LOW:%s,HIGH:%s", + low, high); + else + num_of_tac++; + } else { + endnum_of_tac = + startnum_of_tac; + num_of_tac++; + } + } } } while ( ogs_yaml_iter_type(&tac_iter) == @@ -759,30 +872,60 @@ } if (mcc && mnc && num_of_tac) { - if (num_of_tac == 1) { + if (num_of_tac == 1 && start0 == end0) { + ogs_assert(list2->num < OGS_MAX_NUM_OF_TAI); + + list2->type = OGS_TAI2_TYPE; + ogs_plmn_id_build( &list2->tailist2->num.plmn_id, atoi(mcc), atoi(mnc), strlen(mnc)); - list2->tailist2->num.tac = tac0; + list2->tailist2->num.tac = start0; list2->num++; - if (list2->num > 1) - list2->type = OGS_TAI2_TYPE; - else - list2->type = OGS_TAI1_TYPE; - } else if (num_of_tac > 1) { - int i; - ogs_plmn_id_build( - &list0->tainum_of_list0.plmn_id, - atoi(mcc), atoi(mnc), strlen(mnc)); - for (i = 0; i < num_of_tac; i++) { - list0->tainum_of_list0.taci = taci; - } - list0->tainum_of_list0.num = num_of_tac; - list0->tainum_of_list0.type = OGS_TAI0_TYPE; + } else { + int tac, count = 0; + for (tac = 0; tac < num_of_tac; tac++) { + ogs_assert(endtac >= starttac); + if (starttac == endtac) { + ogs_assert(num_of_list0 < + OGS_MAX_NUM_OF_TAI); + + list0->tainum_of_list0.type = + OGS_TAI0_TYPE; + + ogs_plmn_id_build( + &list0->tainum_of_list0.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list0->tainum_of_list0. + taccount = starttac; + + list0->tainum_of_list0.num = + ++count; + + } else if (starttac < endtac) { + ogs_assert(num_of_list1 < + OGS_MAX_NUM_OF_TAI); + + list1->tainum_of_list1.type = + OGS_TAI1_TYPE; + + ogs_plmn_id_build( + &list1->tainum_of_list1.plmn_id, + atoi(mcc), atoi(mnc), strlen(mnc)); + list1->tainum_of_list1.tac = + starttac; + + list1->tainum_of_list1.num = + endtac-starttac+1; + + num_of_list1++; + } + } - num_of_list0++; + if (count) + num_of_list0++; } } else { ogs_warn("Ignore tai : mcc(%p), mnc(%p), " @@ -791,7 +934,7 @@ } while (ogs_yaml_iter_type(&tai_array) == YAML_SEQUENCE_NODE); - if (list2->num || num_of_list0) { + if (list2->num || num_of_list1 || num_of_list0) { self.num_of_e_served_tai++; } }
View file
open5gs_2.6.1.tar.xz/tests/common/context.h -> open5gs_2.6.2.tar.xz/tests/common/context.h
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019,2020 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -76,6 +76,7 @@ uint8_t num_of_e_served_tai; struct { ogs_eps_tai0_list_t list0; + ogs_eps_tai1_list_t list1; ogs_eps_tai2_list_t list2; } e_served_taiOGS_MAX_NUM_OF_SERVED_TAI; @@ -85,6 +86,7 @@ uint8_t num_of_nr_served_tai; struct { ogs_5gs_tai0_list_t list0; + ogs_5gs_tai1_list_t list1; ogs_5gs_tai2_list_t list2; } nr_served_taiOGS_MAX_NUM_OF_SERVED_TAI;
View file
open5gs_2.6.1.tar.xz/tests/common/emm-build.c -> open5gs_2.6.2.tar.xz/tests/common/emm-build.c
Changed
@@ -198,7 +198,7 @@ if (test_ue->attach_request_param.additional_update_type) { attach_request->presencemask |= OGS_NAS_EPS_ATTACH_REQUEST_ADDITIONAL_UPDATE_TYPE_PRESENT; - additional_update_type->autv = 1; + additional_update_type->additional_update_type_value = 1; } if (test_ue->attach_request_param.ue_usage_setting) { @@ -734,7 +734,7 @@ if (test_ue->tau_request_param.additional_update_type) { tau_request->presencemask |= OGS_NAS_EPS_TRACKING_AREA_UPDATE_REQUEST_ADDITIONAL_UPDATE_TYPE_PRESENT; - additional_update_type->autv = 1; + additional_update_type->additional_update_type_value = 1; } if (test_ue->tau_request_param.ue_usage_setting) {
View file
open5gs_2.6.1.tar.xz/tests/handover/5gc-n2-test.c -> open5gs_2.6.2.tar.xz/tests/handover/5gc-n2-test.c
Changed
@@ -806,6 +806,9 @@ rv = testgnb_ngap_send(ngap2, sendbuf); ABTS_INT_EQUAL(tc, OGS_OK, rv); + /* Waiting for N4 */ + ogs_msleep(100); + /* Receive End Mark */ recvbuf = test_gtpu_read(gtpu1); ABTS_PTR_NOTNULL(tc, recvbuf); @@ -923,6 +926,9 @@ rv = testgnb_ngap_send(ngap1, sendbuf); ABTS_INT_EQUAL(tc, OGS_OK, rv); + /* Waiting for N4 */ + ogs_msleep(100); + /* Receive End Mark */ recvbuf = test_gtpu_read(gtpu2); ABTS_PTR_NOTNULL(tc, recvbuf); @@ -1838,6 +1844,9 @@ rv = testgnb_ngap_send(ngap2, sendbuf); ABTS_INT_EQUAL(tc, OGS_OK, rv); + /* Waiting for N4 */ + ogs_msleep(100); + /* Receive End Mark */ recvbuf = test_gtpu_read(gtpu1); ABTS_PTR_NOTNULL(tc, recvbuf); @@ -1983,6 +1992,9 @@ rv = testgnb_ngap_send(ngap1, sendbuf); ABTS_INT_EQUAL(tc, OGS_OK, rv); + /* Waiting for N4 */ + ogs_msleep(100); + /* Receive End Mark */ recvbuf = test_gtpu_read(gtpu2); ABTS_PTR_NOTNULL(tc, recvbuf); @@ -2488,6 +2500,9 @@ rv = testgnb_ngap_send(ngap2, sendbuf); ABTS_INT_EQUAL(tc, OGS_OK, rv); + /* Waiting for N4 */ + ogs_msleep(100); + /* Receive End Mark */ recvbuf = test_gtpu_read(gtpu1); ABTS_PTR_NOTNULL(tc, recvbuf);
View file
open5gs_2.6.1.tar.xz/tests/unit/nas-message-test.c -> open5gs_2.6.2.tar.xz/tests/unit/nas-message-test.c
Changed
@@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com> + * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com> * * This file is part of Open5GS. * @@ -90,7 +90,7 @@ tai0_list.tai0.num = 1; ogs_plmn_id_build(&tai0_list.tai0.plmn_id, 417, 99, 2); tai0_list.tai0.tac0 = 12345; - ogs_nas_tai_list_build(&attach_accept->tai_list, &tai0_list, &tai2_list); + ogs_nas_tai_list_build(&attach_accept->tai_list, &tai0_list, NULL, NULL); attach_accept->esm_message_container.length = sizeof(esm_buffer); attach_accept->esm_message_container.buffer =
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
.