mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-04 22:30:09 +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
|
|
@ -9,7 +9,13 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_create(
|
|||
int ack_ind,
|
||||
char *sor_mac_iausf,
|
||||
char *countersor,
|
||||
char *provisioning_time
|
||||
char *provisioning_time,
|
||||
char *sor_transparent_container,
|
||||
char *sor_cmci,
|
||||
bool is_store_sor_cmci_in_me,
|
||||
int store_sor_cmci_in_me,
|
||||
bool is_usim_support_of_sor_cmci,
|
||||
int usim_support_of_sor_cmci
|
||||
)
|
||||
{
|
||||
OpenAPI_sor_info_t *sor_info_local_var = ogs_malloc(sizeof(OpenAPI_sor_info_t));
|
||||
|
|
@ -20,6 +26,12 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_create(
|
|||
sor_info_local_var->sor_mac_iausf = sor_mac_iausf;
|
||||
sor_info_local_var->countersor = countersor;
|
||||
sor_info_local_var->provisioning_time = provisioning_time;
|
||||
sor_info_local_var->sor_transparent_container = sor_transparent_container;
|
||||
sor_info_local_var->sor_cmci = sor_cmci;
|
||||
sor_info_local_var->is_store_sor_cmci_in_me = is_store_sor_cmci_in_me;
|
||||
sor_info_local_var->store_sor_cmci_in_me = store_sor_cmci_in_me;
|
||||
sor_info_local_var->is_usim_support_of_sor_cmci = is_usim_support_of_sor_cmci;
|
||||
sor_info_local_var->usim_support_of_sor_cmci = usim_support_of_sor_cmci;
|
||||
|
||||
return sor_info_local_var;
|
||||
}
|
||||
|
|
@ -47,6 +59,14 @@ void OpenAPI_sor_info_free(OpenAPI_sor_info_t *sor_info)
|
|||
ogs_free(sor_info->provisioning_time);
|
||||
sor_info->provisioning_time = NULL;
|
||||
}
|
||||
if (sor_info->sor_transparent_container) {
|
||||
ogs_free(sor_info->sor_transparent_container);
|
||||
sor_info->sor_transparent_container = NULL;
|
||||
}
|
||||
if (sor_info->sor_cmci) {
|
||||
ogs_free(sor_info->sor_cmci);
|
||||
sor_info->sor_cmci = NULL;
|
||||
}
|
||||
ogs_free(sor_info);
|
||||
}
|
||||
|
||||
|
|
@ -102,6 +122,34 @@ cJSON *OpenAPI_sor_info_convertToJSON(OpenAPI_sor_info_t *sor_info)
|
|||
goto end;
|
||||
}
|
||||
|
||||
if (sor_info->sor_transparent_container) {
|
||||
if (cJSON_AddStringToObject(item, "sorTransparentContainer", sor_info->sor_transparent_container) == NULL) {
|
||||
ogs_error("OpenAPI_sor_info_convertToJSON() failed [sor_transparent_container]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
if (sor_info->sor_cmci) {
|
||||
if (cJSON_AddStringToObject(item, "sorCmci", sor_info->sor_cmci) == NULL) {
|
||||
ogs_error("OpenAPI_sor_info_convertToJSON() failed [sor_cmci]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
if (sor_info->is_store_sor_cmci_in_me) {
|
||||
if (cJSON_AddBoolToObject(item, "storeSorCmciInMe", sor_info->store_sor_cmci_in_me) == NULL) {
|
||||
ogs_error("OpenAPI_sor_info_convertToJSON() failed [store_sor_cmci_in_me]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
if (sor_info->is_usim_support_of_sor_cmci) {
|
||||
if (cJSON_AddBoolToObject(item, "usimSupportOfSorCmci", sor_info->usim_support_of_sor_cmci) == NULL) {
|
||||
ogs_error("OpenAPI_sor_info_convertToJSON() failed [usim_support_of_sor_cmci]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
end:
|
||||
return item;
|
||||
}
|
||||
|
|
@ -116,6 +164,10 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_parseFromJSON(cJSON *sor_infoJSON)
|
|||
cJSON *sor_mac_iausf = NULL;
|
||||
cJSON *countersor = NULL;
|
||||
cJSON *provisioning_time = NULL;
|
||||
cJSON *sor_transparent_container = NULL;
|
||||
cJSON *sor_cmci = NULL;
|
||||
cJSON *store_sor_cmci_in_me = NULL;
|
||||
cJSON *usim_support_of_sor_cmci = NULL;
|
||||
steering_container = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "steeringContainer");
|
||||
if (steering_container) {
|
||||
steering_container_local_nonprim = OpenAPI_steering_container_parseFromJSON(steering_container);
|
||||
|
|
@ -157,13 +209,51 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_parseFromJSON(cJSON *sor_infoJSON)
|
|||
goto end;
|
||||
}
|
||||
|
||||
sor_transparent_container = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "sorTransparentContainer");
|
||||
if (sor_transparent_container) {
|
||||
if (!cJSON_IsString(sor_transparent_container) && !cJSON_IsNull(sor_transparent_container)) {
|
||||
ogs_error("OpenAPI_sor_info_parseFromJSON() failed [sor_transparent_container]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
sor_cmci = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "sorCmci");
|
||||
if (sor_cmci) {
|
||||
if (!cJSON_IsString(sor_cmci) && !cJSON_IsNull(sor_cmci)) {
|
||||
ogs_error("OpenAPI_sor_info_parseFromJSON() failed [sor_cmci]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
store_sor_cmci_in_me = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "storeSorCmciInMe");
|
||||
if (store_sor_cmci_in_me) {
|
||||
if (!cJSON_IsBool(store_sor_cmci_in_me)) {
|
||||
ogs_error("OpenAPI_sor_info_parseFromJSON() failed [store_sor_cmci_in_me]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
usim_support_of_sor_cmci = cJSON_GetObjectItemCaseSensitive(sor_infoJSON, "usimSupportOfSorCmci");
|
||||
if (usim_support_of_sor_cmci) {
|
||||
if (!cJSON_IsBool(usim_support_of_sor_cmci)) {
|
||||
ogs_error("OpenAPI_sor_info_parseFromJSON() failed [usim_support_of_sor_cmci]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
sor_info_local_var = OpenAPI_sor_info_create (
|
||||
steering_container ? steering_container_local_nonprim : NULL,
|
||||
|
||||
ack_ind->valueint,
|
||||
sor_mac_iausf && !cJSON_IsNull(sor_mac_iausf) ? ogs_strdup(sor_mac_iausf->valuestring) : NULL,
|
||||
countersor && !cJSON_IsNull(countersor) ? ogs_strdup(countersor->valuestring) : NULL,
|
||||
ogs_strdup(provisioning_time->valuestring)
|
||||
ogs_strdup(provisioning_time->valuestring),
|
||||
sor_transparent_container && !cJSON_IsNull(sor_transparent_container) ? ogs_strdup(sor_transparent_container->valuestring) : NULL,
|
||||
sor_cmci && !cJSON_IsNull(sor_cmci) ? ogs_strdup(sor_cmci->valuestring) : NULL,
|
||||
store_sor_cmci_in_me ? true : false,
|
||||
store_sor_cmci_in_me ? store_sor_cmci_in_me->valueint : 0,
|
||||
usim_support_of_sor_cmci ? true : false,
|
||||
usim_support_of_sor_cmci ? usim_support_of_sor_cmci->valueint : 0
|
||||
);
|
||||
|
||||
return sor_info_local_var;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue