mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-05 07:08:11 +00:00
[Release-17] Upgrade SBI to v17.x.0
This commit is contained in:
parent
969c116e77
commit
4d44b1843e
1687 changed files with 121604 additions and 9310 deletions
|
|
@ -7,7 +7,8 @@
|
|||
OpenAPI_location_area_t *OpenAPI_location_area_create(
|
||||
OpenAPI_list_t *geographic_areas,
|
||||
OpenAPI_list_t *civic_addresses,
|
||||
OpenAPI_network_area_info_t *nw_area_info
|
||||
OpenAPI_network_area_info_1_t *nw_area_info,
|
||||
OpenAPI_umt_time_t *umt_time
|
||||
)
|
||||
{
|
||||
OpenAPI_location_area_t *location_area_local_var = ogs_malloc(sizeof(OpenAPI_location_area_t));
|
||||
|
|
@ -16,6 +17,7 @@ OpenAPI_location_area_t *OpenAPI_location_area_create(
|
|||
location_area_local_var->geographic_areas = geographic_areas;
|
||||
location_area_local_var->civic_addresses = civic_addresses;
|
||||
location_area_local_var->nw_area_info = nw_area_info;
|
||||
location_area_local_var->umt_time = umt_time;
|
||||
|
||||
return location_area_local_var;
|
||||
}
|
||||
|
|
@ -42,9 +44,13 @@ void OpenAPI_location_area_free(OpenAPI_location_area_t *location_area)
|
|||
location_area->civic_addresses = NULL;
|
||||
}
|
||||
if (location_area->nw_area_info) {
|
||||
OpenAPI_network_area_info_free(location_area->nw_area_info);
|
||||
OpenAPI_network_area_info_1_free(location_area->nw_area_info);
|
||||
location_area->nw_area_info = NULL;
|
||||
}
|
||||
if (location_area->umt_time) {
|
||||
OpenAPI_umt_time_free(location_area->umt_time);
|
||||
location_area->umt_time = NULL;
|
||||
}
|
||||
ogs_free(location_area);
|
||||
}
|
||||
|
||||
|
|
@ -92,7 +98,7 @@ cJSON *OpenAPI_location_area_convertToJSON(OpenAPI_location_area_t *location_are
|
|||
}
|
||||
|
||||
if (location_area->nw_area_info) {
|
||||
cJSON *nw_area_info_local_JSON = OpenAPI_network_area_info_convertToJSON(location_area->nw_area_info);
|
||||
cJSON *nw_area_info_local_JSON = OpenAPI_network_area_info_1_convertToJSON(location_area->nw_area_info);
|
||||
if (nw_area_info_local_JSON == NULL) {
|
||||
ogs_error("OpenAPI_location_area_convertToJSON() failed [nw_area_info]");
|
||||
goto end;
|
||||
|
|
@ -104,6 +110,19 @@ cJSON *OpenAPI_location_area_convertToJSON(OpenAPI_location_area_t *location_are
|
|||
}
|
||||
}
|
||||
|
||||
if (location_area->umt_time) {
|
||||
cJSON *umt_time_local_JSON = OpenAPI_umt_time_convertToJSON(location_area->umt_time);
|
||||
if (umt_time_local_JSON == NULL) {
|
||||
ogs_error("OpenAPI_location_area_convertToJSON() failed [umt_time]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToObject(item, "umtTime", umt_time_local_JSON);
|
||||
if (item->child == NULL) {
|
||||
ogs_error("OpenAPI_location_area_convertToJSON() failed [umt_time]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
end:
|
||||
return item;
|
||||
}
|
||||
|
|
@ -117,7 +136,9 @@ OpenAPI_location_area_t *OpenAPI_location_area_parseFromJSON(cJSON *location_are
|
|||
cJSON *civic_addresses = NULL;
|
||||
OpenAPI_list_t *civic_addressesList = NULL;
|
||||
cJSON *nw_area_info = NULL;
|
||||
OpenAPI_network_area_info_t *nw_area_info_local_nonprim = NULL;
|
||||
OpenAPI_network_area_info_1_t *nw_area_info_local_nonprim = NULL;
|
||||
cJSON *umt_time = NULL;
|
||||
OpenAPI_umt_time_t *umt_time_local_nonprim = NULL;
|
||||
geographic_areas = cJSON_GetObjectItemCaseSensitive(location_areaJSON, "geographicAreas");
|
||||
if (geographic_areas) {
|
||||
cJSON *geographic_areas_local = NULL;
|
||||
|
|
@ -170,13 +191,19 @@ OpenAPI_location_area_t *OpenAPI_location_area_parseFromJSON(cJSON *location_are
|
|||
|
||||
nw_area_info = cJSON_GetObjectItemCaseSensitive(location_areaJSON, "nwAreaInfo");
|
||||
if (nw_area_info) {
|
||||
nw_area_info_local_nonprim = OpenAPI_network_area_info_parseFromJSON(nw_area_info);
|
||||
nw_area_info_local_nonprim = OpenAPI_network_area_info_1_parseFromJSON(nw_area_info);
|
||||
}
|
||||
|
||||
umt_time = cJSON_GetObjectItemCaseSensitive(location_areaJSON, "umtTime");
|
||||
if (umt_time) {
|
||||
umt_time_local_nonprim = OpenAPI_umt_time_parseFromJSON(umt_time);
|
||||
}
|
||||
|
||||
location_area_local_var = OpenAPI_location_area_create (
|
||||
geographic_areas ? geographic_areasList : NULL,
|
||||
civic_addresses ? civic_addressesList : NULL,
|
||||
nw_area_info ? nw_area_info_local_nonprim : NULL
|
||||
nw_area_info ? nw_area_info_local_nonprim : NULL,
|
||||
umt_time ? umt_time_local_nonprim : NULL
|
||||
);
|
||||
|
||||
return location_area_local_var;
|
||||
|
|
@ -196,9 +223,13 @@ end:
|
|||
civic_addressesList = NULL;
|
||||
}
|
||||
if (nw_area_info_local_nonprim) {
|
||||
OpenAPI_network_area_info_free(nw_area_info_local_nonprim);
|
||||
OpenAPI_network_area_info_1_free(nw_area_info_local_nonprim);
|
||||
nw_area_info_local_nonprim = NULL;
|
||||
}
|
||||
if (umt_time_local_nonprim) {
|
||||
OpenAPI_umt_time_free(umt_time_local_nonprim);
|
||||
umt_time_local_nonprim = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue