vrr/open5gs
2
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2026-05-02 13:20:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[SBI] Fixed openapitools MAP generation (#2103)

Browse source 
MAP was generated incorrectly because {{#items}}..{{#items}} was
missing.

Because of this, If scpInfo has scpPort, NRF crashes.
This commit is contained in:
Sukchan Lee 2023-02-26 10:01:08 +09:00
parent 1d8324af9f
commit ce668c556c
437 changed files with 111103 additions and 906 deletions
Download patch file Download diff file Expand all files Collapse all files

49
lib/sbi/openapi/model/session_management_subscription_data.c
View file

@ -118,10 +118,10 @@ cJSON *OpenAPI_session_management_subscription_data_convertToJSON(OpenAPI_sessio
OpenAPI_dnn_configuration_convertToJSON(localKeyValue->value) :
cJSON_CreateNull();
if (itemLocal == NULL) {
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [dnn_configurations]");
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [inner]");
goto end;
}
cJSON_AddItemToObject(dnn_configurations, localKeyValue->key, itemLocal);
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
}
}
}
@ -153,6 +153,10 @@ cJSON *OpenAPI_session_management_subscription_data_convertToJSON(OpenAPI_sessio
if (session_management_subscription_data->shared_vn_group_data_ids) {
OpenAPI_list_for_each(session_management_subscription_data->shared_vn_group_data_ids, shared_vn_group_data_ids_node) {
OpenAPI_map_t *localKeyValue = (OpenAPI_map_t*)shared_vn_group_data_ids_node->data;
if (cJSON_AddStringToObject(localMapObject, localKeyValue->key, (char*)localKeyValue->value) == NULL) {
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [inner]");
goto end;
}
}
}
}
@ -206,10 +210,10 @@ cJSON *OpenAPI_session_management_subscription_data_convertToJSON(OpenAPI_sessio
OpenAPI_expected_ue_behaviour_data_convertToJSON(localKeyValue->value) :
cJSON_CreateNull();
if (itemLocal == NULL) {
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [expected_ue_behaviours_list]");
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [inner]");
goto end;
}
cJSON_AddItemToObject(expected_ue_behaviours_list, localKeyValue->key, itemLocal);
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
}
}
}
@ -229,10 +233,10 @@ cJSON *OpenAPI_session_management_subscription_data_convertToJSON(OpenAPI_sessio
OpenAPI_suggested_packet_num_dl_convertToJSON(localKeyValue->value) :
cJSON_CreateNull();
if (itemLocal == NULL) {
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [suggested_packet_num_dl_list]");
ogs_error("OpenAPI_session_management_subscription_data_convertToJSON() failed [inner]");
goto end;
}
cJSON_AddItemToObject(suggested_packet_num_dl_list, localKeyValue->key, itemLocal);
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
}
}
}
@ -273,16 +277,16 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc
OpenAPI_map_t *localMapKeyPair = NULL;
cJSON_ArrayForEach(dnn_configurations_local_map, dnn_configurations) {
cJSON *localMapObject = dnn_configurations_local_map;
if (cJSON_IsObject(dnn_configurations_local_map)) {
if (cJSON_IsObject(localMapObject)) {
localMapKeyPair = OpenAPI_map_create(
ogs_strdup(localMapObject->string), OpenAPI_dnn_configuration_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(dnn_configurations_local_map)) {
} else if (cJSON_IsNull(localMapObject)) {
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [dnn_configurations]");
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [inner]");
goto end;
}
OpenAPI_list_add(dnn_configurationsList , localMapKeyPair);
OpenAPI_list_add(dnn_configurationsList, localMapKeyPair);
}
}
@ -302,7 +306,7 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [internal_group_ids]");
goto end;
}
OpenAPI_list_add(internal_group_idsList , ogs_strdup(internal_group_ids_local->valuestring));
OpenAPI_list_add(internal_group_idsList, ogs_strdup(internal_group_ids_local->valuestring));
}
}
@ -319,7 +323,12 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc
OpenAPI_map_t *localMapKeyPair = NULL;
cJSON_ArrayForEach(shared_vn_group_data_ids_local_map, shared_vn_group_data_ids) {
cJSON *localMapObject = shared_vn_group_data_ids_local_map;
OpenAPI_list_add(shared_vn_group_data_idsList , localMapKeyPair);
if (!cJSON_IsString(localMapObject)) {
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [inner]");
goto end;
}
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string),ogs_strdup(localMapObject->valuestring));
OpenAPI_list_add(shared_vn_group_data_idsList, localMapKeyPair);
}
}
@ -372,16 +381,16 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc
OpenAPI_map_t *localMapKeyPair = NULL;
cJSON_ArrayForEach(expected_ue_behaviours_list_local_map, expected_ue_behaviours_list) {
cJSON *localMapObject = expected_ue_behaviours_list_local_map;
if (cJSON_IsObject(expected_ue_behaviours_list_local_map)) {
if (cJSON_IsObject(localMapObject)) {
localMapKeyPair = OpenAPI_map_create(
ogs_strdup(localMapObject->string), OpenAPI_expected_ue_behaviour_data_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(expected_ue_behaviours_list_local_map)) {
} else if (cJSON_IsNull(localMapObject)) {
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [expected_ue_behaviours_list]");
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [inner]");
goto end;
}
OpenAPI_list_add(expected_ue_behaviours_listList , localMapKeyPair);
OpenAPI_list_add(expected_ue_behaviours_listList, localMapKeyPair);
}
}
@ -398,16 +407,16 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc
OpenAPI_map_t *localMapKeyPair = NULL;
cJSON_ArrayForEach(suggested_packet_num_dl_list_local_map, suggested_packet_num_dl_list) {
cJSON *localMapObject = suggested_packet_num_dl_list_local_map;
if (cJSON_IsObject(suggested_packet_num_dl_list_local_map)) {
if (cJSON_IsObject(localMapObject)) {
localMapKeyPair = OpenAPI_map_create(
ogs_strdup(localMapObject->string), OpenAPI_suggested_packet_num_dl_parseFromJSON(localMapObject));
} else if (cJSON_IsNull(suggested_packet_num_dl_list_local_map)) {
} else if (cJSON_IsNull(localMapObject)) {
localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), NULL);
} else {
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [suggested_packet_num_dl_list]");
ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [inner]");
goto end;
}
OpenAPI_list_add(suggested_packet_num_dl_listList , localMapKeyPair);
OpenAPI_list_add(suggested_packet_num_dl_listList, localMapKeyPair);
}
}