Osmocom Open Build Service

open5gs_2.6.3.dsc -> open5gs_2.6.4.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.3
+Version: 2.6.4
 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:
- 062b6374186956af41192a4b297ea3c7e85ad80c 14116892 open5gs_2.6.3.tar.xz
+ 19941fd2e7bf2e13e7bdc6fa9dff9ac4b9029681 14122996 open5gs_2.6.4.tar.xz
 Checksums-Sha256:
- 7c07cabbe9cb5d0886993cddb16aaee7d97007a3fd1998e234cccd4dd69c2933 14116892 open5gs_2.6.3.tar.xz
+ a12278efe5e45ff8e2e5023bea2d4dcf0e97474e45425df1e5b053388d0e368f 14122996 open5gs_2.6.4.tar.xz
 Files:
- d931a2b8835315104148d14efb21adb0 14116892 open5gs_2.6.3.tar.xz
+ a1e188c2587f18381c9cd77ad9fce6d1 14122996 open5gs_2.6.4.tar.xz

open5gs_2.6.3.tar.xz/.tarball-version -> open5gs_2.6.4.tar.xz/.tarball-version Changed

open5gs_2.6.3.tar.xz/configs/open5gs/mme.yaml.in -> open5gs_2.6.4.tar.xz/configs/open5gs/mme.yaml.in Changed

open5gs_2.6.3.tar.xz/configs/open5gs/scp.yaml.in -> open5gs_2.6.4.tar.xz/configs/open5gs/scp.yaml.in Changed

@@ -178,6 +178,51 @@
 #          l_onoff: true
 #          l_linger: 10
 #
+#  <SCP Information>
+#
+#  o SCP port number(s) WITHOUT SCP Domain
+#    - If no SCP port information is present in ScpInfo or
+#      in ScpDomainInfo for a specific SCP domain,
+#      the HTTP client shall use the default HTTP port number,
+#      i.e. TCP port 80 for "http" URIs or TCP port 443
+#      for "https" URIs as specified in IETF RFC 7540 9
+#      when sending a request to the SCP within the specific SCP domain.
+#  scp:
+#    info:
+#      port:
+#        http: 7777
+#        https: 8888
+#
+#  o SCP port number(s) WITH SCP Domain
+#    - If this attribute is present,
+#      it has precedence over the scpPorts attribute of ScpInfo.
+#  scp:
+#    info:
+#      domain:
+#        - name: SCP_Domain_1
+#          fqdn: scp.localdomain
+#          port:
+#            http: 7777
+#            https: 8888
+#
+#  o Complex Example
+#  scp:
+#    info:
+#      port:
+#        http: 7777
+#        https: 8888
+#      domain:
+#        - name: SCP_Domain_1
+#          fqdn: scp.hplmndomain
+#          port:
+#            http: 3333
+#            https: 4444
+#        - name: SCP_Domain_2
+#          fqdn: scp.vplmndomain
+#          port:
+#            http: 5555
+#            https: 6666
+#
 #  <For Indirect Communication with Delegated Discovery>
 #
 #  o (Default) If you do not set Delegated Discovery as shown below,

open5gs_2.6.3.tar.xz/debian/changelog -> open5gs_2.6.4.tar.xz/debian/changelog Changed

open5gs_2.6.3.tar.xz/docs/_docs/guide/01-quickstart.md -> open5gs_2.6.4.tar.xz/docs/_docs/guide/01-quickstart.md Changed

open5gs_2.6.3.tar.xz/docs/_docs/guide/02-building-open5gs-from-sources.md -> open5gs_2.6.4.tar.xz/docs/_docs/guide/02-building-open5gs-from-sources.md Changed

open5gs_2.6.3.tar.xz/docs/_docs/tutorial/01-your-first-lte.md -> open5gs_2.6.4.tar.xz/docs/_docs/tutorial/01-your-first-lte.md Changed

open5gs_2.6.3.tar.xz/docs/_pages/docs.md -> open5gs_2.6.4.tar.xz/docs/_pages/docs.md Changed

@@ -41,6 +41,7 @@
   - Open5GS on Amazon Elastic Kubernetes Service(https://aws.amazon.com/blogs/opensource/open-source-mobile-core-network-implementation-on-amazon-elastic-kubernetes-service/)
   - Kubernetes Open5GS Deployment(https://dev.to/infinitydon/virtual-4g-simulation-using-kubernetes-and-gns3-3b7k?fbclid=IwAR1p99h13a-mCfejanbBQe0H0-jp5grXkn5mWf1WrTHf47UtegB2-UHGGZQ)
   - 5G Core SBI mTLS Using External Certificate PKI(https://futuredon.medium.com/5g-core-sbi-mtls-using-external-certificate-pki-4ffc02ac7728)
+  - 5G Frame Routing(https://futuredon.medium.com/5g-frame-routing-6e34d8587123)
 
 - @nickvsnetworking
   - My first 5G Core : Open5GS and UERANSIM(http://nickvsnetworking.com/my-first-5g-core-open5gs-and-ueransim/)
@@ -57,6 +58,7 @@
   - Open5GS 5GC & UERANSIM UE/RAN Sample Configuration(https://github.com/s5uishida/open5gs_5gc_ueransim_sample_config)
   - Open5GS & UERANSIM - Select nearby UPF according to the connected gNodeB(https://github.com/s5uishida/open5gs_5gc_ueransim_nearby_upf_sample_config)
   - VoLTE and SMS Configuration for docker_open5gs(https://github.com/s5uishida/docker_open5gs_volte_sms_config)
+  - Select nearby UPF(PGW-U) according to the connected eNodeB(https://github.com/s5uishida/open5gs_epc_srsran_nearby_upf_sample_config)
   - Select UPF based on S-NSSAI(https://github.com/s5uishida/open5gs_5gc_ueransim_snssai_upf_sample_config)
   - SCP Indirect communication Model C(https://github.com/s5uishida/open5gs_5gc_ueransim_scp_model_c_sample_config)
   - Monitoring Metrics with Prometheus(https://github.com/s5uishida/open5gs_5gc_ueransim_metrics_sample_config)

open5gs_2.6.3.tar.xz/docs/_pages/support.md -> open5gs_2.6.4.tar.xz/docs/_pages/support.md Changed

@@ -11,7 +11,8 @@
 
 Open5GS is licensed under a dual licensing model designed to meet the development and distribution needs of both commercial and open source projects.
 
-The commercial Open5GS license gives you the full rights to create and distribute software on your own terms without any open source license obligations. With the commercial license, you also have access to the official NeoPlane Support and close strategic relationship with NeoPlane(https://neoplane.io) to make sure your development goals are met.
+The commercial Open5GS license gives you the full rights to create and distribute software on your own terms without any open source license obligations. You can grow with Open5GS by establishing a close strategic relationship with NeoPlane(https://neoplane.io).
+
 
 Open5GS is also available under AGPL-3.0 open source licenses. The Open5GS open source licensing is ideal for use cases such as open source projects with open source distribution, student/academic purposes, hobby projects, internal research projects without external distribution, or other projects where all AGPL-3.0 obligations can be met.

open5gs_2.6.4.tar.xz/docs/_posts/2023-05-21-release-v2.6.4.md Added

open5gs_2.6.3.tar.xz/lib/core/ogs-conv.c -> open5gs_2.6.4.tar.xz/lib/core/ogs-conv.c Changed

open5gs_2.6.3.tar.xz/lib/core/ogs-conv.h -> open5gs_2.6.4.tar.xz/lib/core/ogs-conv.h Changed

open5gs_2.6.3.tar.xz/lib/proto/types.h -> open5gs_2.6.4.tar.xz/lib/proto/types.h Changed

open5gs_2.6.3.tar.xz/lib/sbi/context.c -> open5gs_2.6.4.tar.xz/lib/sbi/context.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/context.h -> open5gs_2.6.4.tar.xz/lib/sbi/context.h Changed

open5gs_2.6.3.tar.xz/lib/sbi/nnrf-build.c -> open5gs_2.6.4.tar.xz/lib/sbi/nnrf-build.c Changed

@@ -24,8 +24,10 @@
 static void free_nf_service(OpenAPI_nf_service_t *NFService);
 static OpenAPI_smf_info_t *build_smf_info(ogs_sbi_nf_info_t *nf_info);
 static OpenAPI_amf_info_t *build_amf_info(ogs_sbi_nf_info_t *nf_info);
+static OpenAPI_scp_info_t *build_scp_info(ogs_sbi_nf_info_t *nf_info);
 static void free_smf_info(OpenAPI_smf_info_t *SmfInfo);
 static void free_amf_info(OpenAPI_amf_info_t *AmfInfo);
+static void free_scp_info(OpenAPI_scp_info_t *ScpInfo);
 
 ogs_sbi_request_t *ogs_nnrf_nfm_build_register(void)
 {
@@ -87,11 +89,11 @@
     OpenAPI_map_t *NFServiceMap = NULL;
     OpenAPI_list_t *InfoList = NULL;
     OpenAPI_map_t *InfoMap = NULL;
-    OpenAPI_smf_info_t *SmfInfo = NULL;
     int InfoMapKey;
 
     OpenAPI_lnode_t *node = NULL;
 
+    OpenAPI_smf_info_t *SmfInfo = NULL;
     OpenAPI_amf_info_t *AmfInfo = NULL;
 
     int i = 0;
@@ -297,6 +299,14 @@
 
             OpenAPI_list_add(InfoList, InfoMap);
 
+        } else if (nf_info->nf_type == OpenAPI_nf_type_SCP) {
+
+            /* SCP info will be skipped here first and dealt with below. */
+
+        } else if (nf_info->nf_type == OpenAPI_nf_type_SEPP) {
+
+            /* SEPP info will be skipped here first and dealt with below. */
+
         } else {
             ogs_fatal("Not implemented NF-type%s",
                     OpenAPI_nf_type_ToString(nf_info->nf_type));
@@ -335,6 +345,14 @@
     } else
         OpenAPI_list_free(InfoList);
 
+    /* There can only be one SCP info, not multiple. */
+    nf_info = ogs_sbi_nf_info_find(
+            &nf_instance->nf_info_list, OpenAPI_nf_type_SCP);
+    if (nf_info) {
+        NFProfile->scp_info = build_scp_info(nf_info);
+        ogs_assert(NFProfile->scp_info);
+    }
+
     return NFProfile;
 }
 
@@ -412,6 +430,9 @@
     if (NFProfile->amf_info)
         free_amf_info(NFProfile->amf_info);
 
+    if (NFProfile->scp_info)
+        free_scp_info(NFProfile->scp_info);
+
     ogs_free(NFProfile);
 }
 
@@ -1041,6 +1062,130 @@
     return AmfInfo;
 }
 
+static OpenAPI_scp_info_t *build_scp_info(ogs_sbi_nf_info_t *nf_info)
+{
+    int i;
+    OpenAPI_scp_info_t *ScpInfo = NULL;
+    OpenAPI_list_t *PortList = NULL;
+    OpenAPI_map_t *PortMap = NULL;
+
+    OpenAPI_list_t *DomainInfoList = NULL;
+    OpenAPI_map_t *DomainInfoMap = NULL;
+    OpenAPI_scp_domain_info_t *DomainInfo = NULL;
+
+    ogs_assert(nf_info);
+
+    ScpInfo = ogs_calloc(1, sizeof(*ScpInfo));
+    if (!ScpInfo) {
+        ogs_error("No ScpInfo");
+        return NULL;
+    }
+
+    PortList = OpenAPI_list_create();
+    if (!PortList) {
+        ogs_error("No PortList");
+        free_scp_info(ScpInfo);
+        return NULL;
+    }
+
+    if (nf_info->scp.http.presence) {
+        PortMap = OpenAPI_map_create(
+                    (char *)"http", ogs_alloc_double(nf_info->scp.http.port));
+        if (!PortMap) {
+            ogs_error("No PortMap");
+            free_scp_info(ScpInfo);
+            return NULL;
+        }
+        OpenAPI_list_add(PortList, PortMap);
+    }
+    if (nf_info->scp.https.presence) {
+        PortMap = OpenAPI_map_create(
+                    (char *)"https", ogs_alloc_double(nf_info->scp.https.port));
+        if (!PortMap) {
+            ogs_error("No PortMap");
+            free_scp_info(ScpInfo);
+            return NULL;
+        }
+        OpenAPI_list_add(PortList, PortMap);
+    }
+
+    if (PortList->count)
+        ScpInfo->scp_ports = PortList;
+    else
+        OpenAPI_list_free(PortList);
+
+    DomainInfoList = OpenAPI_list_create();
+    if (!DomainInfoList) {
+        ogs_error("No DomainInfoList");
+        free_scp_info(ScpInfo);
+        return NULL;
+    }
+    for (i = 0; i < nf_info->scp.num_of_domain; i++) {
+        ogs_assert(nf_info->scp.domaini.name);
+
+        DomainInfo = ogs_calloc(1, sizeof(*DomainInfo));
+        if (!DomainInfo) {
+            ogs_error("No DomainInfo");
+            free_scp_info(ScpInfo);
+            return NULL;
+        }
+
+        DomainInfo->scp_fqdn = nf_info->scp.domaini.fqdn;
+
+        PortList = OpenAPI_list_create();
+        if (!PortList) {
+            ogs_error("No PortList");
+            free_scp_info(ScpInfo);
+            return NULL;
+        }
+
+        if (nf_info->scp.domaini.http.presence) {
+            PortMap = OpenAPI_map_create(
+                        (char *)"http",
+                        ogs_alloc_double(nf_info->scp.domaini.http.port));
+            if (!PortMap) {
+                ogs_error("No PortMap");
+                free_scp_info(ScpInfo);
+                return NULL;
+            }
+            OpenAPI_list_add(PortList, PortMap);
+        }
+        if (nf_info->scp.domaini.https.presence) {
+            PortMap = OpenAPI_map_create(
+                        (char *)"https",
+                        ogs_alloc_double(nf_info->scp.domaini.https.port));
+            if (!PortMap) {
+                ogs_error("No PortMap");
+                free_scp_info(ScpInfo);
+                return NULL;
+            }
+            OpenAPI_list_add(PortList, PortMap);
+        }
+
+        if (PortList->count)
+            DomainInfo->scp_ports = PortList;
+        else
+            OpenAPI_list_free(PortList);
+
+        DomainInfoMap = OpenAPI_map_create(
+                    nf_info->scp.domaini.name, DomainInfo);
+        if (!DomainInfoMap) {
+            ogs_error("No PortMap");
+            free_scp_info(ScpInfo);
+            return NULL;
+        }
+
+        OpenAPI_list_add(DomainInfoList, DomainInfoMap);
+    }
+
+    if (DomainInfoList->count)
+        ScpInfo->scp_domain_info_list = DomainInfoList;
+    else
+        OpenAPI_list_free(DomainInfoList);
+
+    return ScpInfo;
+}
+
 static void free_smf_info(OpenAPI_smf_info_t *SmfInfo)
 {
     OpenAPI_list_t *sNssaiSmfInfoList = NULL;
@@ -1204,6 +1349,48 @@
     ogs_free(AmfInfo);
 }
 
+static void free_scp_info(OpenAPI_scp_info_t *ScpInfo)
+{
+    OpenAPI_map_t *PortMap = NULL;
+    OpenAPI_lnode_t *node = NULL, *node2 = NULL;
+
+    OpenAPI_map_t *DomainInfoMap = NULL;
+    OpenAPI_scp_domain_info_t *DomainInfo = NULL;
+
+    ogs_assert(ScpInfo);
+
+    OpenAPI_list_for_each(ScpInfo->scp_ports, node) {
+        PortMap = node->data;
+        if (PortMap) {
+            ogs_free(PortMap->value);
+            OpenAPI_map_free(PortMap);
+        }
+    }
+    OpenAPI_list_free(ScpInfo->scp_ports);
+
+    OpenAPI_list_for_each(ScpInfo->scp_domain_info_list, node) {
+        DomainInfoMap = node->data;
+        if (DomainInfoMap) {
+            DomainInfo = DomainInfoMap->value;
+            if (DomainInfo) {
+                OpenAPI_list_for_each(DomainInfo->scp_ports, node2) {
+                    PortMap = node2->data;
+                    if (PortMap) {
+                        ogs_free(PortMap->value);
+                        OpenAPI_map_free(PortMap);
+                    }
+                }
+                OpenAPI_list_free(DomainInfo->scp_ports);
+                ogs_free(DomainInfo);
+            }
+            OpenAPI_map_free(DomainInfoMap);
+        }
+    }
+    OpenAPI_list_free(ScpInfo->scp_domain_info_list);
+
+    ogs_free(ScpInfo);
+}
+
 ogs_sbi_request_t *ogs_nnrf_nfm_build_update(void)
 {
     ogs_sbi_nf_instance_t *nf_instance = NULL;

open5gs_2.6.3.tar.xz/lib/sbi/ogs-sbi.h -> open5gs_2.6.4.tar.xz/lib/sbi/ogs-sbi.h Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/acceptable_service_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/acceptable_service_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data.c Changed

@@ -400,6 +400,14 @@
     if (access_and_mobility_subscription_data->shared_vn_group_data_ids) {
         OpenAPI_list_for_each(access_and_mobility_subscription_data->shared_vn_group_data_ids, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed inner");
                 goto end;
@@ -834,6 +842,14 @@
     if (access_and_mobility_subscription_data->adjacent_plmn_restrictions) {
         OpenAPI_list_for_each(access_and_mobility_subscription_data->adjacent_plmn_restrictions, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed adjacent_plmn_restrictions");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed adjacent_plmn_restrictions");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_plmn_restriction_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/access_and_mobility_subscription_data_1.c Changed

@@ -400,6 +400,14 @@
     if (access_and_mobility_subscription_data_1->shared_vn_group_data_ids) {
         OpenAPI_list_for_each(access_and_mobility_subscription_data_1->shared_vn_group_data_ids, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed inner");
                 goto end;
@@ -834,6 +842,14 @@
     if (access_and_mobility_subscription_data_1->adjacent_plmn_restrictions) {
         OpenAPI_list_for_each(access_and_mobility_subscription_data_1->adjacent_plmn_restrictions, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed adjacent_plmn_restrictions");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed adjacent_plmn_restrictions");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_plmn_restriction_1_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/am_policy_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/am_policy_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/am_requested_value_rep.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/am_requested_value_rep.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/amf_event.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/amf_event.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/amf_event_subscription_add_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/amf_event_subscription_add_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/app_descriptor_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/app_descriptor_1.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/app_session_context_req_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/app_session_context_req_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/app_session_context_update_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/app_session_context_update_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/area_scope.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/area_scope.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/assign_ebi_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/assign_ebi_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/assigned_ebi_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/assigned_ebi_data.c Changed

@@ -119,7 +119,11 @@
         goto end;
     }
     OpenAPI_list_for_each(assigned_ebi_data->released_ebi_list, node) {
-        if (cJSON_AddNumberToObject(released_ebi_listList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_assigned_ebi_data_convertToJSON() failed released_ebi_list");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(released_ebi_listList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_assigned_ebi_data_convertToJSON() failed released_ebi_list");
             goto end;
         }
@@ -133,7 +137,11 @@
         goto end;
     }
     OpenAPI_list_for_each(assigned_ebi_data->modified_ebi_list, node) {
-        if (cJSON_AddNumberToObject(modified_ebi_listList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_assigned_ebi_data_convertToJSON() failed modified_ebi_list");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(modified_ebi_listList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_assigned_ebi_data_convertToJSON() failed modified_ebi_list");
             goto end;
         }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/authorized_network_slice_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/authorized_network_slice_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/cag_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/cag_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/cag_data_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/cag_data_1.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/default_notification_subscription.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/default_notification_subscription.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/dnn_upf_info_item.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/dnn_upf_info_item.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/eap_auth_method_200_response.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/eap_auth_method_200_response.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/eap_session.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/eap_session.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ee_group_profile_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ee_group_profile_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ee_profile_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ee_profile_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ee_subscription.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ee_subscription.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ee_subscription_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ee_subscription_1.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ee_subscription_ext.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ee_subscription_ext.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/eps_interworking_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/eps_interworking_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/event_subscription.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/event_subscription.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ext_amf_event_subscription.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ext_amf_event_subscription.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/flows.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/flows.c Changed

@@ -62,7 +62,11 @@
         goto end;
     }
     OpenAPI_list_for_each(flows->cont_vers, node) {
-        if (cJSON_AddNumberToObject(cont_versList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_flows_convertToJSON() failed cont_vers");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(cont_versList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_flows_convertToJSON() failed cont_vers");
             goto end;
         }
@@ -76,7 +80,11 @@
         goto end;
     }
     OpenAPI_list_for_each(flows->f_nums, node) {
-        if (cJSON_AddNumberToObject(f_numsList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_flows_convertToJSON() failed f_nums");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(f_numsList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_flows_convertToJSON() failed f_nums");
             goto end;
         }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/hsmf_update_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/hsmf_update_data.c Changed

@@ -609,7 +609,11 @@
         goto end;
     }
     OpenAPI_list_for_each(hsmf_update_data->eps_bearer_id, node) {
-        if (cJSON_AddNumberToObject(eps_bearer_idList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed eps_bearer_id");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(eps_bearer_idList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed eps_bearer_id");
             goto end;
         }
@@ -630,7 +634,11 @@
         goto end;
     }
     OpenAPI_list_for_each(hsmf_update_data->revoke_ebi_list, node) {
-        if (cJSON_AddNumberToObject(revoke_ebi_listList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed revoke_ebi_list");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(revoke_ebi_listList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed revoke_ebi_list");
             goto end;
         }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/identity_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/identity_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ie_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ie_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/inter_freq_target_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/inter_freq_target_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/inter_freq_target_info_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/inter_freq_target_info_1.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/iptv_config_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/iptv_config_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/iptv_config_data_patch.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/iptv_config_data_patch.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/mb_smf_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/mb_smf_info.c Changed

@@ -99,6 +99,14 @@
     if (mb_smf_info->s_nssai_info_list) {
         OpenAPI_list_for_each(mb_smf_info->s_nssai_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_mb_smf_info_convertToJSON() failed s_nssai_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_mb_smf_info_convertToJSON() failed s_nssai_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_snssai_mb_smf_info_item_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -121,6 +129,14 @@
     if (mb_smf_info->tmgi_range_list) {
         OpenAPI_list_for_each(mb_smf_info->tmgi_range_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_mb_smf_info_convertToJSON() failed tmgi_range_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_mb_smf_info_convertToJSON() failed tmgi_range_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_tmgi_range_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -175,6 +191,14 @@
     if (mb_smf_info->mbs_session_list) {
         OpenAPI_list_for_each(mb_smf_info->mbs_session_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_mb_smf_info_convertToJSON() failed mbs_session_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_mb_smf_info_convertToJSON() failed mbs_session_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_mbs_session_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/mbs_session.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/mbs_session.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/media_component.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/media_component.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/media_component_rm.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/media_component_rm.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/n2_information_notification.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/n2_information_notification.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/n4_information.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/n4_information.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nf_instance_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nf_instance_info.c Changed

@@ -89,7 +89,19 @@
     if (nf_instance_info->nrf_altered_priorities) {
         OpenAPI_list_for_each(nf_instance_info->nrf_altered_priorities, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_instance_info_convertToJSON() failed nrf_altered_priorities");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_instance_info_convertToJSON() failed nrf_altered_priorities");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_nf_instance_info_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_nf_instance_info_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nf_profile.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nf_profile.c Changed

@@ -1028,6 +1028,14 @@
     if (nf_profile->udr_info_list) {
         OpenAPI_list_for_each(nf_profile->udr_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed udr_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed udr_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_udr_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1063,6 +1071,14 @@
     if (nf_profile->udm_info_list) {
         OpenAPI_list_for_each(nf_profile->udm_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed udm_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed udm_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_udm_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1098,6 +1114,14 @@
     if (nf_profile->ausf_info_list) {
         OpenAPI_list_for_each(nf_profile->ausf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed ausf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed ausf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_ausf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1133,6 +1157,14 @@
     if (nf_profile->amf_info_list) {
         OpenAPI_list_for_each(nf_profile->amf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed amf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed amf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_amf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1168,6 +1200,14 @@
     if (nf_profile->smf_info_list) {
         OpenAPI_list_for_each(nf_profile->smf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed smf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed smf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_smf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1203,6 +1243,14 @@
     if (nf_profile->upf_info_list) {
         OpenAPI_list_for_each(nf_profile->upf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed upf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed upf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_upf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1238,6 +1286,14 @@
     if (nf_profile->pcf_info_list) {
         OpenAPI_list_for_each(nf_profile->pcf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed pcf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed pcf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_pcf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1273,6 +1329,14 @@
     if (nf_profile->bsf_info_list) {
         OpenAPI_list_for_each(nf_profile->bsf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed bsf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed bsf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_bsf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1308,6 +1372,14 @@
     if (nf_profile->chf_info_list) {
         OpenAPI_list_for_each(nf_profile->chf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed chf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed chf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_chf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1369,6 +1441,14 @@
     if (nf_profile->udsf_info_list) {
         OpenAPI_list_for_each(nf_profile->udsf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed udsf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed udsf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_udsf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1404,6 +1484,14 @@
     if (nf_profile->nwdaf_info_list) {
         OpenAPI_list_for_each(nf_profile->nwdaf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nwdaf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nwdaf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nwdaf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1426,6 +1514,14 @@
     if (nf_profile->pcscf_info_list) {
         OpenAPI_list_for_each(nf_profile->pcscf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed pcscf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed pcscf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_pcscf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1448,6 +1544,14 @@
     if (nf_profile->hss_info_list) {
         OpenAPI_list_for_each(nf_profile->hss_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed hss_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed hss_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_hss_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1513,6 +1617,14 @@
     if (nf_profile->nf_service_list) {
         OpenAPI_list_for_each(nf_profile->nf_service_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nf_service_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nf_service_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nf_service_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1633,6 +1745,14 @@
     if (nf_profile->nf_set_recovery_time_list) {
         OpenAPI_list_for_each(nf_profile->nf_set_recovery_time_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nf_set_recovery_time_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nf_set_recovery_time_list");
+                goto end;
+            }
         }
     }
     }
@@ -1647,6 +1767,14 @@
     if (nf_profile->service_set_recovery_time_list) {
         OpenAPI_list_for_each(nf_profile->service_set_recovery_time_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed service_set_recovery_time_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed service_set_recovery_time_list");
+                goto end;
+            }
         }
     }
     }
@@ -1708,6 +1836,14 @@
     if (nf_profile->supported_vendor_specific_features) {
         OpenAPI_list_for_each(nf_profile->supported_vendor_specific_features, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed supported_vendor_specific_features");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed supported_vendor_specific_features");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_vendor_specific_feature_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1730,6 +1866,14 @@
     if (nf_profile->aanf_info_list) {
         OpenAPI_list_for_each(nf_profile->aanf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed aanf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed aanf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_aanf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1778,6 +1922,14 @@
     if (nf_profile->easdf_info_list) {
         OpenAPI_list_for_each(nf_profile->easdf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed easdf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed easdf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_easdf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1813,6 +1965,14 @@
     if (nf_profile->nsacf_info_list) {
         OpenAPI_list_for_each(nf_profile->nsacf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nsacf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed nsacf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nsacf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1835,6 +1995,14 @@
     if (nf_profile->mb_smf_info_list) {
         OpenAPI_list_for_each(nf_profile->mb_smf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed mb_smf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed mb_smf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_mb_smf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1857,6 +2025,14 @@
     if (nf_profile->tsctsf_info_list) {
         OpenAPI_list_for_each(nf_profile->tsctsf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed tsctsf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed tsctsf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_tsctsf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1879,6 +2055,14 @@
     if (nf_profile->mb_upf_info_list) {
         OpenAPI_list_for_each(nf_profile->mb_upf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed mb_upf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_profile_convertToJSON() failed mb_upf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_mb_upf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nf_service.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nf_service.c Changed

@@ -440,6 +440,14 @@
     if (nf_service->allowed_operations_per_nf_type) {
         OpenAPI_list_for_each(nf_service->allowed_operations_per_nf_type, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_service_convertToJSON() failed allowed_operations_per_nf_type");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_service_convertToJSON() failed allowed_operations_per_nf_type");
+                goto end;
+            }
         }
     }
     }
@@ -454,6 +462,14 @@
     if (nf_service->allowed_operations_per_nf_instance) {
         OpenAPI_list_for_each(nf_service->allowed_operations_per_nf_instance, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_service_convertToJSON() failed allowed_operations_per_nf_instance");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_service_convertToJSON() failed allowed_operations_per_nf_instance");
+                goto end;
+            }
         }
     }
     }
@@ -563,6 +579,14 @@
     if (nf_service->supported_vendor_specific_features) {
         OpenAPI_list_for_each(nf_service->supported_vendor_specific_features, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nf_service_convertToJSON() failed supported_vendor_specific_features");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nf_service_convertToJSON() failed supported_vendor_specific_features");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_vendor_specific_feature_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nrf_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info.c Changed

@@ -525,6 +525,14 @@
     if (nrf_info->served_udr_info) {
         OpenAPI_list_for_each(nrf_info->served_udr_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udr_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udr_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_udr_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -547,6 +555,14 @@
     if (nrf_info->served_udr_info_list) {
         OpenAPI_list_for_each(nrf_info->served_udr_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udr_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udr_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_udr_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -569,6 +585,14 @@
     if (nrf_info->served_udm_info) {
         OpenAPI_list_for_each(nrf_info->served_udm_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udm_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udm_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_udm_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -591,6 +615,14 @@
     if (nrf_info->served_udm_info_list) {
         OpenAPI_list_for_each(nrf_info->served_udm_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udm_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udm_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_udm_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -613,6 +645,14 @@
     if (nrf_info->served_ausf_info) {
         OpenAPI_list_for_each(nrf_info->served_ausf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_ausf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_ausf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_ausf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -635,6 +675,14 @@
     if (nrf_info->served_ausf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_ausf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_ausf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_ausf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_ausf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -657,6 +705,14 @@
     if (nrf_info->served_amf_info) {
         OpenAPI_list_for_each(nrf_info->served_amf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_amf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_amf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_amf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -679,6 +735,14 @@
     if (nrf_info->served_amf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_amf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_amf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_amf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_amf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -701,6 +765,14 @@
     if (nrf_info->served_smf_info) {
         OpenAPI_list_for_each(nrf_info->served_smf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_smf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_smf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_smf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -723,6 +795,14 @@
     if (nrf_info->served_smf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_smf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_smf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_smf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_smf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -745,6 +825,14 @@
     if (nrf_info->served_upf_info) {
         OpenAPI_list_for_each(nrf_info->served_upf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_upf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_upf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_upf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -767,6 +855,14 @@
     if (nrf_info->served_upf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_upf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_upf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_upf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_upf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -789,6 +885,14 @@
     if (nrf_info->served_pcf_info) {
         OpenAPI_list_for_each(nrf_info->served_pcf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_pcf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_pcf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_pcf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -811,6 +915,14 @@
     if (nrf_info->served_pcf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_pcf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_pcf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_pcf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_pcf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -833,6 +945,14 @@
     if (nrf_info->served_bsf_info) {
         OpenAPI_list_for_each(nrf_info->served_bsf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_bsf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_bsf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_bsf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -855,6 +975,14 @@
     if (nrf_info->served_bsf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_bsf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_bsf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_bsf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_bsf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -877,6 +1005,14 @@
     if (nrf_info->served_chf_info) {
         OpenAPI_list_for_each(nrf_info->served_chf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_chf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_chf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_chf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -899,6 +1035,14 @@
     if (nrf_info->served_chf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_chf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_chf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_chf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_chf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -921,6 +1065,14 @@
     if (nrf_info->served_nef_info) {
         OpenAPI_list_for_each(nrf_info->served_nef_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nef_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nef_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_nef_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -943,6 +1095,14 @@
     if (nrf_info->served_nwdaf_info) {
         OpenAPI_list_for_each(nrf_info->served_nwdaf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nwdaf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nwdaf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_nwdaf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -965,6 +1125,14 @@
     if (nrf_info->served_nwdaf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_nwdaf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nwdaf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nwdaf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nwdaf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -987,6 +1155,14 @@
     if (nrf_info->served_pcscf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_pcscf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_pcscf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_pcscf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_pcscf_info_list_value_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1009,6 +1185,14 @@
     if (nrf_info->served_gmlc_info) {
         OpenAPI_list_for_each(nrf_info->served_gmlc_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_gmlc_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_gmlc_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_gmlc_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1031,6 +1215,14 @@
     if (nrf_info->served_lmf_info) {
         OpenAPI_list_for_each(nrf_info->served_lmf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_lmf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_lmf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_lmf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1053,6 +1245,14 @@
     if (nrf_info->served_nf_info) {
         OpenAPI_list_for_each(nrf_info->served_nf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1075,6 +1275,14 @@
     if (nrf_info->served_hss_info_list) {
         OpenAPI_list_for_each(nrf_info->served_hss_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_hss_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_hss_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_hss_info_list_value_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1097,6 +1305,14 @@
     if (nrf_info->served_udsf_info) {
         OpenAPI_list_for_each(nrf_info->served_udsf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udsf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udsf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_udsf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1119,6 +1335,14 @@
     if (nrf_info->served_udsf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_udsf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udsf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_udsf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_udsf_info_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1141,6 +1365,14 @@
     if (nrf_info->served_scp_info_list) {
         OpenAPI_list_for_each(nrf_info->served_scp_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_scp_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_scp_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1163,6 +1395,14 @@
     if (nrf_info->served_sepp_info_list) {
         OpenAPI_list_for_each(nrf_info->served_sepp_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_sepp_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_sepp_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_sepp_info_list_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1185,6 +1425,14 @@
     if (nrf_info->served_aanf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_aanf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_aanf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_aanf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_aanf_info_list_value_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1207,6 +1455,14 @@
     if (nrf_info->served5g_ddnmf_info) {
         OpenAPI_list_for_each(nrf_info->served5g_ddnmf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served5g_ddnmf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served5g_ddnmf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_model_5_g_ddnmf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1229,6 +1485,14 @@
     if (nrf_info->served_mfaf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_mfaf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_mfaf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_mfaf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_mfaf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1251,6 +1515,14 @@
     if (nrf_info->served_easdf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_easdf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_easdf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_easdf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_easdf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1273,6 +1545,14 @@
     if (nrf_info->served_dccf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_dccf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_dccf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_dccf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_dccf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1295,6 +1575,14 @@
     if (nrf_info->served_mb_smf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_mb_smf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_mb_smf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_mb_smf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1317,6 +1605,14 @@
     if (nrf_info->served_tsctsf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_tsctsf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_tsctsf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_tsctsf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_tsctsf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1339,6 +1635,14 @@
     if (nrf_info->served_mb_upf_info_list) {
         OpenAPI_list_for_each(nrf_info->served_mb_upf_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_mb_upf_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_mb_upf_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_mb_upf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1361,6 +1665,14 @@
     if (nrf_info->served_trust_af_info) {
         OpenAPI_list_for_each(nrf_info->served_trust_af_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_trust_af_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_trust_af_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_trust_af_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1383,6 +1695,14 @@
     if (nrf_info->served_nssaaf_info) {
         OpenAPI_list_for_each(nrf_info->served_nssaaf_info, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nssaaf_info");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_convertToJSON() failed served_nssaaf_info");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_nssaaf_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nrf_info_served_mb_smf_info_list_value_value.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_mb_smf_info_list_value_value.c Changed

@@ -99,6 +99,14 @@
     if (nrf_info_served_mb_smf_info_list_value_value->s_nssai_info_list) {
         OpenAPI_list_for_each(nrf_info_served_mb_smf_info_list_value_value->s_nssai_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON() failed s_nssai_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON() failed s_nssai_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_snssai_mb_smf_info_item_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -121,6 +129,14 @@
     if (nrf_info_served_mb_smf_info_list_value_value->tmgi_range_list) {
         OpenAPI_list_for_each(nrf_info_served_mb_smf_info_list_value_value->tmgi_range_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON() failed tmgi_range_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON() failed tmgi_range_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_tmgi_range_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -175,6 +191,14 @@
     if (nrf_info_served_mb_smf_info_list_value_value->mbs_session_list) {
         OpenAPI_list_for_each(nrf_info_served_mb_smf_info_list_value_value->mbs_session_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON() failed mbs_session_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_mb_smf_info_list_value_value_convertToJSON() failed mbs_session_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_mbs_session_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nrf_info_served_scp_info_list_value.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_scp_info_list_value.c Changed

@@ -155,6 +155,14 @@
     if (nrf_info_served_scp_info_list_value->scp_domain_info_list) {
         OpenAPI_list_for_each(nrf_info_served_scp_info_list_value->scp_domain_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON() failed scp_domain_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON() failed scp_domain_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_scp_domain_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -184,7 +192,19 @@
     if (nrf_info_served_scp_info_list_value->scp_ports) {
         OpenAPI_list_for_each(nrf_info_served_scp_info_list_value->scp_ports, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON() failed scp_ports");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON() failed scp_ports");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_nrf_info_served_scp_info_list_value_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nrf_info_served_sepp_info_list_value.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_sepp_info_list_value.c Changed

@@ -88,7 +88,19 @@
     if (nrf_info_served_sepp_info_list_value->sepp_ports) {
         OpenAPI_list_for_each(nrf_info_served_sepp_info_list_value->sepp_ports, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_sepp_info_list_value_convertToJSON() failed sepp_ports");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_sepp_info_list_value_convertToJSON() failed sepp_ports");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_nrf_info_served_sepp_info_list_value_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_nrf_info_served_sepp_info_list_value_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nrf_info_served_udsf_info_value.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nrf_info_served_udsf_info_value.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nsag_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nsag_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nsi_information.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nsi_information.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nssai.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nssai.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/nssai_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/nssai_1.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/pdu_session_create_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pdu_session_create_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/policy_association.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_association.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/policy_association_update_request.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_association_update_request.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/policy_data_change_notification.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_data_change_notification.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/policy_data_for_individual_ue.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_data_for_individual_ue.c Changed

@@ -126,6 +126,14 @@
     if (policy_data_for_individual_ue->um_data) {
         OpenAPI_list_for_each(policy_data_for_individual_ue->um_data, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_policy_data_for_individual_ue_convertToJSON() failed um_data");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_policy_data_for_individual_ue_convertToJSON() failed um_data");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_usage_mon_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -148,6 +156,14 @@
     if (policy_data_for_individual_ue->operator_specific_data_set) {
         OpenAPI_list_for_each(policy_data_for_individual_ue->operator_specific_data_set, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_policy_data_for_individual_ue_convertToJSON() failed operator_specific_data_set");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_policy_data_for_individual_ue_convertToJSON() failed operator_specific_data_set");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_operator_specific_data_container_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/policy_update.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/policy_update.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/pp5g_vn_group_profile_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pp5g_vn_group_profile_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/pp_profile_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pp_profile_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/pro_se_authentication_ctx.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pro_se_authentication_ctx.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/pro_se_eap_session.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/pro_se_eap_session.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/qos_flow_tunnel.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/qos_flow_tunnel.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/qos_monitoring_report.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/qos_monitoring_report.c Changed

@@ -94,7 +94,11 @@
         goto end;
     }
     OpenAPI_list_for_each(qos_monitoring_report->ul_delays, node) {
-        if (cJSON_AddNumberToObject(ul_delaysList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_qos_monitoring_report_convertToJSON() failed ul_delays");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(ul_delaysList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_qos_monitoring_report_convertToJSON() failed ul_delays");
             goto end;
         }
@@ -108,7 +112,11 @@
         goto end;
     }
     OpenAPI_list_for_each(qos_monitoring_report->dl_delays, node) {
-        if (cJSON_AddNumberToObject(dl_delaysList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_qos_monitoring_report_convertToJSON() failed dl_delays");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(dl_delaysList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_qos_monitoring_report_convertToJSON() failed dl_delays");
             goto end;
         }
@@ -122,7 +130,11 @@
         goto end;
     }
     OpenAPI_list_for_each(qos_monitoring_report->rt_delays, node) {
-        if (cJSON_AddNumberToObject(rt_delaysList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_qos_monitoring_report_convertToJSON() failed rt_delays");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(rt_delaysList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_qos_monitoring_report_convertToJSON() failed rt_delays");
             goto end;
         }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/release_session_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/release_session_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/rule_report.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/rule_report.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/scheduled_communication_time.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scheduled_communication_time.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/scheduled_communication_time_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scheduled_communication_time_1.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/scheduled_communication_time_rm.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scheduled_communication_time_rm.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/scp_domain_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scp_domain_info.c Changed

@@ -108,7 +108,19 @@
     if (scp_domain_info->scp_ports) {
         OpenAPI_list_for_each(scp_domain_info->scp_ports, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_scp_domain_info_convertToJSON() failed scp_ports");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_scp_domain_info_convertToJSON() failed scp_ports");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_scp_domain_info_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_scp_domain_info_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/scp_domain_routing_information.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scp_domain_routing_information.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/scp_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/scp_info.c Changed

@@ -155,6 +155,14 @@
     if (scp_info->scp_domain_info_list) {
         OpenAPI_list_for_each(scp_info->scp_domain_info_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_scp_info_convertToJSON() failed scp_domain_info_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_scp_info_convertToJSON() failed scp_domain_info_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_scp_domain_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -184,7 +192,19 @@
     if (scp_info->scp_ports) {
         OpenAPI_list_for_each(scp_info->scp_ports, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_scp_info_convertToJSON() failed scp_ports");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_scp_info_convertToJSON() failed scp_ports");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_scp_info_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_scp_info_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/search_result.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/search_result.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sepp_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sepp_info.c Changed

@@ -88,7 +88,19 @@
     if (sepp_info->sepp_ports) {
         OpenAPI_list_for_each(sepp_info->sepp_ports, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sepp_info_convertToJSON() failed sepp_ports");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sepp_info_convertToJSON() failed sepp_ports");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_sepp_info_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_sepp_info_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sequence_number.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sequence_number.c Changed

@@ -85,7 +85,19 @@
     if (sequence_number->last_indexes) {
         OpenAPI_list_for_each(sequence_number->last_indexes, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sequence_number_convertToJSON() failed last_indexes");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sequence_number_convertToJSON() failed last_indexes");
+                goto end;
+            }
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_sequence_number_convertToJSON() failed inner");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_sequence_number_convertToJSON() failed inner");
                 goto end;
             }

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/session_management_subscription_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/session_management_subscription_data.c Changed

@@ -155,6 +155,14 @@
     if (session_management_subscription_data->dnn_configurations) {
         OpenAPI_list_for_each(session_management_subscription_data->dnn_configurations, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed dnn_configurations");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed dnn_configurations");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_dnn_configuration_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -191,6 +199,14 @@
     if (session_management_subscription_data->shared_vn_group_data_ids) {
         OpenAPI_list_for_each(session_management_subscription_data->shared_vn_group_data_ids, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed inner");
                 goto end;
@@ -243,6 +259,14 @@
     if (session_management_subscription_data->expected_ue_behaviours_list) {
         OpenAPI_list_for_each(session_management_subscription_data->expected_ue_behaviours_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed expected_ue_behaviours_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed expected_ue_behaviours_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_expected_ue_behaviour_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -265,6 +289,14 @@
     if (session_management_subscription_data->suggested_packet_num_dl_list) {
         OpenAPI_list_for_each(session_management_subscription_data->suggested_packet_num_dl_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed suggested_packet_num_dl_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed suggested_packet_num_dl_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_suggested_packet_num_dl_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/session_management_subscription_data_1.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/session_management_subscription_data_1.c Changed

@@ -155,6 +155,14 @@
     if (session_management_subscription_data_1->dnn_configurations) {
         OpenAPI_list_for_each(session_management_subscription_data_1->dnn_configurations, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed dnn_configurations");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed dnn_configurations");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_dnn_configuration_1_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -191,6 +199,14 @@
     if (session_management_subscription_data_1->shared_vn_group_data_ids) {
         OpenAPI_list_for_each(session_management_subscription_data_1->shared_vn_group_data_ids, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed shared_vn_group_data_ids");
+                goto end;
+            }
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed inner");
                 goto end;
@@ -243,6 +259,14 @@
     if (session_management_subscription_data_1->expected_ue_behaviours_list) {
         OpenAPI_list_for_each(session_management_subscription_data_1->expected_ue_behaviours_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed expected_ue_behaviours_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed expected_ue_behaviours_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_expected_ue_behaviour_data_1_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -265,6 +289,14 @@
     if (session_management_subscription_data_1->suggested_packet_num_dl_list) {
         OpenAPI_list_for_each(session_management_subscription_data_1->suggested_packet_num_dl_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed suggested_packet_num_dl_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_session_management_subscription_data_1_convertToJSON() failed suggested_packet_num_dl_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_suggested_packet_num_dl_1_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/shared_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/shared_data.c Changed

@@ -182,6 +182,14 @@
     if (shared_data->shared_dnn_configurations) {
         OpenAPI_list_for_each(shared_data->shared_dnn_configurations, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed shared_dnn_configurations");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed shared_dnn_configurations");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_dnn_configuration_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -217,6 +225,14 @@
     if (shared_data->shared_snssai_infos) {
         OpenAPI_list_for_each(shared_data->shared_snssai_infos, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed shared_snssai_infos");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed shared_snssai_infos");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_snssai_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -239,6 +255,14 @@
     if (shared_data->shared_vn_group_datas) {
         OpenAPI_list_for_each(shared_data->shared_vn_group_datas, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed shared_vn_group_datas");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed shared_vn_group_datas");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_vn_group_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -261,6 +285,14 @@
     if (shared_data->treatment_instructions) {
         OpenAPI_list_for_each(shared_data->treatment_instructions, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed treatment_instructions");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_shared_data_convertToJSON() failed treatment_instructions");
+                goto end;
+            }
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, OpenAPI_shared_data_treatment_instruction_ToString((intptr_t)localKeyValue->value)) == NULL) {
                 ogs_error("OpenAPI_shared_data_convertToJSON() failed treatment_instructions");
                 goto end;

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_context_create_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_context_create_data.c Changed

@@ -855,7 +855,11 @@
         goto end;
     }
     OpenAPI_list_for_each(sm_context_create_data->pdu_sessions_activate_list, node) {
-        if (cJSON_AddNumberToObject(pdu_sessions_activate_listList, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_sm_context_create_data_convertToJSON() failed pdu_sessions_activate_list");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject(pdu_sessions_activate_listList, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_sm_context_create_data_convertToJSON() failed pdu_sessions_activate_list");
             goto end;
         }
@@ -1304,6 +1308,14 @@
     if (sm_context_create_data->nrf_oauth2_required) {
         OpenAPI_list_for_each(sm_context_create_data->nrf_oauth2_required, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_context_create_data_convertToJSON() failed nrf_oauth2_required");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_context_create_data_convertToJSON() failed nrf_oauth2_required");
+                goto end;
+            }
             if (cJSON_AddBoolToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_sm_context_create_data_convertToJSON() failed inner");
                 goto end;

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_context_retrieve_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_context_retrieve_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_context_update_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_context_update_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_context_updated_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_context_updated_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_data.c Changed

@@ -99,6 +99,14 @@
     if (sm_policy_data->sm_policy_snssai_data) {
         OpenAPI_list_for_each(sm_policy_data->sm_policy_snssai_data, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_convertToJSON() failed sm_policy_snssai_data");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_convertToJSON() failed sm_policy_snssai_data");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_sm_policy_snssai_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -120,6 +128,14 @@
     if (sm_policy_data->um_data_limits) {
         OpenAPI_list_for_each(sm_policy_data->um_data_limits, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_convertToJSON() failed um_data_limits");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_convertToJSON() failed um_data_limits");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_usage_mon_data_limit_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -142,6 +158,14 @@
     if (sm_policy_data->um_data) {
         OpenAPI_list_for_each(sm_policy_data->um_data, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_convertToJSON() failed um_data");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_convertToJSON() failed um_data");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_usage_mon_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_data_patch.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_data_patch.c Changed

@@ -69,6 +69,14 @@
     if (sm_policy_data_patch->um_data) {
         OpenAPI_list_for_each(sm_policy_data_patch->um_data, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_patch_convertToJSON() failed um_data");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_patch_convertToJSON() failed um_data");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_usage_mon_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -91,6 +99,14 @@
     if (sm_policy_data_patch->sm_policy_snssai_data) {
         OpenAPI_list_for_each(sm_policy_data_patch->sm_policy_snssai_data, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_patch_convertToJSON() failed sm_policy_snssai_data");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_data_patch_convertToJSON() failed sm_policy_snssai_data");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_sm_policy_snssai_data_patch_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_decision.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_decision.c Changed

@@ -261,6 +261,14 @@
     if (sm_policy_decision->sess_rules) {
         OpenAPI_list_for_each(sm_policy_decision->sess_rules, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed sess_rules");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed sess_rules");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_session_rule_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -283,6 +291,14 @@
     if (sm_policy_decision->pcc_rules) {
         OpenAPI_list_for_each(sm_policy_decision->pcc_rules, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed pcc_rules");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed pcc_rules");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_pcc_rule_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -312,6 +328,14 @@
     if (sm_policy_decision->qos_decs) {
         OpenAPI_list_for_each(sm_policy_decision->qos_decs, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed qos_decs");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed qos_decs");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_qos_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -334,6 +358,14 @@
     if (sm_policy_decision->chg_decs) {
         OpenAPI_list_for_each(sm_policy_decision->chg_decs, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed chg_decs");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed chg_decs");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_charging_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -369,6 +401,14 @@
     if (sm_policy_decision->traff_cont_decs) {
         OpenAPI_list_for_each(sm_policy_decision->traff_cont_decs, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed traff_cont_decs");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed traff_cont_decs");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_traffic_control_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -391,6 +431,14 @@
     if (sm_policy_decision->um_decs) {
         OpenAPI_list_for_each(sm_policy_decision->um_decs, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed um_decs");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed um_decs");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_usage_monitoring_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -413,6 +461,14 @@
     if (sm_policy_decision->qos_chars) {
         OpenAPI_list_for_each(sm_policy_decision->qos_chars, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed qos_chars");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed qos_chars");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_qos_characteristics_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -435,6 +491,14 @@
     if (sm_policy_decision->qos_mon_decs) {
         OpenAPI_list_for_each(sm_policy_decision->qos_mon_decs, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed qos_mon_decs");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed qos_mon_decs");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_qos_monitoring_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -464,6 +528,14 @@
     if (sm_policy_decision->conds) {
         OpenAPI_list_for_each(sm_policy_decision->conds, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed conds");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed conds");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_condition_data_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -557,6 +629,14 @@
     if (sm_policy_decision->pra_infos) {
         OpenAPI_list_for_each(sm_policy_decision->pra_infos, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed pra_infos");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_decision_convertToJSON() failed pra_infos");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_presence_info_rm_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_dnn_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_dnn_data.c Changed

@@ -277,6 +277,14 @@
     if (sm_policy_dnn_data->ref_um_data_limit_ids) {
         OpenAPI_list_for_each(sm_policy_dnn_data->ref_um_data_limit_ids, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed ref_um_data_limit_ids");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed ref_um_data_limit_ids");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_limit_id_to_monitoring_key_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -334,6 +342,14 @@
     if (sm_policy_dnn_data->pra_infos) {
         OpenAPI_list_for_each(sm_policy_dnn_data->pra_infos, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed pra_infos");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed pra_infos");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -356,6 +372,14 @@
     if (sm_policy_dnn_data->bdt_ref_ids) {
         OpenAPI_list_for_each(sm_policy_dnn_data->bdt_ref_ids, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed bdt_ref_ids");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed bdt_ref_ids");
+                goto end;
+            }
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_sm_policy_dnn_data_convertToJSON() failed inner");
                 goto end;

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_snssai_data_patch.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/sm_policy_update_context_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/sm_policy_update_context_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/smf_change_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/smf_change_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/smf_selection_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/smf_selection_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/smf_selection_subscription_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/smf_selection_subscription_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/spatial_validity.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/spatial_validity.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/spatial_validity_rm.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/spatial_validity_rm.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/suci_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/suci_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/traffic_descriptor_components.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/traffic_descriptor_components.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/tsctsf_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/tsctsf_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/uc_subscription_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/uc_subscription_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/udsf_info.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/udsf_info.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_authentication_ctx.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_authentication_ctx.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_context.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_context.c Changed

@@ -649,6 +649,14 @@
     if (ue_context->sub_ue_slice_mbr_list) {
         OpenAPI_list_for_each(ue_context->sub_ue_slice_mbr_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed sub_ue_slice_mbr_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed sub_ue_slice_mbr_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_slice_mbr_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1162,6 +1170,14 @@
     if (ue_context->pra_in_am_policy) {
         OpenAPI_list_for_each(ue_context->pra_in_am_policy, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed pra_in_am_policy");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed pra_in_am_policy");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1184,6 +1200,14 @@
     if (ue_context->pra_in_ue_policy) {
         OpenAPI_list_for_each(ue_context->pra_in_ue_policy, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed pra_in_ue_policy");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed pra_in_ue_policy");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -1289,6 +1313,14 @@
     if (ue_context->pcf_ue_slice_mbr_list) {
         OpenAPI_list_for_each(ue_context->pcf_ue_slice_mbr_list, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed pcf_ue_slice_mbr_list");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_context_convertToJSON() failed pcf_ue_slice_mbr_list");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_slice_mbr_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_context_in_smf_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_policy_set.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_policy_set.c Changed

@@ -133,6 +133,14 @@
     if (ue_policy_set->pra_infos) {
         OpenAPI_list_for_each(ue_policy_set->pra_infos, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_policy_set_convertToJSON() failed pra_infos");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_policy_set_convertToJSON() failed pra_infos");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -169,6 +177,14 @@
     if (ue_policy_set->ue_policy_sections) {
         OpenAPI_list_for_each(ue_policy_set->ue_policy_sections, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_policy_set_convertToJSON() failed ue_policy_sections");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_policy_set_convertToJSON() failed ue_policy_sections");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_ue_policy_section_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();
@@ -205,6 +221,14 @@
     if (ue_policy_set->allowed_route_sel_descs) {
         OpenAPI_list_for_each(ue_policy_set->allowed_route_sel_descs, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_ue_policy_set_convertToJSON() failed allowed_route_sel_descs");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_ue_policy_set_convertToJSON() failed allowed_route_sel_descs");
+                goto end;
+            }
             cJSON *itemLocal = localKeyValue->value ?
                 OpenAPI_plmn_route_selection_descriptor_convertToJSON(localKeyValue->value) :
                 cJSON_CreateNull();

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_policy_set_patch.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_policy_set_patch.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_reg_status_update_req_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_reg_status_update_req_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/ue_slice_mbr.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/ue_slice_mbr.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/uri_list.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/uri_list.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/usage_mon_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/usage_mon_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/usage_mon_data_limit.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/usage_mon_data_limit.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/vsmf_update_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/vsmf_update_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/openapi/model/vsmf_updated_data.c -> open5gs_2.6.4.tar.xz/lib/sbi/openapi/model/vsmf_updated_data.c Changed

open5gs_2.6.3.tar.xz/lib/sbi/support/r17-20230301-openapitools-6.4.0/openapi-generator/templates/model-body.mustache -> open5gs_2.6.4.tar.xz/lib/sbi/support/r17-20230301-openapitools-6.4.0/openapi-generator/templates/model-body.mustache Changed

@@ -487,7 +487,11 @@
         }
                         {{/isByteArray}}
                         {{#isNumeric}}
-        if (cJSON_AddNumberToObject({{{name}}}List, "", (uintptr_t)node->data) == NULL) {
+        if (node->data == NULL) {
+            ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
+            goto end;
+        }
+        if (cJSON_AddNumberToObject({{{name}}}List, "", *(double *)node->data) == NULL) {
             ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
             goto end;
         }
@@ -521,6 +525,14 @@
     if ({{{classname}}}->{{{name}}}) {
         OpenAPI_list_for_each({{{classname}}}->{{{name}}}, node) {
             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;
+            if (localKeyValue == NULL) {
+                ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
+                goto end;
+            }
+            if (localKeyValue->key == NULL) {
+                ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
+                goto end;
+            }
             {{#isEnum}}
             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, OpenAPI_{{{complexType}}}_ToString((intptr_t)localKeyValue->value)) == NULL) {
                 ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
@@ -543,7 +555,11 @@
             }
                         {{/isByteArray}}
                         {{#isNumeric}}
-            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {
+            if (localKeyValue->value == NULL) {
+                ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
+                goto end;
+            }
+            if (cJSON_AddNumberToObject(localMapObject, localKeyValue->key, *(double *)localKeyValue->value) == NULL) {
                 ogs_error("OpenAPI_{{classname}}_convertToJSON() failed {{{name}}}");
                 goto end;
             }

open5gs_2.6.3.tar.xz/meson.build -> open5gs_2.6.4.tar.xz/meson.build Changed

open5gs_2.6.4.tar.xz/meson_options.txt Added

open5gs_2.6.3.tar.xz/src/amf/context.c -> open5gs_2.6.4.tar.xz/src/amf/context.c Changed

open5gs_2.6.3.tar.xz/src/amf/gmm-handler.c -> open5gs_2.6.4.tar.xz/src/amf/gmm-handler.c Changed

open5gs_2.6.3.tar.xz/src/amf/nnssf-handler.c -> open5gs_2.6.4.tar.xz/src/amf/nnssf-handler.c Changed

open5gs_2.6.3.tar.xz/src/amf/npcf-build.c -> open5gs_2.6.4.tar.xz/src/amf/npcf-build.c Changed

open5gs_2.6.3.tar.xz/src/amf/nsmf-build.c -> open5gs_2.6.4.tar.xz/src/amf/nsmf-build.c Changed

open5gs_2.6.3.tar.xz/src/amf/nsmf-handler.c -> open5gs_2.6.4.tar.xz/src/amf/nsmf-handler.c Changed

@@ -239,23 +239,29 @@
                             AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT) &&
                         AMF_SESSION_SYNC_DONE(amf_ue,
                             AMF_UPDATE_SM_CONTEXT_REGISTRATION_REQUEST)) {
+                        ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue);
 
-                        if (!PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
-                            r = amf_ue_sbi_discover_and_send(
-                                    OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
-                                    NULL,
-                                    amf_npcf_am_policy_control_build_create,
-                                    amf_ue, 0, NULL);
-                            ogs_expect(r == OGS_OK);
-                            ogs_assert(r != OGS_ERROR);
-                        } else {
-                            CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                            r = nas_5gs_send_registration_accept(amf_ue);
-                            ogs_expect(r == OGS_OK);
-                            ogs_assert(r != OGS_ERROR);
+                        if (ran_ue) {
+                            if (!PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
+                                r = amf_ue_sbi_discover_and_send(
+                                        OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL,
+                                        NULL,
+                                        amf_npcf_am_policy_control_build_create,
+                                        amf_ue, 0, NULL);
+                                ogs_expect(r == OGS_OK);
+                                ogs_assert(r != OGS_ERROR);
+                            } else {
+                                CLEAR_AMF_UE_TIMER(amf_ue->t3550);
+                                r = nas_5gs_send_registration_accept(amf_ue);
+                                ogs_expect(r == OGS_OK);
+                                ogs_assert(r != OGS_ERROR);
 
-                            AMF_UE_CLEAR_N2_TRANSFER(
-                                    amf_ue, pdu_session_resource_setup_request);
+                                AMF_UE_CLEAR_N2_TRANSFER(amf_ue,
+                                        pdu_session_resource_setup_request);
+                            }
+                        } else {
+                            ogs_warn("%s RAN-NG Context has already "
+                                    "been removed", amf_ue->supi);
                         }
                     }
                 } else if (state == AMF_UPDATE_SM_CONTEXT_SERVICE_REQUEST) {
@@ -584,6 +590,7 @@
 
             } else if (state ==
                     AMF_UPDATE_SM_CONTEXT_DUPLICATED_PDU_SESSION_ID) {
+                ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue);
                 /*
                  * 1. PDU session establishment request
                  *    (Duplicated PDU Session ID)
@@ -594,12 +601,17 @@
                 ogs_warn("%s:%d Receive Update SM context"
                         "(DUPLICATED_PDU_SESSION_ID)", amf_ue->supi, sess->psi);
 
-                r = amf_sess_sbi_discover_and_send(
-                        OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, NULL,
-                        amf_nsmf_pdusession_build_create_sm_context,
-                        sess, AMF_CREATE_SM_CONTEXT_NO_STATE, NULL);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
+                if (ran_ue) {
+                    r = amf_sess_sbi_discover_and_send(
+                            OGS_SBI_SERVICE_TYPE_NSMF_PDUSESSION, NULL,
+                            amf_nsmf_pdusession_build_create_sm_context,
+                            sess, AMF_CREATE_SM_CONTEXT_NO_STATE, NULL);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                } else {
+                    ogs_warn("%s RAN-NG Context has already been removed",
+                            amf_ue->supi);
+                }
 
             } else if (state == AMF_UPDATE_SM_CONTEXT_PATH_SWITCH_REQUEST) {
 
@@ -890,19 +902,25 @@
                 amf_ue, AMF_RELEASE_SM_CONTEXT_REGISTRATION_ACCEPT) &&
             AMF_SESSION_SYNC_DONE(
                 amf_ue, AMF_UPDATE_SM_CONTEXT_REGISTRATION_REQUEST)) {
+            ran_ue_t *ran_ue = ran_ue_cycle(amf_ue->ran_ue);
 
-            if (!PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
-                r = amf_ue_sbi_discover_and_send(
-                        OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
-                        amf_npcf_am_policy_control_build_create,
-                        amf_ue, 0, NULL);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
+            if (ran_ue) {
+                if (!PCF_AM_POLICY_ASSOCIATED(amf_ue)) {
+                    r = amf_ue_sbi_discover_and_send(
+                            OGS_SBI_SERVICE_TYPE_NPCF_AM_POLICY_CONTROL, NULL,
+                            amf_npcf_am_policy_control_build_create,
+                            amf_ue, 0, NULL);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                } else {
+                    CLEAR_AMF_UE_TIMER(amf_ue->t3550);
+                    r = nas_5gs_send_registration_accept(amf_ue);
+                    ogs_expect(r == OGS_OK);
+                    ogs_assert(r != OGS_ERROR);
+                }
             } else {
-                CLEAR_AMF_UE_TIMER(amf_ue->t3550);
-                r = nas_5gs_send_registration_accept(amf_ue);
-                ogs_expect(r == OGS_OK);
-                ogs_assert(r != OGS_ERROR);
+                ogs_warn("%s RAN-NG Context has already been removed",
+                        amf_ue->supi);
             }
         }

open5gs_2.6.3.tar.xz/src/amf/nudm-handler.c -> open5gs_2.6.4.tar.xz/src/amf/nudm-handler.c Changed

@@ -26,20 +26,21 @@
         amf_ue_t *amf_ue, int state, ogs_sbi_message_t *recvmsg)
 {
     int i, r;
+    ran_ue_t *ran_ue = NULL;
 
     ogs_assert(amf_ue);
     ogs_assert(recvmsg);
 
+    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;
+    }
+
     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;
@@ -242,7 +243,6 @@
         break;
 
     CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA)
-
         if (amf_ue->data_change_subscription_id) {
             /* we already have a SDM subscription to UDM; continue without
              * subscribing again */

open5gs_2.6.3.tar.xz/src/mme/mme-context.c -> open5gs_2.6.4.tar.xz/src/mme/mme-context.c Changed

@@ -1628,8 +1628,13 @@
                         int family = AF_UNSPEC;
                         int i, num = 0;
                         const char *hostnameOGS_MAX_NUM_OF_HOSTNAME;
-                        const char *apn = NULL;
                         uint16_t port = ogs_gtp_self()->gtpc_port;
+                        const char *apnOGS_MAX_NUM_OF_APN = {NULL,};
+                        uint8_t num_of_apn = 0;
+                        uint16_t tacOGS_MAX_NUM_OF_TAI = {0,};
+                        uint8_t num_of_tac = 0;
+                        uint32_t e_cell_idOGS_MAX_NUM_OF_CELL_ID = {0,};
+                        uint8_t num_of_e_cell_id = 0;
 
                         if (ogs_yaml_iter_type(&gtpc_array) ==
                                 YAML_MAPPING_NODE) {
@@ -1686,7 +1691,82 @@
                                 const char *v = ogs_yaml_iter_value(&gtpc_iter);
                                 if (v) port = atoi(v);
                             } else if (!strcmp(gtpc_key, "apn")) {
-                                apn = ogs_yaml_iter_value(&gtpc_iter);
+                                ogs_yaml_iter_t apn_iter;
+                                ogs_yaml_iter_recurse(&gtpc_iter, &apn_iter);
+                                ogs_assert(ogs_yaml_iter_type(&apn_iter) !=
+                                    YAML_MAPPING_NODE);
+
+                                do {
+                                    const char *v = NULL;
+
+                                    ogs_assert(num_of_apn <
+                                            OGS_MAX_NUM_OF_APN);
+                                    if (ogs_yaml_iter_type(&apn_iter) ==
+                                            YAML_SEQUENCE_NODE) {
+                                        if (!ogs_yaml_iter_next(&apn_iter))
+                                            break;
+                                    }
+
+                                    v = ogs_yaml_iter_value(&apn_iter);
+                                    if (v) {
+                                        apnnum_of_apn = v;
+                                        num_of_apn++;
+                                    }
+                                } while (
+                                    ogs_yaml_iter_type(&apn_iter) ==
+                                        YAML_SEQUENCE_NODE);
+                            } else if (!strcmp(gtpc_key, "tac")) {
+                                ogs_yaml_iter_t tac_iter;
+                                ogs_yaml_iter_recurse(&gtpc_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 = atoi(v);
+                                        num_of_tac++;
+                                    }
+                                } while (
+                                    ogs_yaml_iter_type(&tac_iter) ==
+                                        YAML_SEQUENCE_NODE);
+                            } else if (!strcmp(gtpc_key, "e_cell_id")) {
+                                ogs_yaml_iter_t e_cell_id_iter;
+                                ogs_yaml_iter_recurse(&gtpc_iter,
+                                        &e_cell_id_iter);
+                                ogs_assert(ogs_yaml_iter_type(&e_cell_id_iter)
+                                        != YAML_MAPPING_NODE);
+
+                                do {
+                                    const char *v = NULL;
+
+                                    ogs_assert(num_of_e_cell_id <
+                                            OGS_MAX_NUM_OF_CELL_ID);
+                                    if (ogs_yaml_iter_type(&e_cell_id_iter) ==
+                                            YAML_SEQUENCE_NODE) {
+                                        if (!ogs_yaml_iter_next(
+                                                    &e_cell_id_iter))
+                                            break;
+                                    }
+                                    v = ogs_yaml_iter_value(&e_cell_id_iter);
+                                    if (v) {
+                                        e_cell_idnum_of_e_cell_id
+                                            = ogs_uint64_from_string((char*)v);
+                                        num_of_e_cell_id++;
+                                    }
+                                } while (
+                                    ogs_yaml_iter_type(&e_cell_id_iter) ==
+                                        YAML_SEQUENCE_NODE);
                             } else
                                 ogs_warn("unknown key `%s`", gtpc_key);
                         }
@@ -1708,7 +1788,18 @@
                         pgw = mme_pgw_add(addr);
                         ogs_assert(pgw);
 
-                        pgw->apn = apn;
+                        pgw->num_of_apn = num_of_apn;
+                        if (num_of_apn != 0)
+                            memcpy(pgw->apn, apn, sizeof(pgw->apn));
+
+                        pgw->num_of_tac = num_of_tac;
+                        if (num_of_tac != 0)
+                            memcpy(pgw->tac, tac, sizeof(pgw->tac));
+
+                        pgw->num_of_e_cell_id = num_of_e_cell_id;
+                        if (num_of_e_cell_id != 0)
+                            memcpy(pgw->e_cell_id, e_cell_id,
+                                    sizeof(pgw->e_cell_id));
 
                     } while (ogs_yaml_iter_type(&gtpc_array) ==
                             YAML_SEQUENCE_NODE);
@@ -1881,8 +1972,33 @@
         mme_pgw_remove(pgw);
 }
 
-ogs_sockaddr_t *mme_pgw_addr_find_by_apn(
-        ogs_list_t *list, int family, char *apn)
+static bool compare_apn_enb_info(
+    mme_pgw_t *pgw, mme_sess_t *sess)
+{
+    mme_ue_t *mme_ue = NULL;
+    int i;
+
+    ogs_assert(pgw);
+    ogs_assert(sess);
+    ogs_assert(sess->session);
+    ogs_assert(sess->session->name);
+    mme_ue = sess->mme_ue;
+    ogs_assert(mme_ue);
+
+    for (i = 0; i < pgw->num_of_apn; i++)
+      if (!ogs_strcasecmp(pgw->apni, sess->session->name)) return true;
+
+    for (i = 0; i < pgw->num_of_e_cell_id; i++)
+      if (pgw->e_cell_idi == mme_ue->e_cgi.cell_id) return true;
+
+    for (i = 0; i < pgw->num_of_tac; i++)
+      if (pgw->taci == mme_ue->tai.tac) return true;
+
+    return false;
+}
+
+ogs_sockaddr_t *mme_pgw_addr_find_by_apn_enb(
+    ogs_list_t *list, int family, mme_sess_t *sess)
 {
     mme_pgw_t *pgw = NULL;
     ogs_assert(list);
@@ -1893,7 +2009,7 @@
 
         while (addr) {
             if (addr->ogs_sa_family == family &&
-                (!apn || (pgw->apn && !ogs_strcasecmp(apn, pgw->apn)))) {
+                (!sess || compare_apn_enb_info(pgw, sess))) {
                 return addr;
             }
             addr = addr->next;
@@ -3480,8 +3596,9 @@
     pti = message->esm.h.procedure_transaction_identity;
     ebi = message->esm.h.eps_bearer_identity;
 
-    ogs_debug("mme_bearer_find_or_add_by_message() PTI:%d, EBI:%d",
-            pti, ebi);
+    ogs_debug("mme_bearer_find_or_add_by_message() : "
+            "ESM message type:%d, PTI:%d, EBI:%d",
+            message->esm.h.message_type, pti, ebi);
 
     if (ebi != OGS_NAS_EPS_BEARER_IDENTITY_UNASSIGNED) {
         bearer = mme_bearer_find_by_ue_ebi(mme_ue, ebi);
@@ -3620,7 +3737,11 @@
     }
 
     bearer = mme_default_bearer_in_sess(sess);
-    ogs_assert(bearer);
+    if (!bearer) {
+        ogs_error("No Bearer(%d) : ESM message type:%d, PTI:%d, EBI:%d",
+                mme_sess_count(mme_ue), message->esm.h.message_type, pti, ebi);
+        ogs_assert_if_reached();
+    }
 
     return bearer;
 }
@@ -3835,6 +3956,9 @@
 int mme_m_tmsi_free(mme_m_tmsi_t *m_tmsi)
 {
     ogs_assert(m_tmsi);
+
+    /* Restore M-TMSI by Issue #2307 */
+    *m_tmsi &= 0x003fffff;
     ogs_pool_free(&m_tmsi_pool, m_tmsi);
 
     return OGS_OK;

open5gs_2.6.3.tar.xz/src/mme/mme-context.h -> open5gs_2.6.4.tar.xz/src/mme/mme-context.h Changed

@@ -176,7 +176,13 @@
     ogs_lnode_t     lnode;
 
     ogs_sockaddr_t  *sa_list;
-    const char      *apn;
+
+    const char      *apnOGS_MAX_NUM_OF_APN;
+    uint8_t         num_of_apn;
+    uint16_t        tacOGS_MAX_NUM_OF_TAI;
+    uint8_t         num_of_tac;
+    uint32_t        e_cell_idOGS_MAX_NUM_OF_CELL_ID;
+    uint8_t         num_of_e_cell_id;
 } mme_pgw_t;
 
 #define MME_SGSAP_IS_CONNECTED(__mME) \
@@ -613,6 +619,20 @@
         ((__mME)->sgw_ue)->sgw_s11_teid = 0; \
     } while(0)
 
+#define MME_SESS_CLEAR(__sESS) \
+    do { \
+        mme_ue_t *mme_ue = NULL; \
+        ogs_assert(__sESS); \
+        mme_ue = __sESS->mme_ue; \
+        ogs_assert(mme_ue); \
+        ogs_info("Removed Session: UE IMSI:%s APN:%s", \
+                mme_ue->imsi_bcd, \
+                sess->session ? sess->session->name : "Unknown"); \
+        if (mme_sess_count(mme_ue) == 1) /* Last Session */ \
+            CLEAR_SESSION_CONTEXT(mme_ue); \
+        mme_sess_remove(sess); \
+    } while(0)
+
 #define ACTIVE_EPS_BEARERS_IS_AVAIABLE(__mME) \
     (mme_ue_have_active_eps_bearers(__mME))
 #define MME_SESSION_RELEASE_PENDING(__mME) \
@@ -764,8 +784,8 @@
 mme_pgw_t *mme_pgw_add(ogs_sockaddr_t *addr);
 void mme_pgw_remove(mme_pgw_t *pgw);
 void mme_pgw_remove_all(void);
-ogs_sockaddr_t *mme_pgw_addr_find_by_apn(
-        ogs_list_t *list, int family, char *apn);
+ogs_sockaddr_t *mme_pgw_addr_find_by_apn_enb(
+        ogs_list_t *list, int family, mme_sess_t *sess);
 
 mme_vlr_t *mme_vlr_add(ogs_sockaddr_t *sa_list, ogs_sockopt_t *option);
 void mme_vlr_remove(mme_vlr_t *vlr);

open5gs_2.6.3.tar.xz/src/mme/mme-gtp-path.c -> open5gs_2.6.4.tar.xz/src/mme/mme-gtp-path.c Changed

open5gs_2.6.3.tar.xz/src/mme/mme-s11-build.c -> open5gs_2.6.4.tar.xz/src/mme/mme-s11-build.c Changed

open5gs_2.6.3.tar.xz/src/mme/mme-s11-handler.c -> open5gs_2.6.4.tar.xz/src/mme/mme-s11-handler.c Changed

open5gs_2.6.3.tar.xz/src/mme/mme-sm.c -> open5gs_2.6.4.tar.xz/src/mme/mme-sm.c Changed

open5gs_2.6.3.tar.xz/src/scp/context.c -> open5gs_2.6.4.tar.xz/src/scp/context.c Changed

@@ -100,6 +100,146 @@
                     /* handle config in sbi library */
                 } else if (!strcmp(scp_key, "discovery")) {
                     /* handle config in sbi library */
+                } else if (!strcmp(scp_key, "info")) {
+                    ogs_sbi_nf_instance_t *nf_instance = NULL;
+                    ogs_sbi_nf_info_t *nf_info = NULL;
+                    ogs_sbi_scp_info_t *scp_info = NULL;
+
+                    ogs_yaml_iter_t info_iter;
+                    ogs_yaml_iter_recurse(&scp_iter, &info_iter);
+
+                    nf_instance = ogs_sbi_self()->nf_instance;
+                    ogs_assert(nf_instance);
+
+                    nf_info = ogs_sbi_nf_info_add(
+                                &nf_instance->nf_info_list,
+                                    OpenAPI_nf_type_SCP);
+                    ogs_assert(nf_info);
+
+                    scp_info = &nf_info->scp;
+
+                    while (ogs_yaml_iter_next(&info_iter)) {
+                        const char *info_key =
+                            ogs_yaml_iter_key(&info_iter);
+                        ogs_assert(info_key);
+                        if (!strcmp(info_key, "domain")) {
+                            ogs_yaml_iter_t domain_array, domain_iter;
+                            ogs_yaml_iter_recurse(&info_iter, &domain_array);
+
+                            do {
+                                if (ogs_yaml_iter_type(&domain_array) ==
+                                        YAML_MAPPING_NODE) {
+                                    memcpy(&domain_iter, &domain_array,
+                                            sizeof(ogs_yaml_iter_t));
+                                } else if (ogs_yaml_iter_type(&domain_array) ==
+                                            YAML_SEQUENCE_NODE) {
+                                    if (!ogs_yaml_iter_next(&domain_array))
+                                        break;
+                                    ogs_yaml_iter_recurse(&domain_array,
+                                            &domain_iter);
+                                } else if (ogs_yaml_iter_type(&domain_array) ==
+                                            YAML_SCALAR_NODE) {
+                                    break;
+                                } else
+                                    ogs_assert_if_reached();
+
+                                while (ogs_yaml_iter_next(&domain_iter)) {
+                                    const char *domain_key =
+                                        ogs_yaml_iter_key(&domain_iter);
+                                    ogs_assert(domain_key);
+                                    if (!strcmp(domain_key, "port")) {
+                                        ogs_yaml_iter_t port_iter;
+                                        ogs_yaml_iter_recurse(&domain_iter,
+                                                &port_iter);
+                                        while (ogs_yaml_iter_next(&port_iter)) {
+                                            const char *port_key =
+                                                ogs_yaml_iter_key(&port_iter);
+                                            ogs_assert(port_key);
+                                            if (!strcmp(port_key, "http")) {
+                                                const char *v =
+                                                    ogs_yaml_iter_value(
+                                                            &port_iter);
+                                                if (v) {
+                                                    scp_info->domain
+                                                        scp_info->
+                                                            num_of_domain.
+                                                            http.presence =
+                                                                true;
+                                                    scp_info->domain
+                                                        scp_info->
+                                                            num_of_domain.
+                                                            http.port = atoi(v);
+                                                }
+                                            } else if (!strcmp(port_key,
+                                                        "https")) {
+                                                const char *v =
+                                                    ogs_yaml_iter_value(
+                                                            &port_iter);
+                                                if (v) {
+                                                    scp_info->domain
+                                                        scp_info->
+                                                            num_of_domain.
+                                                            https.presence =
+                                                                true;
+                                                    scp_info->domain
+                                                        scp_info->
+                                                            num_of_domain.
+                                                            https.port =
+                                                                atoi(v);
+                                                }
+                                            } else
+                                                ogs_warn("unknown key `%s`",
+                                                        port_key);
+                                        }
+                                    } else if (!strcmp(domain_key, "name")) {
+                                        scp_info->domain
+                                            scp_info->num_of_domain.
+                                            name = (char *)ogs_yaml_iter_value(
+                                                    &domain_iter);
+                                    } else if (!strcmp(domain_key, "fqdn")) {
+                                        scp_info->domain
+                                            scp_info->num_of_domain.
+                                            fqdn = (char *)ogs_yaml_iter_value(
+                                                    &domain_iter);
+                                    } else
+                                        ogs_warn("unknown key `%s`",
+                                                domain_key);
+                                }
+
+                                if (scp_info->domain
+                                        scp_info->num_of_domain.name)
+                                    scp_info->num_of_domain++;
+
+                            } while (ogs_yaml_iter_type(&domain_array) ==
+                                    YAML_SEQUENCE_NODE);
+
+                        } else if (!strcmp(info_key, "port")) {
+                            ogs_yaml_iter_t port_iter;
+                            ogs_yaml_iter_recurse(&info_iter, &port_iter);
+                            while (ogs_yaml_iter_next(&port_iter)) {
+                                const char *port_key =
+                                    ogs_yaml_iter_key(&port_iter);
+                                ogs_assert(port_key);
+                                if (!strcmp(port_key, "http")) {
+                                    const char *v =
+                                        ogs_yaml_iter_value(&port_iter);
+                                    if (v) {
+                                        scp_info->http.presence = true;
+                                        scp_info->http.port = atoi(v);
+                                    }
+                                } else if (!strcmp(port_key, "https")) {
+                                    const char *v =
+                                        ogs_yaml_iter_value(&port_iter);
+                                    if (v) {
+                                        scp_info->https.presence = true;
+                                        scp_info->https.port = atoi(v);
+                                    }
+                                } else
+                                    ogs_warn("unknown key `%s`", port_key);
+                            }
+                        } else
+                            ogs_warn("unknown key `%s`", info_key);
+                    }
                 } else
                     ogs_warn("unknown key `%s`", scp_key);
             }

open5gs_2.6.3.tar.xz/src/sgwu/sxa-handler.c -> open5gs_2.6.4.tar.xz/src/sgwu/sxa-handler.c Changed

open5gs_2.6.3.tar.xz/src/smf/context.h -> open5gs_2.6.4.tar.xz/src/smf/context.h Changed

open5gs_2.6.3.tar.xz/src/smf/n4-handler.c -> open5gs_2.6.4.tar.xz/src/smf/n4-handler.c Changed

@@ -396,8 +396,6 @@
                     sess, stream, OpenAPI_ho_state_COMPLETED);
 
         } else {
-            sess->paging.ue_requested_pdu_session_establishment_done = true;
-
             if (sess->up_cnx_state == OpenAPI_up_cnx_state_ACTIVATING) {
                 sess->up_cnx_state = OpenAPI_up_cnx_state_ACTIVATED;
                 smf_sbi_send_sm_context_updated_data_up_cnx_state(
@@ -1195,6 +1193,7 @@
         ogs_pfcp_downlink_data_service_information_t *info = NULL;
         uint8_t paging_policy_indication_value = 0;
         uint8_t qfi = 0;
+        smf_n1_n2_message_transfer_param_t param;
 
         if (pfcp_req->downlink_data_report.presence) {
             if (pfcp_req->downlink_data_report.
@@ -1259,9 +1258,21 @@
             return;
         }
 
-        if (sess->paging.ue_requested_pdu_session_establishment_done == true) {
-            smf_n1_n2_message_transfer_param_t param;
-
+        switch (sess->up_cnx_state) {
+        case OpenAPI_up_cnx_state_NULL:
+            /* UE Requested PDU Session is NOT established */
+            break;
+        case OpenAPI_up_cnx_state_ACTIVATED:
+            ogs_error("%s:%s PDU Session had already been ACTIVATED",
+                smf_ue->imsi_bcd, sess->session.name);
+            break;
+        case OpenAPI_up_cnx_state_ACTIVATING:
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 1
+            ogs_warn("%s:%s UE is being triggering Service Request",
+                smf_ue->imsi_bcd, sess->session.name);
+            break;
+#endif
+        case OpenAPI_up_cnx_state_DEACTIVATED:
             memset(&param, 0, sizeof(param));
             param.state = SMF_NETWORK_TRIGGERED_SERVICE_REQUEST;
             param.n2smbuf =
@@ -1271,6 +1282,14 @@
             param.n1n2_failure_txf_notif_uri = true;
 
             smf_namf_comm_send_n1_n2_message_transfer(sess, &param);
+            break;
+        case OpenAPI_up_cnx_state_SUSPENDED:
+            ogs_error("%s:%s PDU Session had been SUSPENDED",
+                smf_ue->imsi_bcd, sess->session.name);
+            break;
+        default:
+            ogs_error("Invalid UpCnxState%d", sess->up_cnx_state);
+            break;
         }
     }

open5gs_2.6.3.tar.xz/src/upf/n4-handler.c -> open5gs_2.6.4.tar.xz/src/upf/n4-handler.c Changed

@@ -131,6 +131,17 @@
     if (cause_value != OGS_PFCP_CAUSE_REQUEST_ACCEPTED)
         goto cleanup;
 
+    /* Setup GTP Node */
+    ogs_list_for_each(&sess->pfcp.far_list, far) {
+        if (OGS_ERROR == ogs_pfcp_setup_far_gtpu_node(far)) {
+            ogs_fatal("CHECK CONFIGURATION: upf.gtpu");
+            ogs_fatal("ogs_pfcp_setup_far_gtpu_node() failed");
+            goto cleanup;
+        }
+        if (far->gnode)
+            ogs_pfcp_far_f_teid_hash_set(far);
+    }
+
     /* PFCPSEReq-Flags */
     if (sereq_flags.restoration_indication == 1) {
         for (i = 0; i < num_of_created_pdr; i++) {
@@ -143,13 +154,6 @@
         restoration_indication = true;
     }
 
-    /* Setup GTP Node */
-    ogs_list_for_each(&sess->pfcp.far_list, far) {
-        ogs_assert(OGS_ERROR != ogs_pfcp_setup_far_gtpu_node(far));
-        if (far->gnode)
-            ogs_pfcp_far_f_teid_hash_set(far);
-    }
-
     for (i = 0; i < num_of_created_pdr; i++) {
         pdr = created_pdri;
         ogs_assert(pdr);
@@ -372,7 +376,11 @@
 
     /* Setup GTP Node */
     ogs_list_for_each(&sess->pfcp.far_list, far) {
-        ogs_assert(OGS_ERROR != ogs_pfcp_setup_far_gtpu_node(far));
+        if (OGS_ERROR == ogs_pfcp_setup_far_gtpu_node(far)) {
+            ogs_fatal("CHECK CONFIGURATION: upf.gtpu");
+            ogs_fatal("ogs_pfcp_setup_far_gtpu_node() failed");
+            goto cleanup;
+        }
         if (far->gnode)
             ogs_pfcp_far_f_teid_hash_set(far);
     }

open5gs_2.6.3.tar.xz/tests/common/ngap-build.c -> open5gs_2.6.4.tar.xz/tests/common/ngap-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.
  *
@@ -2595,3 +2595,45 @@
     return ogs_asn_encode(
             &asn_DEF_NGAP_HandoverRequestAcknowledgeTransfer, &message);
 }
+
+#define TEST_NGAP_MAX_MESSAGE 64
+
+ogs_pkbuf_t *test_ngap_build_amf_configuration_ack(int i)
+{
+    ogs_pkbuf_t *pkbuf = NULL;
+    const char *payloadTEST_NGAP_MAX_MESSAGE = {
+        "2000 000f000002000a40 0200010055400200 01",
+        "",
+        "",
+
+        "",
+        "",
+        "",
+
+        "",
+        "",
+        "",
+
+    };
+    uint16_t lenTEST_NGAP_MAX_MESSAGE = {
+        19,
+        0,
+        0,
+
+        0,
+        0,
+        0,
+
+        0,
+        0,
+        0,
+    };
+    char hexbufOGS_HUGE_LEN;
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
+    ogs_assert(pkbuf);
+    ogs_pkbuf_put_data(pkbuf,
+        ogs_hex_from_string(payloadi, hexbuf, sizeof(hexbuf)), leni);
+
+    return pkbuf;
+}

open5gs_2.6.3.tar.xz/tests/common/ngap-build.h -> open5gs_2.6.4.tar.xz/tests/common/ngap-build.h Changed

open5gs_2.6.4.tar.xz/tests/fuzzing Added

open5gs_2.6.4.tar.xz/tests/fuzzing/fuzzing.h Added

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "ogs-core.h"
+#include "core/abts.h"
+
+static int initialized = 0;
+
+void initialize(void) {
+
+    ogs_pkbuf_config_t config;
+
+    ogs_core_initialize();
+
+    ogs_pkbuf_default_init(&config);
+    ogs_pkbuf_default_create(&config);
+
+    initialized = 1;
+}

open5gs_2.6.4.tar.xz/tests/fuzzing/gtp-message-fuzz.c Added

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "fuzzing.h"
+#include "ogs-gtp.h"
+
+#define kMinInputLength 5
+#define kMaxInputLength 1024
+
+extern int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) 
+{ /* open5gs/tests/unit/gtp-message-test.c */
+
+    if (Size < kMinInputLength || Size > kMaxInputLength) {
+        return 1;
+    }
+
+    if (!initialized) {
+        initialize();
+        ogs_log_install_domain(&__ogs_gtp_domain, "gtp", OGS_LOG_NONE);
+        ogs_log_install_domain(&__ogs_tlv_domain, "tlv", OGS_LOG_NONE);
+    }
+
+    int result;
+    ogs_pkbuf_t *pkbuf;
+    ogs_gtp2_create_session_request_t req;
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
+    if (pkbuf == NULL) {
+        return 1;
+    }
+
+    ogs_pkbuf_put_data(pkbuf, Data, Size);
+
+    ogs_tlv_parse_msg(&req, &ogs_gtp2_tlv_desc_create_session_request, pkbuf, OGS_TLV_MODE_T1_L2_I1);
+
+    ogs_pkbuf_free(pkbuf);
+
+    return 0;
+}

open5gs_2.6.4.tar.xz/tests/fuzzing/gtp_message_fuzz_seed_corpus.zip Added

open5gs_2.6.4.tar.xz/tests/fuzzing/meson.build Added

@@ -0,0 +1,41 @@
+# Copyright (C) 2019 by Sukchan Lee <acetcom@gmail.com>
+
+# This file is part of Open5GS.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+# Get the lib_fuzzing_engine build option.
+lib_fuzzing_engine = get_option('lib_fuzzing_engine')
+
+# All fuzzer sources.
+gtp_message_source = files('gtp-message-fuzz.c')
+nas_message_source = files('nas-message-fuzz.c')
+
+# Build all executable 
+executable(
+    'gtp_message_fuzz',
+    sources : gtp_message_source,
+    c_args : testunit_core_cc_flags, sbi_cc_flags,
+    dependencies : libgtp_dep,
+    link_args: lib_fuzzing_engine
+)
+
+executable(
+    'nas_message_fuzz',
+    sources : nas_message_source,
+    c_args : testunit_core_cc_flags, sbi_cc_flags,
+    dependencies : libnas_eps_dep,
+    link_args: lib_fuzzing_engine
+)

open5gs_2.6.4.tar.xz/tests/fuzzing/nas-message-fuzz.c Added

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2019-2023 by Sukchan Lee <acetcom@gmail.com>
+ *
+ * This file is part of Open5GS.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "fuzzing.h"
+#include "ogs-nas-eps.h"
+
+#define kMinInputLength 5
+#define kMaxInputLength 1024
+
+extern int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) 
+{ /* open5gs/tests/unit/nas-message-test.c */
+
+    if (Size < kMinInputLength || Size > kMaxInputLength) {
+        return 1;
+    }
+
+    if (!initialized) {
+        initialize();
+        ogs_log_install_domain(&__ogs_nas_domain, "nas", OGS_LOG_NONE);
+    }
+
+    int result;
+    ogs_pkbuf_t *pkbuf;
+    ogs_nas_eps_message_t message;
+
+    pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
+    if (pkbuf == NULL) {
+        return 1;
+    }
+
+    ogs_pkbuf_put_data(pkbuf, Data, Size);
+
+    result = ogs_nas_emm_decode(&message, pkbuf);
+
+    ogs_pkbuf_free(pkbuf);
+
+    return result;
+}

open5gs_2.6.4.tar.xz/tests/fuzzing/nas_message_fuzz_seed_corpus.zip Added

open5gs_2.6.3.tar.xz/tests/registration/paging-test.c -> open5gs_2.6.4.tar.xz/tests/registration/paging-test.c Changed

@@ -858,6 +858,7 @@
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Receive PDUSessionResourceSetupRequest +
      * DL NAS transport +
      * PDU session establishment accept */
@@ -867,12 +868,14 @@
     ABTS_INT_EQUAL(tc,
             NGAP_ProcedureCode_id_PDUSessionResourceSetup,
             test_ue->ngap_procedure_code);
+#endif
 
     /* Receive GTP-U ICMP Packet */
     recvbuf = testgnb_gtpu_read(gtpu);
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Send PDUSessionResourceSetupResponse(Unsuccessful) */
     sendbuf = testngap_sess_build_pdu_session_resource_failed_to_setup(
             sess,
@@ -881,6 +884,7 @@
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#endif
 
     /* Send GTP-U ICMP Packet */
     rv = test_gtpu_send_ping(gtpu, qos_flow, TEST_PING_IPV4);
@@ -891,6 +895,16 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 1
+    /* Send UEContextReleaseRequest */
+    sendbuf = testngap_build_ue_context_release_request(test_ue,
+            NGAP_Cause_PR_radioNetwork, NGAP_CauseRadioNetwork_user_inactivity,
+            true);
+    ABTS_PTR_NOTNULL(tc, sendbuf);
+    rv = testgnb_ngap_send(ngap, sendbuf);
+    ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#endif
+
     /* Receive UEContextReleaseCommand */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -1867,6 +1881,7 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Receive PDUSessionResourceSetupRequest */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -1880,6 +1895,7 @@
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#endif
 
     /* Send GTP-U ICMP Packet */
     rv = test_gtpu_send_ping(gtpu, qos_flow, TEST_PING_IPV4);
@@ -2304,6 +2320,7 @@
     ABTS_PTR_NOTNULL(tc, recvbuf);
     ogs_pkbuf_free(recvbuf);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Receive PDUSessionResourceSetupRequest */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -2317,6 +2334,7 @@
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#endif
 
     /* Send GTP-U ICMP Packet */
     rv = test_gtpu_send_ping(gtpu, qos_flow, TEST_PING_IPV4);
@@ -2742,6 +2760,7 @@
     rv = test_gtpu_send_ping(gtpu, qos_flow, TEST_PING_IPV4);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Receive PDUSessionResourceSetupRequest */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -2749,6 +2768,7 @@
     ABTS_INT_EQUAL(tc,
             NGAP_ProcedureCode_id_PDUSessionResourceSetup,
             test_ue->ngap_procedure_code);
+#endif
 
     /* Send InitialContextSetupResponse */
     sendbuf = testngap_build_initial_context_setup_response(test_ue, true);
@@ -2756,11 +2776,13 @@
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Send PDUSessionResourceSetupResponse */
     sendbuf = testngap_ue_build_pdu_session_resource_setup_response(test_ue);
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#endif
 
     /* Receive GTP-U ICMP Packet */
     recvbuf = testgnb_gtpu_read(gtpu);
@@ -3171,6 +3193,7 @@
     rv = test_gtpu_send_ping(gtpu, qos_flow, TEST_PING_IPV4);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Receive PDUSessionResourceSetupRequest */
     recvbuf = testgnb_ngap_read(ngap);
     ABTS_PTR_NOTNULL(tc, recvbuf);
@@ -3178,6 +3201,7 @@
     ABTS_INT_EQUAL(tc,
             NGAP_ProcedureCode_id_PDUSessionResourceSetup,
             test_ue->ngap_procedure_code);
+#endif
 
     /* Send InitialContextSetupResponse */
     sendbuf = testngap_build_initial_context_setup_response(test_ue, true);
@@ -3185,11 +3209,13 @@
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
 
+#if OGS_SBI_DISABLE_NETWORK_SERVICE_REQUEST_WHILE_ACTIVATING == 0
     /* Send PDUSessionResourceSetupResponse */
     sendbuf = testngap_sess_build_pdu_session_resource_setup_response(sess);
     ABTS_PTR_NOTNULL(tc, sendbuf);
     rv = testgnb_ngap_send(ngap, sendbuf);
     ABTS_INT_EQUAL(tc, OGS_OK, rv);
+#endif
 
     /* Receive GTP-U ICMP Packet */
     recvbuf = testgnb_gtpu_read(gtpu);

Changes of Revision 17