@@ -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.6.1ba7a.202305130026

+Version: 2.6.3.8.16387.202305140026

 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:

- b6071c31ae79fc74235c63474bff081ff0b1e856 14117996 open5gs_2.6.3.6.1ba7a.202305130026.tar.xz

+ 5d5a588e20615cb083ee5a621d2bed59d0bc040d 14123172 open5gs_2.6.3.8.16387.202305140026.tar.xz

 Checksums-Sha256:

- 165c8729a1b13b761b0b10b39ca75d52b6f90b67daf2a023c4c4bec6ebc72cde 14117996 open5gs_2.6.3.6.1ba7a.202305130026.tar.xz

+ d80fefd3c5f80e26f24f957d4aa68f625ace061936cde9e2288b0cabe7c30449 14123172 open5gs_2.6.3.8.16387.202305140026.tar.xz

 Files:

- 7d5e13fd30f1fe61c6c0adf76765b270 14117996 open5gs_2.6.3.6.1ba7a.202305130026.tar.xz

+ b078b32e7a89d5c21195614e6375ff60 14123172 open5gs_2.6.3.8.16387.202305140026.tar.xz

​

@@ -1 +1 @@

-2.6.3.6-1ba7a.202305130026

+2.6.3.8-16387.202305140026

​

@@ -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,

​

@@ -1,8 +1,8 @@

-open5gs (2.6.3.6.1ba7a.202305130026) unstable; urgency=medium

+open5gs (2.6.3.8.16387.202305140026) unstable; urgency=medium

   * Automatically generated changelog entry for building the Osmocom nightly feed

- -- Osmocom OBS scripts <info@osmocom.org>  Sat, 13 May 2023 00:27:49 +0000

+ -- Osmocom OBS scripts <info@osmocom.org>  Sun, 14 May 2023 00:27:39 +0000

 open5gs (2.6.3) unstable; urgency=medium

​

@@ -239,3 +239,16 @@

     return x;

 }

+

+double *ogs_alloc_double(double value)

+{

+    double *mem = (double *)ogs_calloc(1, sizeof(double));

+    if (!mem) {

+        ogs_error("No memory");

+        return NULL;

+    }

+

+    *mem = value;

+

+    return mem;

+}

​

@@ -55,6 +55,8 @@

 ogs_uint24_t ogs_uint24_from_string(char *str);

 uint64_t ogs_uint64_from_string(char *str);

+double *ogs_alloc_double(double value);

+

 #ifdef __cplusplus

 }

 #endif

​

@@ -795,6 +795,11 @@

     unsigned int size;

 } ogs_datum_t;

+typedef struct ogs_port_s {

+    bool presence;

+    uint16_t port;

+} ogs_port_t;

+

 #ifdef __cplusplus

 }

 #endif

​

@@ -1259,6 +1259,11 @@

     ogs_pool_free(&smf_info_pool, smf_info);

 }

+static void scp_info_free(ogs_sbi_scp_info_t *scp_info)

+{

+    scp_info->num_of_domain = 0;

+}

+

 void ogs_sbi_nf_info_remove(ogs_list_t *list, ogs_sbi_nf_info_t *nf_info)

 {

     ogs_assert(list);

@@ -1273,6 +1278,9 @@

     case OpenAPI_nf_type_SMF:

         smf_info_free(&nf_info->smf);

         break;

+    case OpenAPI_nf_type_SCP:

+        scp_info_free(&nf_info->scp);

+        break;

     default:

         ogs_fatal("Not implemented NF-type%s",

                 OpenAPI_nf_type_ToString(nf_info->nf_type));

​

@@ -29,6 +29,7 @@

 #endif

 #define OGS_MAX_NUM_OF_NF_INFO 8

+#define OGS_MAX_NUM_OF_SCP_DOMAIN 8

 typedef struct ogs_sbi_client_s ogs_sbi_client_t;

 typedef struct ogs_sbi_smf_info_s ogs_sbi_smf_info_t;

@@ -297,6 +298,18 @@

     } nr_tai_rangeOGS_MAX_NUM_OF_TAI;

 } ogs_sbi_smf_info_t;

+typedef struct ogs_sbi_scp_info_s {

+    ogs_port_t http, https;

+

+    int num_of_domain;

+    struct {

+        char *name;

+        char *fqdn;

+        ogs_port_t http, https;

+    } domainOGS_MAX_NUM_OF_SCP_DOMAIN;

+

+} ogs_sbi_scp_info_t;

+

 typedef struct ogs_sbi_amf_info_s {

     int amf_set_id;

     int amf_region_id;

@@ -328,6 +341,7 @@

     union {

         ogs_sbi_smf_info_t smf;

         ogs_sbi_amf_info_t amf;

+        ogs_sbi_scp_info_t scp;

     };

 } ogs_sbi_nf_info_t;

​

@@ -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)

​

@@ -69,6 +69,14 @@

     if (acceptable_service_info->acc_bw_med_comps) {

         OpenAPI_list_for_each(acceptable_service_info->acc_bw_med_comps, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_acceptable_service_info_convertToJSON() failed acc_bw_med_comps");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_acceptable_service_info_convertToJSON() failed acc_bw_med_comps");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_media_component_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -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();

​

@@ -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();

​

@@ -66,6 +66,14 @@

     if (am_policy_data->pra_infos) {

         OpenAPI_list_for_each(am_policy_data->pra_infos, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_am_policy_data_convertToJSON() failed pra_infos");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_am_policy_data_convertToJSON() failed pra_infos");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -106,6 +106,14 @@

     if (am_requested_value_rep->pra_statuses) {

         OpenAPI_list_for_each(am_requested_value_rep->pra_statuses, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_am_requested_value_rep_convertToJSON() failed pra_statuses");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_am_requested_value_rep_convertToJSON() failed pra_statuses");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -272,6 +272,14 @@

     if (amf_event->presence_info_list) {

         OpenAPI_list_for_each(amf_event->presence_info_list, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_amf_event_convertToJSON() failed presence_info_list");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_amf_event_convertToJSON() failed presence_info_list");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_presence_info_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -123,6 +123,14 @@

     if (amf_event_subscription_add_info->aoi_state_list) {

         OpenAPI_list_for_each(amf_event_subscription_add_info->aoi_state_list, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_amf_event_subscription_add_info_convertToJSON() failed aoi_state_list");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_amf_event_subscription_add_info_convertToJSON() failed aoi_state_list");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_area_of_interest_event_state_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -75,6 +75,14 @@

     if (app_descriptor_1->app_ids) {

         OpenAPI_list_for_each(app_descriptor_1->app_ids, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_app_descriptor_1_convertToJSON() failed app_ids");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_app_descriptor_1_convertToJSON() failed app_ids");

+                goto end;

+            }

             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {

                 ogs_error("OpenAPI_app_descriptor_1_convertToJSON() failed inner");

                 goto end;

​

@@ -304,6 +304,14 @@

     if (app_session_context_req_data->med_components) {

         OpenAPI_list_for_each(app_session_context_req_data->med_components, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_app_session_context_req_data_convertToJSON() failed med_components");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_app_session_context_req_data_convertToJSON() failed med_components");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_media_component_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -215,6 +215,14 @@

     if (app_session_context_update_data->med_components) {

         OpenAPI_list_for_each(app_session_context_update_data->med_components, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed med_components");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed med_components");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_media_component_rm_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -126,6 +126,14 @@

     if (area_scope->tac_info_per_plmn) {

         OpenAPI_list_for_each(area_scope->tac_info_per_plmn, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_area_scope_convertToJSON() failed tac_info_per_plmn");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_area_scope_convertToJSON() failed tac_info_per_plmn");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_tac_info_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -98,7 +98,11 @@

         goto end;

     }

     OpenAPI_list_for_each(assign_ebi_data->released_ebi_list, node) {

-        if (cJSON_AddNumberToObject(released_ebi_listList, "", (uintptr_t)node->data) == NULL) {

+        if (node->data == NULL) {

+            ogs_error("OpenAPI_assign_ebi_data_convertToJSON() failed released_ebi_list");

+            goto end;

+        }

+        if (cJSON_AddNumberToObject(released_ebi_listList, "", *(double *)node->data) == NULL) {

             ogs_error("OpenAPI_assign_ebi_data_convertToJSON() failed released_ebi_list");

             goto end;

         }

​

@@ -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;

         }

​

@@ -288,6 +288,14 @@

     if (authorized_network_slice_info->nrf_oauth2_required) {

         OpenAPI_list_for_each(authorized_network_slice_info->nrf_oauth2_required, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_authorized_network_slice_info_convertToJSON() failed nrf_oauth2_required");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_authorized_network_slice_info_convertToJSON() failed nrf_oauth2_required");

+                goto end;

+            }

             if (cJSON_AddBoolToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {

                 ogs_error("OpenAPI_authorized_network_slice_info_convertToJSON() failed inner");

                 goto end;

​

@@ -66,6 +66,14 @@

     if (cag_data->cag_infos) {

         OpenAPI_list_for_each(cag_data->cag_infos, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_cag_data_convertToJSON() failed cag_infos");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_cag_data_convertToJSON() failed cag_infos");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_cag_info_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -66,6 +66,14 @@

     if (cag_data_1->cag_infos) {

         OpenAPI_list_for_each(cag_data_1->cag_infos, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_cag_data_1_convertToJSON() failed cag_infos");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_cag_data_1_convertToJSON() failed cag_infos");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_cag_info_1_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -163,6 +163,14 @@

     if (default_notification_subscription->service_info_list) {

         OpenAPI_list_for_each(default_notification_subscription->service_info_list, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_default_notification_subscription_convertToJSON() failed service_info_list");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_default_notification_subscription_convertToJSON() failed service_info_list");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_def_sub_service_info_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -215,6 +215,14 @@

     if (dnn_upf_info_item->dnai_nw_instance_list) {

         OpenAPI_list_for_each(dnn_upf_info_item->dnai_nw_instance_list, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_dnn_upf_info_item_convertToJSON() failed dnai_nw_instance_list");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_dnn_upf_info_item_convertToJSON() failed dnai_nw_instance_list");

+                goto end;

+            }

             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {

                 ogs_error("OpenAPI_dnn_upf_info_item_convertToJSON() failed inner");

                 goto end;

​

@@ -75,6 +75,14 @@

     if (eap_auth_method_200_response->_links) {

         OpenAPI_list_for_each(eap_auth_method_200_response->_links, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_eap_auth_method_200_response_convertToJSON() failed _links");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_eap_auth_method_200_response_convertToJSON() failed _links");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_links_value_schema_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -114,6 +114,14 @@

     if (eap_session->_links) {

         OpenAPI_list_for_each(eap_session->_links, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_eap_session_convertToJSON() failed _links");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_eap_session_convertToJSON() failed _links");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_links_value_schema_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -104,6 +104,14 @@

     if (ee_group_profile_data->allowed_mtc_provider) {

         OpenAPI_list_for_each(ee_group_profile_data->allowed_mtc_provider, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ee_group_profile_data_convertToJSON() failed allowed_mtc_provider");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ee_group_profile_data_convertToJSON() failed allowed_mtc_provider");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_mtc_provider_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -111,6 +111,14 @@

     if (ee_profile_data->allowed_mtc_provider) {

         OpenAPI_list_for_each(ee_profile_data->allowed_mtc_provider, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ee_profile_data_convertToJSON() failed allowed_mtc_provider");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ee_profile_data_convertToJSON() failed allowed_mtc_provider");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_mtc_provider_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -157,6 +157,14 @@

     if (ee_subscription->monitoring_configurations) {

         OpenAPI_list_for_each(ee_subscription->monitoring_configurations, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ee_subscription_convertToJSON() failed monitoring_configurations");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ee_subscription_convertToJSON() failed monitoring_configurations");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_monitoring_configuration_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -157,6 +157,14 @@

     if (ee_subscription_1->monitoring_configurations) {

         OpenAPI_list_for_each(ee_subscription_1->monitoring_configurations, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ee_subscription_1_convertToJSON() failed monitoring_configurations");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ee_subscription_1_convertToJSON() failed monitoring_configurations");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_monitoring_configuration_1_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -178,6 +178,14 @@

     if (ee_subscription_ext->monitoring_configurations) {

         OpenAPI_list_for_each(ee_subscription_ext->monitoring_configurations, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ee_subscription_ext_convertToJSON() failed monitoring_configurations");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ee_subscription_ext_convertToJSON() failed monitoring_configurations");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_monitoring_configuration_1_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -57,6 +57,14 @@

     if (eps_interworking_info->eps_iwk_pgws) {

         OpenAPI_list_for_each(eps_interworking_info->eps_iwk_pgws, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_eps_interworking_info_convertToJSON() failed eps_iwk_pgws");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_eps_interworking_info_convertToJSON() failed eps_iwk_pgws");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_eps_iwk_pgw_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -585,7 +585,11 @@

         goto end;

     }

     OpenAPI_list_for_each(event_subscription->nsi_level_thrds, node) {

-        if (cJSON_AddNumberToObject(nsi_level_thrdsList, "", (uintptr_t)node->data) == NULL) {

+        if (node->data == NULL) {

+            ogs_error("OpenAPI_event_subscription_convertToJSON() failed nsi_level_thrds");

+            goto end;

+        }

+        if (cJSON_AddNumberToObject(nsi_level_thrdsList, "", *(double *)node->data) == NULL) {

             ogs_error("OpenAPI_event_subscription_convertToJSON() failed nsi_level_thrds");

             goto end;

         }

​

@@ -404,6 +404,14 @@

     if (ext_amf_event_subscription->aoi_state_list) {

         OpenAPI_list_for_each(ext_amf_event_subscription->aoi_state_list, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ext_amf_event_subscription_convertToJSON() failed aoi_state_list");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ext_amf_event_subscription_convertToJSON() failed aoi_state_list");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_area_of_interest_event_state_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -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;

         }

​

@@ -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;

         }

​

@@ -126,6 +126,14 @@

     if (identity_data->application_port_ids) {

         OpenAPI_list_for_each(identity_data->application_port_ids, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_identity_data_convertToJSON() failed application_port_ids");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_identity_data_convertToJSON() failed application_port_ids");

+                goto end;

+            }

             if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {

                 ogs_error("OpenAPI_identity_data_convertToJSON() failed inner");

                 goto end;

​

@@ -116,6 +116,14 @@

     if (ie_info->is_modifiable_by_ipx) {

         OpenAPI_list_for_each(ie_info->is_modifiable_by_ipx, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_ie_info_convertToJSON() failed is_modifiable_by_ipx");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_ie_info_convertToJSON() failed is_modifiable_by_ipx");

+                goto end;

+            }

             if (cJSON_AddBoolToObject(localMapObject, localKeyValue->key, (uintptr_t)localKeyValue->value) == NULL) {

                 ogs_error("OpenAPI_ie_info_convertToJSON() failed inner");

                 goto end;

​

@@ -58,7 +58,11 @@

         goto end;

     }

     OpenAPI_list_for_each(inter_freq_target_info->cell_id_list, node) {

-        if (cJSON_AddNumberToObject(cell_id_listList, "", (uintptr_t)node->data) == NULL) {

+        if (node->data == NULL) {

+            ogs_error("OpenAPI_inter_freq_target_info_convertToJSON() failed cell_id_list");

+            goto end;

+        }

+        if (cJSON_AddNumberToObject(cell_id_listList, "", *(double *)node->data) == NULL) {

             ogs_error("OpenAPI_inter_freq_target_info_convertToJSON() failed cell_id_list");

             goto end;

         }

​

@@ -58,7 +58,11 @@

         goto end;

     }

     OpenAPI_list_for_each(inter_freq_target_info_1->cell_id_list, node) {

-        if (cJSON_AddNumberToObject(cell_id_listList, "", (uintptr_t)node->data) == NULL) {

+        if (node->data == NULL) {

+            ogs_error("OpenAPI_inter_freq_target_info_1_convertToJSON() failed cell_id_list");

+            goto end;

+        }

+        if (cJSON_AddNumberToObject(cell_id_listList, "", *(double *)node->data) == NULL) {

             ogs_error("OpenAPI_inter_freq_target_info_1_convertToJSON() failed cell_id_list");

             goto end;

         }

​

@@ -160,6 +160,14 @@

     if (iptv_config_data->multi_acc_ctrls) {

         OpenAPI_list_for_each(iptv_config_data->multi_acc_ctrls, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_iptv_config_data_convertToJSON() failed multi_acc_ctrls");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_iptv_config_data_convertToJSON() failed multi_acc_ctrls");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_multicast_access_control_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -57,6 +57,14 @@

     if (iptv_config_data_patch->multi_acc_ctrls) {

         OpenAPI_list_for_each(iptv_config_data_patch->multi_acc_ctrls, node) {

             OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)node->data;

+            if (localKeyValue == NULL) {

+                ogs_error("OpenAPI_iptv_config_data_patch_convertToJSON() failed multi_acc_ctrls");

+                goto end;

+            }

+            if (localKeyValue->key == NULL) {

+                ogs_error("OpenAPI_iptv_config_data_patch_convertToJSON() failed multi_acc_ctrls");

+                goto end;

+            }

             cJSON *itemLocal = localKeyValue->value ?

                 OpenAPI_multicast_access_control_convertToJSON(localKeyValue->value) :

                 cJSON_CreateNull();

​

@@ -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) :