forked from acouzens/open5gs
[openapi] Add support for nullable fields
Depending on the OpenAPI yaml files, fields can be marked as "nullable". Which means that the field can be either present, not present, or null. This feature is important for example in SmContextUpdateData structure, where many fields are described similar as the following: This IE shall be included for the modification .... For deleting the field, it shall contain the Null value.
This commit is contained in:
parent
7ea37ef618
commit
50464d174e
|
@ -11,13 +11,16 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
OpenAPI_list_t *internal_group_ids,
|
OpenAPI_list_t *internal_group_ids,
|
||||||
OpenAPI_list_t* shared_vn_group_data_ids,
|
OpenAPI_list_t* shared_vn_group_data_ids,
|
||||||
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
||||||
|
bool is_nssai_null,
|
||||||
OpenAPI_nssai_t *nssai,
|
OpenAPI_nssai_t *nssai,
|
||||||
OpenAPI_set_t *rat_restrictions,
|
OpenAPI_set_t *rat_restrictions,
|
||||||
OpenAPI_list_t *forbidden_areas,
|
OpenAPI_list_t *forbidden_areas,
|
||||||
OpenAPI_service_area_restriction_t *service_area_restriction,
|
OpenAPI_service_area_restriction_t *service_area_restriction,
|
||||||
OpenAPI_list_t *core_network_type_restrictions,
|
OpenAPI_list_t *core_network_type_restrictions,
|
||||||
|
bool is_rfsp_index_null,
|
||||||
bool is_rfsp_index,
|
bool is_rfsp_index,
|
||||||
int rfsp_index,
|
int rfsp_index,
|
||||||
|
bool is_subs_reg_timer_null,
|
||||||
bool is_subs_reg_timer,
|
bool is_subs_reg_timer,
|
||||||
int subs_reg_timer,
|
int subs_reg_timer,
|
||||||
bool is_ue_usage_type,
|
bool is_ue_usage_type,
|
||||||
|
@ -26,6 +29,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
int mps_priority,
|
int mps_priority,
|
||||||
bool is_mcs_priority,
|
bool is_mcs_priority,
|
||||||
int mcs_priority,
|
int mcs_priority,
|
||||||
|
bool is_active_time_null,
|
||||||
bool is_active_time,
|
bool is_active_time,
|
||||||
int active_time,
|
int active_time,
|
||||||
OpenAPI_sor_info_t *sor_info,
|
OpenAPI_sor_info_t *sor_info,
|
||||||
|
@ -45,6 +49,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
int service_gap_time,
|
int service_gap_time,
|
||||||
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
||||||
OpenAPI_mdt_configuration_t *mdt_configuration,
|
OpenAPI_mdt_configuration_t *mdt_configuration,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_cag_data_t *cag_data,
|
OpenAPI_cag_data_t *cag_data,
|
||||||
char *stn_sr,
|
char *stn_sr,
|
||||||
|
@ -83,13 +88,16 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
access_and_mobility_subscription_data_local_var->internal_group_ids = internal_group_ids;
|
access_and_mobility_subscription_data_local_var->internal_group_ids = internal_group_ids;
|
||||||
access_and_mobility_subscription_data_local_var->shared_vn_group_data_ids = shared_vn_group_data_ids;
|
access_and_mobility_subscription_data_local_var->shared_vn_group_data_ids = shared_vn_group_data_ids;
|
||||||
access_and_mobility_subscription_data_local_var->subscribed_ue_ambr = subscribed_ue_ambr;
|
access_and_mobility_subscription_data_local_var->subscribed_ue_ambr = subscribed_ue_ambr;
|
||||||
|
access_and_mobility_subscription_data_local_var->is_nssai_null = is_nssai_null;
|
||||||
access_and_mobility_subscription_data_local_var->nssai = nssai;
|
access_and_mobility_subscription_data_local_var->nssai = nssai;
|
||||||
access_and_mobility_subscription_data_local_var->rat_restrictions = rat_restrictions;
|
access_and_mobility_subscription_data_local_var->rat_restrictions = rat_restrictions;
|
||||||
access_and_mobility_subscription_data_local_var->forbidden_areas = forbidden_areas;
|
access_and_mobility_subscription_data_local_var->forbidden_areas = forbidden_areas;
|
||||||
access_and_mobility_subscription_data_local_var->service_area_restriction = service_area_restriction;
|
access_and_mobility_subscription_data_local_var->service_area_restriction = service_area_restriction;
|
||||||
access_and_mobility_subscription_data_local_var->core_network_type_restrictions = core_network_type_restrictions;
|
access_and_mobility_subscription_data_local_var->core_network_type_restrictions = core_network_type_restrictions;
|
||||||
|
access_and_mobility_subscription_data_local_var->is_rfsp_index_null = is_rfsp_index_null;
|
||||||
access_and_mobility_subscription_data_local_var->is_rfsp_index = is_rfsp_index;
|
access_and_mobility_subscription_data_local_var->is_rfsp_index = is_rfsp_index;
|
||||||
access_and_mobility_subscription_data_local_var->rfsp_index = rfsp_index;
|
access_and_mobility_subscription_data_local_var->rfsp_index = rfsp_index;
|
||||||
|
access_and_mobility_subscription_data_local_var->is_subs_reg_timer_null = is_subs_reg_timer_null;
|
||||||
access_and_mobility_subscription_data_local_var->is_subs_reg_timer = is_subs_reg_timer;
|
access_and_mobility_subscription_data_local_var->is_subs_reg_timer = is_subs_reg_timer;
|
||||||
access_and_mobility_subscription_data_local_var->subs_reg_timer = subs_reg_timer;
|
access_and_mobility_subscription_data_local_var->subs_reg_timer = subs_reg_timer;
|
||||||
access_and_mobility_subscription_data_local_var->is_ue_usage_type = is_ue_usage_type;
|
access_and_mobility_subscription_data_local_var->is_ue_usage_type = is_ue_usage_type;
|
||||||
|
@ -98,6 +106,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
access_and_mobility_subscription_data_local_var->mps_priority = mps_priority;
|
access_and_mobility_subscription_data_local_var->mps_priority = mps_priority;
|
||||||
access_and_mobility_subscription_data_local_var->is_mcs_priority = is_mcs_priority;
|
access_and_mobility_subscription_data_local_var->is_mcs_priority = is_mcs_priority;
|
||||||
access_and_mobility_subscription_data_local_var->mcs_priority = mcs_priority;
|
access_and_mobility_subscription_data_local_var->mcs_priority = mcs_priority;
|
||||||
|
access_and_mobility_subscription_data_local_var->is_active_time_null = is_active_time_null;
|
||||||
access_and_mobility_subscription_data_local_var->is_active_time = is_active_time;
|
access_and_mobility_subscription_data_local_var->is_active_time = is_active_time;
|
||||||
access_and_mobility_subscription_data_local_var->active_time = active_time;
|
access_and_mobility_subscription_data_local_var->active_time = active_time;
|
||||||
access_and_mobility_subscription_data_local_var->sor_info = sor_info;
|
access_and_mobility_subscription_data_local_var->sor_info = sor_info;
|
||||||
|
@ -117,6 +126,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
access_and_mobility_subscription_data_local_var->service_gap_time = service_gap_time;
|
access_and_mobility_subscription_data_local_var->service_gap_time = service_gap_time;
|
||||||
access_and_mobility_subscription_data_local_var->mdt_user_consent = mdt_user_consent;
|
access_and_mobility_subscription_data_local_var->mdt_user_consent = mdt_user_consent;
|
||||||
access_and_mobility_subscription_data_local_var->mdt_configuration = mdt_configuration;
|
access_and_mobility_subscription_data_local_var->mdt_configuration = mdt_configuration;
|
||||||
|
access_and_mobility_subscription_data_local_var->is_trace_data_null = is_trace_data_null;
|
||||||
access_and_mobility_subscription_data_local_var->trace_data = trace_data;
|
access_and_mobility_subscription_data_local_var->trace_data = trace_data;
|
||||||
access_and_mobility_subscription_data_local_var->cag_data = cag_data;
|
access_and_mobility_subscription_data_local_var->cag_data = cag_data;
|
||||||
access_and_mobility_subscription_data_local_var->stn_sr = stn_sr;
|
access_and_mobility_subscription_data_local_var->stn_sr = stn_sr;
|
||||||
|
@ -440,6 +450,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [nssai]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [nssai]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data->is_nssai_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "nssai") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [nssai]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data->rat_restrictions != OpenAPI_rat_type_NULL) {
|
if (access_and_mobility_subscription_data->rat_restrictions != OpenAPI_rat_type_NULL) {
|
||||||
|
@ -504,6 +519,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [rfsp_index]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [rfsp_index]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data->is_rfsp_index_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "rfspIndex") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [rfsp_index]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data->is_subs_reg_timer) {
|
if (access_and_mobility_subscription_data->is_subs_reg_timer) {
|
||||||
|
@ -511,6 +531,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [subs_reg_timer]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [subs_reg_timer]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data->is_subs_reg_timer_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "subsRegTimer") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [subs_reg_timer]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data->is_ue_usage_type) {
|
if (access_and_mobility_subscription_data->is_ue_usage_type) {
|
||||||
|
@ -539,6 +564,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [active_time]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [active_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data->is_active_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "activeTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [active_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data->sor_info) {
|
if (access_and_mobility_subscription_data->sor_info) {
|
||||||
|
@ -682,6 +712,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_convertToJSON(OpenAPI_acces
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [trace_data]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data->is_trace_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_convertToJSON() failed [trace_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data->cag_data) {
|
if (access_and_mobility_subscription_data->cag_data) {
|
||||||
|
@ -1124,12 +1159,14 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
|
|
||||||
nssai = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "nssai");
|
nssai = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "nssai");
|
||||||
if (nssai) {
|
if (nssai) {
|
||||||
|
if (!cJSON_IsNull(nssai)) {
|
||||||
nssai_local_nonprim = OpenAPI_nssai_parseFromJSON(nssai);
|
nssai_local_nonprim = OpenAPI_nssai_parseFromJSON(nssai);
|
||||||
if (!nssai_local_nonprim) {
|
if (!nssai_local_nonprim) {
|
||||||
ogs_error("OpenAPI_nssai_parseFromJSON failed [nssai]");
|
ogs_error("OpenAPI_nssai_parseFromJSON failed [nssai]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ratRestrictions");
|
rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ratRestrictions");
|
||||||
if (rat_restrictions) {
|
if (rat_restrictions) {
|
||||||
|
@ -1216,19 +1253,23 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
|
|
||||||
rfsp_index = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "rfspIndex");
|
rfsp_index = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "rfspIndex");
|
||||||
if (rfsp_index) {
|
if (rfsp_index) {
|
||||||
|
if (!cJSON_IsNull(rfsp_index)) {
|
||||||
if (!cJSON_IsNumber(rfsp_index)) {
|
if (!cJSON_IsNumber(rfsp_index)) {
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [rfsp_index]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [rfsp_index]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
subs_reg_timer = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "subsRegTimer");
|
subs_reg_timer = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "subsRegTimer");
|
||||||
if (subs_reg_timer) {
|
if (subs_reg_timer) {
|
||||||
|
if (!cJSON_IsNull(subs_reg_timer)) {
|
||||||
if (!cJSON_IsNumber(subs_reg_timer)) {
|
if (!cJSON_IsNumber(subs_reg_timer)) {
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [subs_reg_timer]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [subs_reg_timer]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ue_usage_type = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ueUsageType");
|
ue_usage_type = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "ueUsageType");
|
||||||
if (ue_usage_type) {
|
if (ue_usage_type) {
|
||||||
|
@ -1256,11 +1297,13 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
|
|
||||||
active_time = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "activeTime");
|
active_time = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "activeTime");
|
||||||
if (active_time) {
|
if (active_time) {
|
||||||
|
if (!cJSON_IsNull(active_time)) {
|
||||||
if (!cJSON_IsNumber(active_time)) {
|
if (!cJSON_IsNumber(active_time)) {
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [active_time]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [active_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sor_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "sorInfo");
|
sor_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "sorInfo");
|
||||||
if (sor_info) {
|
if (sor_info) {
|
||||||
|
@ -1416,12 +1459,14 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
|
|
||||||
trace_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "traceData");
|
trace_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "traceData");
|
||||||
if (trace_data) {
|
if (trace_data) {
|
||||||
|
if (!cJSON_IsNull(trace_data)) {
|
||||||
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
||||||
if (!trace_data_local_nonprim) {
|
if (!trace_data_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cag_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "cagData");
|
cag_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_dataJSON, "cagData");
|
||||||
if (cag_data) {
|
if (cag_data) {
|
||||||
|
@ -1720,13 +1765,16 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
internal_group_ids ? internal_group_idsList : NULL,
|
internal_group_ids ? internal_group_idsList : NULL,
|
||||||
shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL,
|
shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL,
|
||||||
subscribed_ue_ambr ? subscribed_ue_ambr_local_nonprim : NULL,
|
subscribed_ue_ambr ? subscribed_ue_ambr_local_nonprim : NULL,
|
||||||
|
nssai && cJSON_IsNull(nssai) ? true : false,
|
||||||
nssai ? nssai_local_nonprim : NULL,
|
nssai ? nssai_local_nonprim : NULL,
|
||||||
rat_restrictions ? rat_restrictionsList : NULL,
|
rat_restrictions ? rat_restrictionsList : NULL,
|
||||||
forbidden_areas ? forbidden_areasList : NULL,
|
forbidden_areas ? forbidden_areasList : NULL,
|
||||||
service_area_restriction ? service_area_restriction_local_nonprim : NULL,
|
service_area_restriction ? service_area_restriction_local_nonprim : NULL,
|
||||||
core_network_type_restrictions ? core_network_type_restrictionsList : NULL,
|
core_network_type_restrictions ? core_network_type_restrictionsList : NULL,
|
||||||
|
rfsp_index && cJSON_IsNull(rfsp_index) ? true : false,
|
||||||
rfsp_index ? true : false,
|
rfsp_index ? true : false,
|
||||||
rfsp_index ? rfsp_index->valuedouble : 0,
|
rfsp_index ? rfsp_index->valuedouble : 0,
|
||||||
|
subs_reg_timer && cJSON_IsNull(subs_reg_timer) ? true : false,
|
||||||
subs_reg_timer ? true : false,
|
subs_reg_timer ? true : false,
|
||||||
subs_reg_timer ? subs_reg_timer->valuedouble : 0,
|
subs_reg_timer ? subs_reg_timer->valuedouble : 0,
|
||||||
ue_usage_type ? true : false,
|
ue_usage_type ? true : false,
|
||||||
|
@ -1735,6 +1783,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
mps_priority ? mps_priority->valueint : 0,
|
mps_priority ? mps_priority->valueint : 0,
|
||||||
mcs_priority ? true : false,
|
mcs_priority ? true : false,
|
||||||
mcs_priority ? mcs_priority->valueint : 0,
|
mcs_priority ? mcs_priority->valueint : 0,
|
||||||
|
active_time && cJSON_IsNull(active_time) ? true : false,
|
||||||
active_time ? true : false,
|
active_time ? true : false,
|
||||||
active_time ? active_time->valuedouble : 0,
|
active_time ? active_time->valuedouble : 0,
|
||||||
sor_info ? sor_info_local_nonprim : NULL,
|
sor_info ? sor_info_local_nonprim : NULL,
|
||||||
|
@ -1754,6 +1803,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
service_gap_time ? service_gap_time->valuedouble : 0,
|
service_gap_time ? service_gap_time->valuedouble : 0,
|
||||||
mdt_user_consent ? mdt_user_consentVariable : 0,
|
mdt_user_consent ? mdt_user_consentVariable : 0,
|
||||||
mdt_configuration ? mdt_configuration_local_nonprim : NULL,
|
mdt_configuration ? mdt_configuration_local_nonprim : NULL,
|
||||||
|
trace_data && cJSON_IsNull(trace_data) ? true : false,
|
||||||
trace_data ? trace_data_local_nonprim : NULL,
|
trace_data ? trace_data_local_nonprim : NULL,
|
||||||
cag_data ? cag_data_local_nonprim : NULL,
|
cag_data ? cag_data_local_nonprim : NULL,
|
||||||
stn_sr && !cJSON_IsNull(stn_sr) ? ogs_strdup(stn_sr->valuestring) : NULL,
|
stn_sr && !cJSON_IsNull(stn_sr) ? ogs_strdup(stn_sr->valuestring) : NULL,
|
||||||
|
|
|
@ -50,13 +50,16 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_s {
|
||||||
OpenAPI_list_t *internal_group_ids;
|
OpenAPI_list_t *internal_group_ids;
|
||||||
OpenAPI_list_t* shared_vn_group_data_ids;
|
OpenAPI_list_t* shared_vn_group_data_ids;
|
||||||
struct OpenAPI_ambr_rm_s *subscribed_ue_ambr;
|
struct OpenAPI_ambr_rm_s *subscribed_ue_ambr;
|
||||||
|
bool is_nssai_null;
|
||||||
struct OpenAPI_nssai_s *nssai;
|
struct OpenAPI_nssai_s *nssai;
|
||||||
OpenAPI_set_t *rat_restrictions;
|
OpenAPI_set_t *rat_restrictions;
|
||||||
OpenAPI_list_t *forbidden_areas;
|
OpenAPI_list_t *forbidden_areas;
|
||||||
struct OpenAPI_service_area_restriction_s *service_area_restriction;
|
struct OpenAPI_service_area_restriction_s *service_area_restriction;
|
||||||
OpenAPI_list_t *core_network_type_restrictions;
|
OpenAPI_list_t *core_network_type_restrictions;
|
||||||
|
bool is_rfsp_index_null;
|
||||||
bool is_rfsp_index;
|
bool is_rfsp_index;
|
||||||
int rfsp_index;
|
int rfsp_index;
|
||||||
|
bool is_subs_reg_timer_null;
|
||||||
bool is_subs_reg_timer;
|
bool is_subs_reg_timer;
|
||||||
int subs_reg_timer;
|
int subs_reg_timer;
|
||||||
bool is_ue_usage_type;
|
bool is_ue_usage_type;
|
||||||
|
@ -65,6 +68,7 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_s {
|
||||||
int mps_priority;
|
int mps_priority;
|
||||||
bool is_mcs_priority;
|
bool is_mcs_priority;
|
||||||
int mcs_priority;
|
int mcs_priority;
|
||||||
|
bool is_active_time_null;
|
||||||
bool is_active_time;
|
bool is_active_time;
|
||||||
int active_time;
|
int active_time;
|
||||||
struct OpenAPI_sor_info_s *sor_info;
|
struct OpenAPI_sor_info_s *sor_info;
|
||||||
|
@ -84,6 +88,7 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_s {
|
||||||
int service_gap_time;
|
int service_gap_time;
|
||||||
OpenAPI_mdt_user_consent_e mdt_user_consent;
|
OpenAPI_mdt_user_consent_e mdt_user_consent;
|
||||||
struct OpenAPI_mdt_configuration_s *mdt_configuration;
|
struct OpenAPI_mdt_configuration_s *mdt_configuration;
|
||||||
|
bool is_trace_data_null;
|
||||||
struct OpenAPI_trace_data_s *trace_data;
|
struct OpenAPI_trace_data_s *trace_data;
|
||||||
struct OpenAPI_cag_data_s *cag_data;
|
struct OpenAPI_cag_data_s *cag_data;
|
||||||
char *stn_sr;
|
char *stn_sr;
|
||||||
|
@ -120,13 +125,16 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
OpenAPI_list_t *internal_group_ids,
|
OpenAPI_list_t *internal_group_ids,
|
||||||
OpenAPI_list_t* shared_vn_group_data_ids,
|
OpenAPI_list_t* shared_vn_group_data_ids,
|
||||||
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
||||||
|
bool is_nssai_null,
|
||||||
OpenAPI_nssai_t *nssai,
|
OpenAPI_nssai_t *nssai,
|
||||||
OpenAPI_set_t *rat_restrictions,
|
OpenAPI_set_t *rat_restrictions,
|
||||||
OpenAPI_list_t *forbidden_areas,
|
OpenAPI_list_t *forbidden_areas,
|
||||||
OpenAPI_service_area_restriction_t *service_area_restriction,
|
OpenAPI_service_area_restriction_t *service_area_restriction,
|
||||||
OpenAPI_list_t *core_network_type_restrictions,
|
OpenAPI_list_t *core_network_type_restrictions,
|
||||||
|
bool is_rfsp_index_null,
|
||||||
bool is_rfsp_index,
|
bool is_rfsp_index,
|
||||||
int rfsp_index,
|
int rfsp_index,
|
||||||
|
bool is_subs_reg_timer_null,
|
||||||
bool is_subs_reg_timer,
|
bool is_subs_reg_timer,
|
||||||
int subs_reg_timer,
|
int subs_reg_timer,
|
||||||
bool is_ue_usage_type,
|
bool is_ue_usage_type,
|
||||||
|
@ -135,6 +143,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
int mps_priority,
|
int mps_priority,
|
||||||
bool is_mcs_priority,
|
bool is_mcs_priority,
|
||||||
int mcs_priority,
|
int mcs_priority,
|
||||||
|
bool is_active_time_null,
|
||||||
bool is_active_time,
|
bool is_active_time,
|
||||||
int active_time,
|
int active_time,
|
||||||
OpenAPI_sor_info_t *sor_info,
|
OpenAPI_sor_info_t *sor_info,
|
||||||
|
@ -154,6 +163,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub
|
||||||
int service_gap_time,
|
int service_gap_time,
|
||||||
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
||||||
OpenAPI_mdt_configuration_t *mdt_configuration,
|
OpenAPI_mdt_configuration_t *mdt_configuration,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_cag_data_t *cag_data,
|
OpenAPI_cag_data_t *cag_data,
|
||||||
char *stn_sr,
|
char *stn_sr,
|
||||||
|
|
|
@ -11,13 +11,16 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
OpenAPI_list_t *internal_group_ids,
|
OpenAPI_list_t *internal_group_ids,
|
||||||
OpenAPI_list_t* shared_vn_group_data_ids,
|
OpenAPI_list_t* shared_vn_group_data_ids,
|
||||||
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
||||||
|
bool is_nssai_null,
|
||||||
OpenAPI_nssai_1_t *nssai,
|
OpenAPI_nssai_1_t *nssai,
|
||||||
OpenAPI_set_t *rat_restrictions,
|
OpenAPI_set_t *rat_restrictions,
|
||||||
OpenAPI_list_t *forbidden_areas,
|
OpenAPI_list_t *forbidden_areas,
|
||||||
OpenAPI_service_area_restriction_1_t *service_area_restriction,
|
OpenAPI_service_area_restriction_1_t *service_area_restriction,
|
||||||
OpenAPI_list_t *core_network_type_restrictions,
|
OpenAPI_list_t *core_network_type_restrictions,
|
||||||
|
bool is_rfsp_index_null,
|
||||||
bool is_rfsp_index,
|
bool is_rfsp_index,
|
||||||
int rfsp_index,
|
int rfsp_index,
|
||||||
|
bool is_subs_reg_timer_null,
|
||||||
bool is_subs_reg_timer,
|
bool is_subs_reg_timer,
|
||||||
int subs_reg_timer,
|
int subs_reg_timer,
|
||||||
bool is_ue_usage_type,
|
bool is_ue_usage_type,
|
||||||
|
@ -26,6 +29,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
int mps_priority,
|
int mps_priority,
|
||||||
bool is_mcs_priority,
|
bool is_mcs_priority,
|
||||||
int mcs_priority,
|
int mcs_priority,
|
||||||
|
bool is_active_time_null,
|
||||||
bool is_active_time,
|
bool is_active_time,
|
||||||
int active_time,
|
int active_time,
|
||||||
OpenAPI_sor_info_1_t *sor_info,
|
OpenAPI_sor_info_1_t *sor_info,
|
||||||
|
@ -45,6 +49,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
int service_gap_time,
|
int service_gap_time,
|
||||||
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
||||||
OpenAPI_mdt_configuration_1_t *mdt_configuration,
|
OpenAPI_mdt_configuration_1_t *mdt_configuration,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_cag_data_1_t *cag_data,
|
OpenAPI_cag_data_1_t *cag_data,
|
||||||
char *stn_sr,
|
char *stn_sr,
|
||||||
|
@ -83,13 +88,16 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
access_and_mobility_subscription_data_1_local_var->internal_group_ids = internal_group_ids;
|
access_and_mobility_subscription_data_1_local_var->internal_group_ids = internal_group_ids;
|
||||||
access_and_mobility_subscription_data_1_local_var->shared_vn_group_data_ids = shared_vn_group_data_ids;
|
access_and_mobility_subscription_data_1_local_var->shared_vn_group_data_ids = shared_vn_group_data_ids;
|
||||||
access_and_mobility_subscription_data_1_local_var->subscribed_ue_ambr = subscribed_ue_ambr;
|
access_and_mobility_subscription_data_1_local_var->subscribed_ue_ambr = subscribed_ue_ambr;
|
||||||
|
access_and_mobility_subscription_data_1_local_var->is_nssai_null = is_nssai_null;
|
||||||
access_and_mobility_subscription_data_1_local_var->nssai = nssai;
|
access_and_mobility_subscription_data_1_local_var->nssai = nssai;
|
||||||
access_and_mobility_subscription_data_1_local_var->rat_restrictions = rat_restrictions;
|
access_and_mobility_subscription_data_1_local_var->rat_restrictions = rat_restrictions;
|
||||||
access_and_mobility_subscription_data_1_local_var->forbidden_areas = forbidden_areas;
|
access_and_mobility_subscription_data_1_local_var->forbidden_areas = forbidden_areas;
|
||||||
access_and_mobility_subscription_data_1_local_var->service_area_restriction = service_area_restriction;
|
access_and_mobility_subscription_data_1_local_var->service_area_restriction = service_area_restriction;
|
||||||
access_and_mobility_subscription_data_1_local_var->core_network_type_restrictions = core_network_type_restrictions;
|
access_and_mobility_subscription_data_1_local_var->core_network_type_restrictions = core_network_type_restrictions;
|
||||||
|
access_and_mobility_subscription_data_1_local_var->is_rfsp_index_null = is_rfsp_index_null;
|
||||||
access_and_mobility_subscription_data_1_local_var->is_rfsp_index = is_rfsp_index;
|
access_and_mobility_subscription_data_1_local_var->is_rfsp_index = is_rfsp_index;
|
||||||
access_and_mobility_subscription_data_1_local_var->rfsp_index = rfsp_index;
|
access_and_mobility_subscription_data_1_local_var->rfsp_index = rfsp_index;
|
||||||
|
access_and_mobility_subscription_data_1_local_var->is_subs_reg_timer_null = is_subs_reg_timer_null;
|
||||||
access_and_mobility_subscription_data_1_local_var->is_subs_reg_timer = is_subs_reg_timer;
|
access_and_mobility_subscription_data_1_local_var->is_subs_reg_timer = is_subs_reg_timer;
|
||||||
access_and_mobility_subscription_data_1_local_var->subs_reg_timer = subs_reg_timer;
|
access_and_mobility_subscription_data_1_local_var->subs_reg_timer = subs_reg_timer;
|
||||||
access_and_mobility_subscription_data_1_local_var->is_ue_usage_type = is_ue_usage_type;
|
access_and_mobility_subscription_data_1_local_var->is_ue_usage_type = is_ue_usage_type;
|
||||||
|
@ -98,6 +106,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
access_and_mobility_subscription_data_1_local_var->mps_priority = mps_priority;
|
access_and_mobility_subscription_data_1_local_var->mps_priority = mps_priority;
|
||||||
access_and_mobility_subscription_data_1_local_var->is_mcs_priority = is_mcs_priority;
|
access_and_mobility_subscription_data_1_local_var->is_mcs_priority = is_mcs_priority;
|
||||||
access_and_mobility_subscription_data_1_local_var->mcs_priority = mcs_priority;
|
access_and_mobility_subscription_data_1_local_var->mcs_priority = mcs_priority;
|
||||||
|
access_and_mobility_subscription_data_1_local_var->is_active_time_null = is_active_time_null;
|
||||||
access_and_mobility_subscription_data_1_local_var->is_active_time = is_active_time;
|
access_and_mobility_subscription_data_1_local_var->is_active_time = is_active_time;
|
||||||
access_and_mobility_subscription_data_1_local_var->active_time = active_time;
|
access_and_mobility_subscription_data_1_local_var->active_time = active_time;
|
||||||
access_and_mobility_subscription_data_1_local_var->sor_info = sor_info;
|
access_and_mobility_subscription_data_1_local_var->sor_info = sor_info;
|
||||||
|
@ -117,6 +126,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
access_and_mobility_subscription_data_1_local_var->service_gap_time = service_gap_time;
|
access_and_mobility_subscription_data_1_local_var->service_gap_time = service_gap_time;
|
||||||
access_and_mobility_subscription_data_1_local_var->mdt_user_consent = mdt_user_consent;
|
access_and_mobility_subscription_data_1_local_var->mdt_user_consent = mdt_user_consent;
|
||||||
access_and_mobility_subscription_data_1_local_var->mdt_configuration = mdt_configuration;
|
access_and_mobility_subscription_data_1_local_var->mdt_configuration = mdt_configuration;
|
||||||
|
access_and_mobility_subscription_data_1_local_var->is_trace_data_null = is_trace_data_null;
|
||||||
access_and_mobility_subscription_data_1_local_var->trace_data = trace_data;
|
access_and_mobility_subscription_data_1_local_var->trace_data = trace_data;
|
||||||
access_and_mobility_subscription_data_1_local_var->cag_data = cag_data;
|
access_and_mobility_subscription_data_1_local_var->cag_data = cag_data;
|
||||||
access_and_mobility_subscription_data_1_local_var->stn_sr = stn_sr;
|
access_and_mobility_subscription_data_1_local_var->stn_sr = stn_sr;
|
||||||
|
@ -440,6 +450,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [nssai]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [nssai]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data_1->is_nssai_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "nssai") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [nssai]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data_1->rat_restrictions != OpenAPI_rat_type_NULL) {
|
if (access_and_mobility_subscription_data_1->rat_restrictions != OpenAPI_rat_type_NULL) {
|
||||||
|
@ -504,6 +519,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [rfsp_index]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [rfsp_index]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data_1->is_rfsp_index_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "rfspIndex") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [rfsp_index]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data_1->is_subs_reg_timer) {
|
if (access_and_mobility_subscription_data_1->is_subs_reg_timer) {
|
||||||
|
@ -511,6 +531,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [subs_reg_timer]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [subs_reg_timer]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data_1->is_subs_reg_timer_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "subsRegTimer") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [subs_reg_timer]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data_1->is_ue_usage_type) {
|
if (access_and_mobility_subscription_data_1->is_ue_usage_type) {
|
||||||
|
@ -539,6 +564,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [active_time]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [active_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data_1->is_active_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "activeTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [active_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data_1->sor_info) {
|
if (access_and_mobility_subscription_data_1->sor_info) {
|
||||||
|
@ -682,6 +712,11 @@ cJSON *OpenAPI_access_and_mobility_subscription_data_1_convertToJSON(OpenAPI_acc
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [trace_data]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (access_and_mobility_subscription_data_1->is_trace_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_convertToJSON() failed [trace_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access_and_mobility_subscription_data_1->cag_data) {
|
if (access_and_mobility_subscription_data_1->cag_data) {
|
||||||
|
@ -1124,12 +1159,14 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
|
|
||||||
nssai = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "nssai");
|
nssai = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "nssai");
|
||||||
if (nssai) {
|
if (nssai) {
|
||||||
|
if (!cJSON_IsNull(nssai)) {
|
||||||
nssai_local_nonprim = OpenAPI_nssai_1_parseFromJSON(nssai);
|
nssai_local_nonprim = OpenAPI_nssai_1_parseFromJSON(nssai);
|
||||||
if (!nssai_local_nonprim) {
|
if (!nssai_local_nonprim) {
|
||||||
ogs_error("OpenAPI_nssai_1_parseFromJSON failed [nssai]");
|
ogs_error("OpenAPI_nssai_1_parseFromJSON failed [nssai]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ratRestrictions");
|
rat_restrictions = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ratRestrictions");
|
||||||
if (rat_restrictions) {
|
if (rat_restrictions) {
|
||||||
|
@ -1216,19 +1253,23 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
|
|
||||||
rfsp_index = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "rfspIndex");
|
rfsp_index = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "rfspIndex");
|
||||||
if (rfsp_index) {
|
if (rfsp_index) {
|
||||||
|
if (!cJSON_IsNull(rfsp_index)) {
|
||||||
if (!cJSON_IsNumber(rfsp_index)) {
|
if (!cJSON_IsNumber(rfsp_index)) {
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [rfsp_index]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [rfsp_index]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
subs_reg_timer = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "subsRegTimer");
|
subs_reg_timer = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "subsRegTimer");
|
||||||
if (subs_reg_timer) {
|
if (subs_reg_timer) {
|
||||||
|
if (!cJSON_IsNull(subs_reg_timer)) {
|
||||||
if (!cJSON_IsNumber(subs_reg_timer)) {
|
if (!cJSON_IsNumber(subs_reg_timer)) {
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [subs_reg_timer]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [subs_reg_timer]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ue_usage_type = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ueUsageType");
|
ue_usage_type = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "ueUsageType");
|
||||||
if (ue_usage_type) {
|
if (ue_usage_type) {
|
||||||
|
@ -1256,11 +1297,13 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
|
|
||||||
active_time = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "activeTime");
|
active_time = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "activeTime");
|
||||||
if (active_time) {
|
if (active_time) {
|
||||||
|
if (!cJSON_IsNull(active_time)) {
|
||||||
if (!cJSON_IsNumber(active_time)) {
|
if (!cJSON_IsNumber(active_time)) {
|
||||||
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [active_time]");
|
ogs_error("OpenAPI_access_and_mobility_subscription_data_1_parseFromJSON() failed [active_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sor_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "sorInfo");
|
sor_info = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "sorInfo");
|
||||||
if (sor_info) {
|
if (sor_info) {
|
||||||
|
@ -1416,12 +1459,14 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
|
|
||||||
trace_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "traceData");
|
trace_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "traceData");
|
||||||
if (trace_data) {
|
if (trace_data) {
|
||||||
|
if (!cJSON_IsNull(trace_data)) {
|
||||||
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
||||||
if (!trace_data_local_nonprim) {
|
if (!trace_data_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cag_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "cagData");
|
cag_data = cJSON_GetObjectItemCaseSensitive(access_and_mobility_subscription_data_1JSON, "cagData");
|
||||||
if (cag_data) {
|
if (cag_data) {
|
||||||
|
@ -1720,13 +1765,16 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
internal_group_ids ? internal_group_idsList : NULL,
|
internal_group_ids ? internal_group_idsList : NULL,
|
||||||
shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL,
|
shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL,
|
||||||
subscribed_ue_ambr ? subscribed_ue_ambr_local_nonprim : NULL,
|
subscribed_ue_ambr ? subscribed_ue_ambr_local_nonprim : NULL,
|
||||||
|
nssai && cJSON_IsNull(nssai) ? true : false,
|
||||||
nssai ? nssai_local_nonprim : NULL,
|
nssai ? nssai_local_nonprim : NULL,
|
||||||
rat_restrictions ? rat_restrictionsList : NULL,
|
rat_restrictions ? rat_restrictionsList : NULL,
|
||||||
forbidden_areas ? forbidden_areasList : NULL,
|
forbidden_areas ? forbidden_areasList : NULL,
|
||||||
service_area_restriction ? service_area_restriction_local_nonprim : NULL,
|
service_area_restriction ? service_area_restriction_local_nonprim : NULL,
|
||||||
core_network_type_restrictions ? core_network_type_restrictionsList : NULL,
|
core_network_type_restrictions ? core_network_type_restrictionsList : NULL,
|
||||||
|
rfsp_index && cJSON_IsNull(rfsp_index) ? true : false,
|
||||||
rfsp_index ? true : false,
|
rfsp_index ? true : false,
|
||||||
rfsp_index ? rfsp_index->valuedouble : 0,
|
rfsp_index ? rfsp_index->valuedouble : 0,
|
||||||
|
subs_reg_timer && cJSON_IsNull(subs_reg_timer) ? true : false,
|
||||||
subs_reg_timer ? true : false,
|
subs_reg_timer ? true : false,
|
||||||
subs_reg_timer ? subs_reg_timer->valuedouble : 0,
|
subs_reg_timer ? subs_reg_timer->valuedouble : 0,
|
||||||
ue_usage_type ? true : false,
|
ue_usage_type ? true : false,
|
||||||
|
@ -1735,6 +1783,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
mps_priority ? mps_priority->valueint : 0,
|
mps_priority ? mps_priority->valueint : 0,
|
||||||
mcs_priority ? true : false,
|
mcs_priority ? true : false,
|
||||||
mcs_priority ? mcs_priority->valueint : 0,
|
mcs_priority ? mcs_priority->valueint : 0,
|
||||||
|
active_time && cJSON_IsNull(active_time) ? true : false,
|
||||||
active_time ? true : false,
|
active_time ? true : false,
|
||||||
active_time ? active_time->valuedouble : 0,
|
active_time ? active_time->valuedouble : 0,
|
||||||
sor_info ? sor_info_local_nonprim : NULL,
|
sor_info ? sor_info_local_nonprim : NULL,
|
||||||
|
@ -1754,6 +1803,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
service_gap_time ? service_gap_time->valuedouble : 0,
|
service_gap_time ? service_gap_time->valuedouble : 0,
|
||||||
mdt_user_consent ? mdt_user_consentVariable : 0,
|
mdt_user_consent ? mdt_user_consentVariable : 0,
|
||||||
mdt_configuration ? mdt_configuration_local_nonprim : NULL,
|
mdt_configuration ? mdt_configuration_local_nonprim : NULL,
|
||||||
|
trace_data && cJSON_IsNull(trace_data) ? true : false,
|
||||||
trace_data ? trace_data_local_nonprim : NULL,
|
trace_data ? trace_data_local_nonprim : NULL,
|
||||||
cag_data ? cag_data_local_nonprim : NULL,
|
cag_data ? cag_data_local_nonprim : NULL,
|
||||||
stn_sr && !cJSON_IsNull(stn_sr) ? ogs_strdup(stn_sr->valuestring) : NULL,
|
stn_sr && !cJSON_IsNull(stn_sr) ? ogs_strdup(stn_sr->valuestring) : NULL,
|
||||||
|
|
|
@ -50,13 +50,16 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_1_s {
|
||||||
OpenAPI_list_t *internal_group_ids;
|
OpenAPI_list_t *internal_group_ids;
|
||||||
OpenAPI_list_t* shared_vn_group_data_ids;
|
OpenAPI_list_t* shared_vn_group_data_ids;
|
||||||
struct OpenAPI_ambr_rm_s *subscribed_ue_ambr;
|
struct OpenAPI_ambr_rm_s *subscribed_ue_ambr;
|
||||||
|
bool is_nssai_null;
|
||||||
struct OpenAPI_nssai_1_s *nssai;
|
struct OpenAPI_nssai_1_s *nssai;
|
||||||
OpenAPI_set_t *rat_restrictions;
|
OpenAPI_set_t *rat_restrictions;
|
||||||
OpenAPI_list_t *forbidden_areas;
|
OpenAPI_list_t *forbidden_areas;
|
||||||
struct OpenAPI_service_area_restriction_1_s *service_area_restriction;
|
struct OpenAPI_service_area_restriction_1_s *service_area_restriction;
|
||||||
OpenAPI_list_t *core_network_type_restrictions;
|
OpenAPI_list_t *core_network_type_restrictions;
|
||||||
|
bool is_rfsp_index_null;
|
||||||
bool is_rfsp_index;
|
bool is_rfsp_index;
|
||||||
int rfsp_index;
|
int rfsp_index;
|
||||||
|
bool is_subs_reg_timer_null;
|
||||||
bool is_subs_reg_timer;
|
bool is_subs_reg_timer;
|
||||||
int subs_reg_timer;
|
int subs_reg_timer;
|
||||||
bool is_ue_usage_type;
|
bool is_ue_usage_type;
|
||||||
|
@ -65,6 +68,7 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_1_s {
|
||||||
int mps_priority;
|
int mps_priority;
|
||||||
bool is_mcs_priority;
|
bool is_mcs_priority;
|
||||||
int mcs_priority;
|
int mcs_priority;
|
||||||
|
bool is_active_time_null;
|
||||||
bool is_active_time;
|
bool is_active_time;
|
||||||
int active_time;
|
int active_time;
|
||||||
struct OpenAPI_sor_info_1_s *sor_info;
|
struct OpenAPI_sor_info_1_s *sor_info;
|
||||||
|
@ -84,6 +88,7 @@ typedef struct OpenAPI_access_and_mobility_subscription_data_1_s {
|
||||||
int service_gap_time;
|
int service_gap_time;
|
||||||
OpenAPI_mdt_user_consent_e mdt_user_consent;
|
OpenAPI_mdt_user_consent_e mdt_user_consent;
|
||||||
struct OpenAPI_mdt_configuration_1_s *mdt_configuration;
|
struct OpenAPI_mdt_configuration_1_s *mdt_configuration;
|
||||||
|
bool is_trace_data_null;
|
||||||
struct OpenAPI_trace_data_s *trace_data;
|
struct OpenAPI_trace_data_s *trace_data;
|
||||||
struct OpenAPI_cag_data_1_s *cag_data;
|
struct OpenAPI_cag_data_1_s *cag_data;
|
||||||
char *stn_sr;
|
char *stn_sr;
|
||||||
|
@ -120,13 +125,16 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
OpenAPI_list_t *internal_group_ids,
|
OpenAPI_list_t *internal_group_ids,
|
||||||
OpenAPI_list_t* shared_vn_group_data_ids,
|
OpenAPI_list_t* shared_vn_group_data_ids,
|
||||||
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
OpenAPI_ambr_rm_t *subscribed_ue_ambr,
|
||||||
|
bool is_nssai_null,
|
||||||
OpenAPI_nssai_1_t *nssai,
|
OpenAPI_nssai_1_t *nssai,
|
||||||
OpenAPI_set_t *rat_restrictions,
|
OpenAPI_set_t *rat_restrictions,
|
||||||
OpenAPI_list_t *forbidden_areas,
|
OpenAPI_list_t *forbidden_areas,
|
||||||
OpenAPI_service_area_restriction_1_t *service_area_restriction,
|
OpenAPI_service_area_restriction_1_t *service_area_restriction,
|
||||||
OpenAPI_list_t *core_network_type_restrictions,
|
OpenAPI_list_t *core_network_type_restrictions,
|
||||||
|
bool is_rfsp_index_null,
|
||||||
bool is_rfsp_index,
|
bool is_rfsp_index,
|
||||||
int rfsp_index,
|
int rfsp_index,
|
||||||
|
bool is_subs_reg_timer_null,
|
||||||
bool is_subs_reg_timer,
|
bool is_subs_reg_timer,
|
||||||
int subs_reg_timer,
|
int subs_reg_timer,
|
||||||
bool is_ue_usage_type,
|
bool is_ue_usage_type,
|
||||||
|
@ -135,6 +143,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
int mps_priority,
|
int mps_priority,
|
||||||
bool is_mcs_priority,
|
bool is_mcs_priority,
|
||||||
int mcs_priority,
|
int mcs_priority,
|
||||||
|
bool is_active_time_null,
|
||||||
bool is_active_time,
|
bool is_active_time,
|
||||||
int active_time,
|
int active_time,
|
||||||
OpenAPI_sor_info_1_t *sor_info,
|
OpenAPI_sor_info_1_t *sor_info,
|
||||||
|
@ -154,6 +163,7 @@ OpenAPI_access_and_mobility_subscription_data_1_t *OpenAPI_access_and_mobility_s
|
||||||
int service_gap_time,
|
int service_gap_time,
|
||||||
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
OpenAPI_mdt_user_consent_e mdt_user_consent,
|
||||||
OpenAPI_mdt_configuration_1_t *mdt_configuration,
|
OpenAPI_mdt_configuration_1_t *mdt_configuration,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_cag_data_1_t *cag_data,
|
OpenAPI_cag_data_1_t *cag_data,
|
||||||
char *stn_sr,
|
char *stn_sr,
|
||||||
|
|
|
@ -10,6 +10,7 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
|
||||||
OpenAPI_list_t *route_to_locs,
|
OpenAPI_list_t *route_to_locs,
|
||||||
OpenAPI_spatial_validity_t *sp_val,
|
OpenAPI_spatial_validity_t *sp_val,
|
||||||
OpenAPI_list_t *temp_vals,
|
OpenAPI_list_t *temp_vals,
|
||||||
|
bool is_up_path_chg_sub_null,
|
||||||
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
||||||
bool is_addr_preser_ind,
|
bool is_addr_preser_ind,
|
||||||
int addr_preser_ind,
|
int addr_preser_ind,
|
||||||
|
@ -32,6 +33,7 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
|
||||||
af_routing_requirement_local_var->route_to_locs = route_to_locs;
|
af_routing_requirement_local_var->route_to_locs = route_to_locs;
|
||||||
af_routing_requirement_local_var->sp_val = sp_val;
|
af_routing_requirement_local_var->sp_val = sp_val;
|
||||||
af_routing_requirement_local_var->temp_vals = temp_vals;
|
af_routing_requirement_local_var->temp_vals = temp_vals;
|
||||||
|
af_routing_requirement_local_var->is_up_path_chg_sub_null = is_up_path_chg_sub_null;
|
||||||
af_routing_requirement_local_var->up_path_chg_sub = up_path_chg_sub;
|
af_routing_requirement_local_var->up_path_chg_sub = up_path_chg_sub;
|
||||||
af_routing_requirement_local_var->is_addr_preser_ind = is_addr_preser_ind;
|
af_routing_requirement_local_var->is_addr_preser_ind = is_addr_preser_ind;
|
||||||
af_routing_requirement_local_var->addr_preser_ind = addr_preser_ind;
|
af_routing_requirement_local_var->addr_preser_ind = addr_preser_ind;
|
||||||
|
@ -161,6 +163,11 @@ cJSON *OpenAPI_af_routing_requirement_convertToJSON(OpenAPI_af_routing_requireme
|
||||||
ogs_error("OpenAPI_af_routing_requirement_convertToJSON() failed [up_path_chg_sub]");
|
ogs_error("OpenAPI_af_routing_requirement_convertToJSON() failed [up_path_chg_sub]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement->is_up_path_chg_sub_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "upPathChgSub") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_convertToJSON() failed [up_path_chg_sub]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement->is_addr_preser_ind) {
|
if (af_routing_requirement->is_addr_preser_ind) {
|
||||||
|
@ -305,12 +312,14 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_parseFromJSON(c
|
||||||
|
|
||||||
up_path_chg_sub = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "upPathChgSub");
|
up_path_chg_sub = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "upPathChgSub");
|
||||||
if (up_path_chg_sub) {
|
if (up_path_chg_sub) {
|
||||||
|
if (!cJSON_IsNull(up_path_chg_sub)) {
|
||||||
up_path_chg_sub_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_sub);
|
up_path_chg_sub_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_sub);
|
||||||
if (!up_path_chg_sub_local_nonprim) {
|
if (!up_path_chg_sub_local_nonprim) {
|
||||||
ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed [up_path_chg_sub]");
|
ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed [up_path_chg_sub]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
addr_preser_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "addrPreserInd");
|
addr_preser_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirementJSON, "addrPreserInd");
|
||||||
if (addr_preser_ind) {
|
if (addr_preser_ind) {
|
||||||
|
@ -382,6 +391,7 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_parseFromJSON(c
|
||||||
route_to_locs ? route_to_locsList : NULL,
|
route_to_locs ? route_to_locsList : NULL,
|
||||||
sp_val ? sp_val_local_nonprim : NULL,
|
sp_val ? sp_val_local_nonprim : NULL,
|
||||||
temp_vals ? temp_valsList : NULL,
|
temp_vals ? temp_valsList : NULL,
|
||||||
|
up_path_chg_sub && cJSON_IsNull(up_path_chg_sub) ? true : false,
|
||||||
up_path_chg_sub ? up_path_chg_sub_local_nonprim : NULL,
|
up_path_chg_sub ? up_path_chg_sub_local_nonprim : NULL,
|
||||||
addr_preser_ind ? true : false,
|
addr_preser_ind ? true : false,
|
||||||
addr_preser_ind ? addr_preser_ind->valueint : 0,
|
addr_preser_ind ? addr_preser_ind->valueint : 0,
|
||||||
|
|
|
@ -29,6 +29,7 @@ typedef struct OpenAPI_af_routing_requirement_s {
|
||||||
OpenAPI_list_t *route_to_locs;
|
OpenAPI_list_t *route_to_locs;
|
||||||
struct OpenAPI_spatial_validity_s *sp_val;
|
struct OpenAPI_spatial_validity_s *sp_val;
|
||||||
OpenAPI_list_t *temp_vals;
|
OpenAPI_list_t *temp_vals;
|
||||||
|
bool is_up_path_chg_sub_null;
|
||||||
struct OpenAPI_up_path_chg_event_s *up_path_chg_sub;
|
struct OpenAPI_up_path_chg_event_s *up_path_chg_sub;
|
||||||
bool is_addr_preser_ind;
|
bool is_addr_preser_ind;
|
||||||
int addr_preser_ind;
|
int addr_preser_ind;
|
||||||
|
@ -49,6 +50,7 @@ OpenAPI_af_routing_requirement_t *OpenAPI_af_routing_requirement_create(
|
||||||
OpenAPI_list_t *route_to_locs,
|
OpenAPI_list_t *route_to_locs,
|
||||||
OpenAPI_spatial_validity_t *sp_val,
|
OpenAPI_spatial_validity_t *sp_val,
|
||||||
OpenAPI_list_t *temp_vals,
|
OpenAPI_list_t *temp_vals,
|
||||||
|
bool is_up_path_chg_sub_null,
|
||||||
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
||||||
bool is_addr_preser_ind,
|
bool is_addr_preser_ind,
|
||||||
int addr_preser_ind,
|
int addr_preser_ind,
|
||||||
|
|
|
@ -7,19 +7,28 @@
|
||||||
OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
|
OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
|
||||||
bool is_app_reloc,
|
bool is_app_reloc,
|
||||||
int app_reloc,
|
int app_reloc,
|
||||||
|
bool is_route_to_locs_null,
|
||||||
OpenAPI_list_t *route_to_locs,
|
OpenAPI_list_t *route_to_locs,
|
||||||
|
bool is_sp_val_null,
|
||||||
OpenAPI_spatial_validity_rm_t *sp_val,
|
OpenAPI_spatial_validity_rm_t *sp_val,
|
||||||
|
bool is_temp_vals_null,
|
||||||
OpenAPI_list_t *temp_vals,
|
OpenAPI_list_t *temp_vals,
|
||||||
|
bool is_up_path_chg_sub_null,
|
||||||
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
||||||
|
bool is_addr_preser_ind_null,
|
||||||
bool is_addr_preser_ind,
|
bool is_addr_preser_ind,
|
||||||
int addr_preser_ind,
|
int addr_preser_ind,
|
||||||
|
bool is_sim_conn_ind_null,
|
||||||
bool is_sim_conn_ind,
|
bool is_sim_conn_ind,
|
||||||
int sim_conn_ind,
|
int sim_conn_ind,
|
||||||
|
bool is_sim_conn_term_null,
|
||||||
bool is_sim_conn_term,
|
bool is_sim_conn_term,
|
||||||
int sim_conn_term,
|
int sim_conn_term,
|
||||||
|
bool is_eas_ip_replace_infos_null,
|
||||||
OpenAPI_list_t *eas_ip_replace_infos,
|
OpenAPI_list_t *eas_ip_replace_infos,
|
||||||
bool is_eas_redis_ind,
|
bool is_eas_redis_ind,
|
||||||
int eas_redis_ind,
|
int eas_redis_ind,
|
||||||
|
bool is_max_allowed_up_lat_null,
|
||||||
bool is_max_allowed_up_lat,
|
bool is_max_allowed_up_lat,
|
||||||
int max_allowed_up_lat
|
int max_allowed_up_lat
|
||||||
)
|
)
|
||||||
|
@ -29,19 +38,28 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
|
||||||
|
|
||||||
af_routing_requirement_rm_local_var->is_app_reloc = is_app_reloc;
|
af_routing_requirement_rm_local_var->is_app_reloc = is_app_reloc;
|
||||||
af_routing_requirement_rm_local_var->app_reloc = app_reloc;
|
af_routing_requirement_rm_local_var->app_reloc = app_reloc;
|
||||||
|
af_routing_requirement_rm_local_var->is_route_to_locs_null = is_route_to_locs_null;
|
||||||
af_routing_requirement_rm_local_var->route_to_locs = route_to_locs;
|
af_routing_requirement_rm_local_var->route_to_locs = route_to_locs;
|
||||||
|
af_routing_requirement_rm_local_var->is_sp_val_null = is_sp_val_null;
|
||||||
af_routing_requirement_rm_local_var->sp_val = sp_val;
|
af_routing_requirement_rm_local_var->sp_val = sp_val;
|
||||||
|
af_routing_requirement_rm_local_var->is_temp_vals_null = is_temp_vals_null;
|
||||||
af_routing_requirement_rm_local_var->temp_vals = temp_vals;
|
af_routing_requirement_rm_local_var->temp_vals = temp_vals;
|
||||||
|
af_routing_requirement_rm_local_var->is_up_path_chg_sub_null = is_up_path_chg_sub_null;
|
||||||
af_routing_requirement_rm_local_var->up_path_chg_sub = up_path_chg_sub;
|
af_routing_requirement_rm_local_var->up_path_chg_sub = up_path_chg_sub;
|
||||||
|
af_routing_requirement_rm_local_var->is_addr_preser_ind_null = is_addr_preser_ind_null;
|
||||||
af_routing_requirement_rm_local_var->is_addr_preser_ind = is_addr_preser_ind;
|
af_routing_requirement_rm_local_var->is_addr_preser_ind = is_addr_preser_ind;
|
||||||
af_routing_requirement_rm_local_var->addr_preser_ind = addr_preser_ind;
|
af_routing_requirement_rm_local_var->addr_preser_ind = addr_preser_ind;
|
||||||
|
af_routing_requirement_rm_local_var->is_sim_conn_ind_null = is_sim_conn_ind_null;
|
||||||
af_routing_requirement_rm_local_var->is_sim_conn_ind = is_sim_conn_ind;
|
af_routing_requirement_rm_local_var->is_sim_conn_ind = is_sim_conn_ind;
|
||||||
af_routing_requirement_rm_local_var->sim_conn_ind = sim_conn_ind;
|
af_routing_requirement_rm_local_var->sim_conn_ind = sim_conn_ind;
|
||||||
|
af_routing_requirement_rm_local_var->is_sim_conn_term_null = is_sim_conn_term_null;
|
||||||
af_routing_requirement_rm_local_var->is_sim_conn_term = is_sim_conn_term;
|
af_routing_requirement_rm_local_var->is_sim_conn_term = is_sim_conn_term;
|
||||||
af_routing_requirement_rm_local_var->sim_conn_term = sim_conn_term;
|
af_routing_requirement_rm_local_var->sim_conn_term = sim_conn_term;
|
||||||
|
af_routing_requirement_rm_local_var->is_eas_ip_replace_infos_null = is_eas_ip_replace_infos_null;
|
||||||
af_routing_requirement_rm_local_var->eas_ip_replace_infos = eas_ip_replace_infos;
|
af_routing_requirement_rm_local_var->eas_ip_replace_infos = eas_ip_replace_infos;
|
||||||
af_routing_requirement_rm_local_var->is_eas_redis_ind = is_eas_redis_ind;
|
af_routing_requirement_rm_local_var->is_eas_redis_ind = is_eas_redis_ind;
|
||||||
af_routing_requirement_rm_local_var->eas_redis_ind = eas_redis_ind;
|
af_routing_requirement_rm_local_var->eas_redis_ind = eas_redis_ind;
|
||||||
|
af_routing_requirement_rm_local_var->is_max_allowed_up_lat_null = is_max_allowed_up_lat_null;
|
||||||
af_routing_requirement_rm_local_var->is_max_allowed_up_lat = is_max_allowed_up_lat;
|
af_routing_requirement_rm_local_var->is_max_allowed_up_lat = is_max_allowed_up_lat;
|
||||||
af_routing_requirement_rm_local_var->max_allowed_up_lat = max_allowed_up_lat;
|
af_routing_requirement_rm_local_var->max_allowed_up_lat = max_allowed_up_lat;
|
||||||
|
|
||||||
|
@ -119,6 +137,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(route_to_locsList, itemLocal);
|
cJSON_AddItemToArray(route_to_locsList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_route_to_locs_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "routeToLocs") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [route_to_locs]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->sp_val) {
|
if (af_routing_requirement_rm->sp_val) {
|
||||||
|
@ -132,6 +155,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sp_val]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sp_val]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_sp_val_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "spVal") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sp_val]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->temp_vals) {
|
if (af_routing_requirement_rm->temp_vals) {
|
||||||
|
@ -148,6 +176,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(temp_valsList, itemLocal);
|
cJSON_AddItemToArray(temp_valsList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_temp_vals_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tempVals") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [temp_vals]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->up_path_chg_sub) {
|
if (af_routing_requirement_rm->up_path_chg_sub) {
|
||||||
|
@ -161,6 +194,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [up_path_chg_sub]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [up_path_chg_sub]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_up_path_chg_sub_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "upPathChgSub") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [up_path_chg_sub]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->is_addr_preser_ind) {
|
if (af_routing_requirement_rm->is_addr_preser_ind) {
|
||||||
|
@ -168,6 +206,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [addr_preser_ind]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [addr_preser_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_addr_preser_ind_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "addrPreserInd") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [addr_preser_ind]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->is_sim_conn_ind) {
|
if (af_routing_requirement_rm->is_sim_conn_ind) {
|
||||||
|
@ -175,6 +218,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sim_conn_ind]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sim_conn_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_sim_conn_ind_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "simConnInd") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sim_conn_ind]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->is_sim_conn_term) {
|
if (af_routing_requirement_rm->is_sim_conn_term) {
|
||||||
|
@ -182,6 +230,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sim_conn_term]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sim_conn_term]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_sim_conn_term_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "simConnTerm") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [sim_conn_term]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->eas_ip_replace_infos) {
|
if (af_routing_requirement_rm->eas_ip_replace_infos) {
|
||||||
|
@ -198,6 +251,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(eas_ip_replace_infosList, itemLocal);
|
cJSON_AddItemToArray(eas_ip_replace_infosList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_eas_ip_replace_infos_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "easIpReplaceInfos") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [eas_ip_replace_infos]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (af_routing_requirement_rm->is_eas_redis_ind) {
|
if (af_routing_requirement_rm->is_eas_redis_ind) {
|
||||||
|
@ -212,6 +270,11 @@ cJSON *OpenAPI_af_routing_requirement_rm_convertToJSON(OpenAPI_af_routing_requir
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [max_allowed_up_lat]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [max_allowed_up_lat]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (af_routing_requirement_rm->is_max_allowed_up_lat_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxAllowedUpLat") == NULL) {
|
||||||
|
ogs_error("OpenAPI_af_routing_requirement_rm_convertToJSON() failed [max_allowed_up_lat]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -248,6 +311,7 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_parseFrom
|
||||||
|
|
||||||
route_to_locs = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "routeToLocs");
|
route_to_locs = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "routeToLocs");
|
||||||
if (route_to_locs) {
|
if (route_to_locs) {
|
||||||
|
if (!cJSON_IsNull(route_to_locs)) {
|
||||||
cJSON *route_to_locs_local = NULL;
|
cJSON *route_to_locs_local = NULL;
|
||||||
if (!cJSON_IsArray(route_to_locs)) {
|
if (!cJSON_IsArray(route_to_locs)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [route_to_locs]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [route_to_locs]");
|
||||||
|
@ -269,18 +333,22 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_parseFrom
|
||||||
OpenAPI_list_add(route_to_locsList, route_to_locsItem);
|
OpenAPI_list_add(route_to_locsList, route_to_locsItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sp_val = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "spVal");
|
sp_val = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "spVal");
|
||||||
if (sp_val) {
|
if (sp_val) {
|
||||||
|
if (!cJSON_IsNull(sp_val)) {
|
||||||
sp_val_local_nonprim = OpenAPI_spatial_validity_rm_parseFromJSON(sp_val);
|
sp_val_local_nonprim = OpenAPI_spatial_validity_rm_parseFromJSON(sp_val);
|
||||||
if (!sp_val_local_nonprim) {
|
if (!sp_val_local_nonprim) {
|
||||||
ogs_error("OpenAPI_spatial_validity_rm_parseFromJSON failed [sp_val]");
|
ogs_error("OpenAPI_spatial_validity_rm_parseFromJSON failed [sp_val]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
temp_vals = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "tempVals");
|
temp_vals = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "tempVals");
|
||||||
if (temp_vals) {
|
if (temp_vals) {
|
||||||
|
if (!cJSON_IsNull(temp_vals)) {
|
||||||
cJSON *temp_vals_local = NULL;
|
cJSON *temp_vals_local = NULL;
|
||||||
if (!cJSON_IsArray(temp_vals)) {
|
if (!cJSON_IsArray(temp_vals)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [temp_vals]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [temp_vals]");
|
||||||
|
@ -302,42 +370,52 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_parseFrom
|
||||||
OpenAPI_list_add(temp_valsList, temp_valsItem);
|
OpenAPI_list_add(temp_valsList, temp_valsItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
up_path_chg_sub = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "upPathChgSub");
|
up_path_chg_sub = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "upPathChgSub");
|
||||||
if (up_path_chg_sub) {
|
if (up_path_chg_sub) {
|
||||||
|
if (!cJSON_IsNull(up_path_chg_sub)) {
|
||||||
up_path_chg_sub_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_sub);
|
up_path_chg_sub_local_nonprim = OpenAPI_up_path_chg_event_parseFromJSON(up_path_chg_sub);
|
||||||
if (!up_path_chg_sub_local_nonprim) {
|
if (!up_path_chg_sub_local_nonprim) {
|
||||||
ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed [up_path_chg_sub]");
|
ogs_error("OpenAPI_up_path_chg_event_parseFromJSON failed [up_path_chg_sub]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
addr_preser_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "addrPreserInd");
|
addr_preser_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "addrPreserInd");
|
||||||
if (addr_preser_ind) {
|
if (addr_preser_ind) {
|
||||||
|
if (!cJSON_IsNull(addr_preser_ind)) {
|
||||||
if (!cJSON_IsBool(addr_preser_ind)) {
|
if (!cJSON_IsBool(addr_preser_ind)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [addr_preser_ind]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [addr_preser_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sim_conn_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "simConnInd");
|
sim_conn_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "simConnInd");
|
||||||
if (sim_conn_ind) {
|
if (sim_conn_ind) {
|
||||||
|
if (!cJSON_IsNull(sim_conn_ind)) {
|
||||||
if (!cJSON_IsBool(sim_conn_ind)) {
|
if (!cJSON_IsBool(sim_conn_ind)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [sim_conn_ind]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [sim_conn_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sim_conn_term = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "simConnTerm");
|
sim_conn_term = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "simConnTerm");
|
||||||
if (sim_conn_term) {
|
if (sim_conn_term) {
|
||||||
|
if (!cJSON_IsNull(sim_conn_term)) {
|
||||||
if (!cJSON_IsNumber(sim_conn_term)) {
|
if (!cJSON_IsNumber(sim_conn_term)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [sim_conn_term]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [sim_conn_term]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
eas_ip_replace_infos = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "easIpReplaceInfos");
|
eas_ip_replace_infos = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "easIpReplaceInfos");
|
||||||
if (eas_ip_replace_infos) {
|
if (eas_ip_replace_infos) {
|
||||||
|
if (!cJSON_IsNull(eas_ip_replace_infos)) {
|
||||||
cJSON *eas_ip_replace_infos_local = NULL;
|
cJSON *eas_ip_replace_infos_local = NULL;
|
||||||
if (!cJSON_IsArray(eas_ip_replace_infos)) {
|
if (!cJSON_IsArray(eas_ip_replace_infos)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [eas_ip_replace_infos]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [eas_ip_replace_infos]");
|
||||||
|
@ -359,6 +437,7 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_parseFrom
|
||||||
OpenAPI_list_add(eas_ip_replace_infosList, eas_ip_replace_infosItem);
|
OpenAPI_list_add(eas_ip_replace_infosList, eas_ip_replace_infosItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
eas_redis_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "easRedisInd");
|
eas_redis_ind = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "easRedisInd");
|
||||||
if (eas_redis_ind) {
|
if (eas_redis_ind) {
|
||||||
|
@ -370,28 +449,39 @@ OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_parseFrom
|
||||||
|
|
||||||
max_allowed_up_lat = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "maxAllowedUpLat");
|
max_allowed_up_lat = cJSON_GetObjectItemCaseSensitive(af_routing_requirement_rmJSON, "maxAllowedUpLat");
|
||||||
if (max_allowed_up_lat) {
|
if (max_allowed_up_lat) {
|
||||||
|
if (!cJSON_IsNull(max_allowed_up_lat)) {
|
||||||
if (!cJSON_IsNumber(max_allowed_up_lat)) {
|
if (!cJSON_IsNumber(max_allowed_up_lat)) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [max_allowed_up_lat]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON() failed [max_allowed_up_lat]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
af_routing_requirement_rm_local_var = OpenAPI_af_routing_requirement_rm_create (
|
af_routing_requirement_rm_local_var = OpenAPI_af_routing_requirement_rm_create (
|
||||||
app_reloc ? true : false,
|
app_reloc ? true : false,
|
||||||
app_reloc ? app_reloc->valueint : 0,
|
app_reloc ? app_reloc->valueint : 0,
|
||||||
|
route_to_locs && cJSON_IsNull(route_to_locs) ? true : false,
|
||||||
route_to_locs ? route_to_locsList : NULL,
|
route_to_locs ? route_to_locsList : NULL,
|
||||||
|
sp_val && cJSON_IsNull(sp_val) ? true : false,
|
||||||
sp_val ? sp_val_local_nonprim : NULL,
|
sp_val ? sp_val_local_nonprim : NULL,
|
||||||
|
temp_vals && cJSON_IsNull(temp_vals) ? true : false,
|
||||||
temp_vals ? temp_valsList : NULL,
|
temp_vals ? temp_valsList : NULL,
|
||||||
|
up_path_chg_sub && cJSON_IsNull(up_path_chg_sub) ? true : false,
|
||||||
up_path_chg_sub ? up_path_chg_sub_local_nonprim : NULL,
|
up_path_chg_sub ? up_path_chg_sub_local_nonprim : NULL,
|
||||||
|
addr_preser_ind && cJSON_IsNull(addr_preser_ind) ? true : false,
|
||||||
addr_preser_ind ? true : false,
|
addr_preser_ind ? true : false,
|
||||||
addr_preser_ind ? addr_preser_ind->valueint : 0,
|
addr_preser_ind ? addr_preser_ind->valueint : 0,
|
||||||
|
sim_conn_ind && cJSON_IsNull(sim_conn_ind) ? true : false,
|
||||||
sim_conn_ind ? true : false,
|
sim_conn_ind ? true : false,
|
||||||
sim_conn_ind ? sim_conn_ind->valueint : 0,
|
sim_conn_ind ? sim_conn_ind->valueint : 0,
|
||||||
|
sim_conn_term && cJSON_IsNull(sim_conn_term) ? true : false,
|
||||||
sim_conn_term ? true : false,
|
sim_conn_term ? true : false,
|
||||||
sim_conn_term ? sim_conn_term->valuedouble : 0,
|
sim_conn_term ? sim_conn_term->valuedouble : 0,
|
||||||
|
eas_ip_replace_infos && cJSON_IsNull(eas_ip_replace_infos) ? true : false,
|
||||||
eas_ip_replace_infos ? eas_ip_replace_infosList : NULL,
|
eas_ip_replace_infos ? eas_ip_replace_infosList : NULL,
|
||||||
eas_redis_ind ? true : false,
|
eas_redis_ind ? true : false,
|
||||||
eas_redis_ind ? eas_redis_ind->valueint : 0,
|
eas_redis_ind ? eas_redis_ind->valueint : 0,
|
||||||
|
max_allowed_up_lat && cJSON_IsNull(max_allowed_up_lat) ? true : false,
|
||||||
max_allowed_up_lat ? true : false,
|
max_allowed_up_lat ? true : false,
|
||||||
max_allowed_up_lat ? max_allowed_up_lat->valuedouble : 0
|
max_allowed_up_lat ? max_allowed_up_lat->valuedouble : 0
|
||||||
);
|
);
|
||||||
|
|
|
@ -26,19 +26,28 @@ typedef struct OpenAPI_af_routing_requirement_rm_s OpenAPI_af_routing_requiremen
|
||||||
typedef struct OpenAPI_af_routing_requirement_rm_s {
|
typedef struct OpenAPI_af_routing_requirement_rm_s {
|
||||||
bool is_app_reloc;
|
bool is_app_reloc;
|
||||||
int app_reloc;
|
int app_reloc;
|
||||||
|
bool is_route_to_locs_null;
|
||||||
OpenAPI_list_t *route_to_locs;
|
OpenAPI_list_t *route_to_locs;
|
||||||
|
bool is_sp_val_null;
|
||||||
struct OpenAPI_spatial_validity_rm_s *sp_val;
|
struct OpenAPI_spatial_validity_rm_s *sp_val;
|
||||||
|
bool is_temp_vals_null;
|
||||||
OpenAPI_list_t *temp_vals;
|
OpenAPI_list_t *temp_vals;
|
||||||
|
bool is_up_path_chg_sub_null;
|
||||||
struct OpenAPI_up_path_chg_event_s *up_path_chg_sub;
|
struct OpenAPI_up_path_chg_event_s *up_path_chg_sub;
|
||||||
|
bool is_addr_preser_ind_null;
|
||||||
bool is_addr_preser_ind;
|
bool is_addr_preser_ind;
|
||||||
int addr_preser_ind;
|
int addr_preser_ind;
|
||||||
|
bool is_sim_conn_ind_null;
|
||||||
bool is_sim_conn_ind;
|
bool is_sim_conn_ind;
|
||||||
int sim_conn_ind;
|
int sim_conn_ind;
|
||||||
|
bool is_sim_conn_term_null;
|
||||||
bool is_sim_conn_term;
|
bool is_sim_conn_term;
|
||||||
int sim_conn_term;
|
int sim_conn_term;
|
||||||
|
bool is_eas_ip_replace_infos_null;
|
||||||
OpenAPI_list_t *eas_ip_replace_infos;
|
OpenAPI_list_t *eas_ip_replace_infos;
|
||||||
bool is_eas_redis_ind;
|
bool is_eas_redis_ind;
|
||||||
int eas_redis_ind;
|
int eas_redis_ind;
|
||||||
|
bool is_max_allowed_up_lat_null;
|
||||||
bool is_max_allowed_up_lat;
|
bool is_max_allowed_up_lat;
|
||||||
int max_allowed_up_lat;
|
int max_allowed_up_lat;
|
||||||
} OpenAPI_af_routing_requirement_rm_t;
|
} OpenAPI_af_routing_requirement_rm_t;
|
||||||
|
@ -46,19 +55,28 @@ typedef struct OpenAPI_af_routing_requirement_rm_s {
|
||||||
OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
|
OpenAPI_af_routing_requirement_rm_t *OpenAPI_af_routing_requirement_rm_create(
|
||||||
bool is_app_reloc,
|
bool is_app_reloc,
|
||||||
int app_reloc,
|
int app_reloc,
|
||||||
|
bool is_route_to_locs_null,
|
||||||
OpenAPI_list_t *route_to_locs,
|
OpenAPI_list_t *route_to_locs,
|
||||||
|
bool is_sp_val_null,
|
||||||
OpenAPI_spatial_validity_rm_t *sp_val,
|
OpenAPI_spatial_validity_rm_t *sp_val,
|
||||||
|
bool is_temp_vals_null,
|
||||||
OpenAPI_list_t *temp_vals,
|
OpenAPI_list_t *temp_vals,
|
||||||
|
bool is_up_path_chg_sub_null,
|
||||||
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
OpenAPI_up_path_chg_event_t *up_path_chg_sub,
|
||||||
|
bool is_addr_preser_ind_null,
|
||||||
bool is_addr_preser_ind,
|
bool is_addr_preser_ind,
|
||||||
int addr_preser_ind,
|
int addr_preser_ind,
|
||||||
|
bool is_sim_conn_ind_null,
|
||||||
bool is_sim_conn_ind,
|
bool is_sim_conn_ind,
|
||||||
int sim_conn_ind,
|
int sim_conn_ind,
|
||||||
|
bool is_sim_conn_term_null,
|
||||||
bool is_sim_conn_term,
|
bool is_sim_conn_term,
|
||||||
int sim_conn_term,
|
int sim_conn_term,
|
||||||
|
bool is_eas_ip_replace_infos_null,
|
||||||
OpenAPI_list_t *eas_ip_replace_infos,
|
OpenAPI_list_t *eas_ip_replace_infos,
|
||||||
bool is_eas_redis_ind,
|
bool is_eas_redis_ind,
|
||||||
int eas_redis_ind,
|
int eas_redis_ind,
|
||||||
|
bool is_max_allowed_up_lat_null,
|
||||||
bool is_max_allowed_up_lat,
|
bool is_max_allowed_up_lat,
|
||||||
int max_allowed_up_lat
|
int max_allowed_up_lat
|
||||||
);
|
);
|
||||||
|
|
|
@ -12,6 +12,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
|
||||||
OpenAPI_ims_vo_ps_e ims_vo_ps,
|
OpenAPI_ims_vo_ps_e ims_vo_ps,
|
||||||
OpenAPI_list_t *backup_amf_info,
|
OpenAPI_list_t *backup_amf_info,
|
||||||
OpenAPI_eps_interworking_info_t *eps_interworking_info,
|
OpenAPI_eps_interworking_info_t *eps_interworking_info,
|
||||||
|
bool is_ue_srvcc_capability_null,
|
||||||
bool is_ue_srvcc_capability,
|
bool is_ue_srvcc_capability,
|
||||||
int ue_srvcc_capability,
|
int ue_srvcc_capability,
|
||||||
bool is_ue_mint_capability,
|
bool is_ue_mint_capability,
|
||||||
|
@ -28,6 +29,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
|
||||||
amf3_gpp_access_registration_modification_local_var->ims_vo_ps = ims_vo_ps;
|
amf3_gpp_access_registration_modification_local_var->ims_vo_ps = ims_vo_ps;
|
||||||
amf3_gpp_access_registration_modification_local_var->backup_amf_info = backup_amf_info;
|
amf3_gpp_access_registration_modification_local_var->backup_amf_info = backup_amf_info;
|
||||||
amf3_gpp_access_registration_modification_local_var->eps_interworking_info = eps_interworking_info;
|
amf3_gpp_access_registration_modification_local_var->eps_interworking_info = eps_interworking_info;
|
||||||
|
amf3_gpp_access_registration_modification_local_var->is_ue_srvcc_capability_null = is_ue_srvcc_capability_null;
|
||||||
amf3_gpp_access_registration_modification_local_var->is_ue_srvcc_capability = is_ue_srvcc_capability;
|
amf3_gpp_access_registration_modification_local_var->is_ue_srvcc_capability = is_ue_srvcc_capability;
|
||||||
amf3_gpp_access_registration_modification_local_var->ue_srvcc_capability = ue_srvcc_capability;
|
amf3_gpp_access_registration_modification_local_var->ue_srvcc_capability = ue_srvcc_capability;
|
||||||
amf3_gpp_access_registration_modification_local_var->is_ue_mint_capability = is_ue_mint_capability;
|
amf3_gpp_access_registration_modification_local_var->is_ue_mint_capability = is_ue_mint_capability;
|
||||||
|
@ -146,6 +148,11 @@ cJSON *OpenAPI_amf3_gpp_access_registration_modification_convertToJSON(OpenAPI_a
|
||||||
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_convertToJSON() failed [ue_srvcc_capability]");
|
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_convertToJSON() failed [ue_srvcc_capability]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (amf3_gpp_access_registration_modification->is_ue_srvcc_capability_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ueSrvccCapability") == NULL) {
|
||||||
|
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_convertToJSON() failed [ue_srvcc_capability]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (amf3_gpp_access_registration_modification->is_ue_mint_capability) {
|
if (amf3_gpp_access_registration_modification->is_ue_mint_capability) {
|
||||||
|
@ -246,11 +253,13 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
|
||||||
|
|
||||||
ue_srvcc_capability = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "ueSrvccCapability");
|
ue_srvcc_capability = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "ueSrvccCapability");
|
||||||
if (ue_srvcc_capability) {
|
if (ue_srvcc_capability) {
|
||||||
|
if (!cJSON_IsNull(ue_srvcc_capability)) {
|
||||||
if (!cJSON_IsBool(ue_srvcc_capability)) {
|
if (!cJSON_IsBool(ue_srvcc_capability)) {
|
||||||
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_parseFromJSON() failed [ue_srvcc_capability]");
|
ogs_error("OpenAPI_amf3_gpp_access_registration_modification_parseFromJSON() failed [ue_srvcc_capability]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ue_mint_capability = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "ueMINTCapability");
|
ue_mint_capability = cJSON_GetObjectItemCaseSensitive(amf3_gpp_access_registration_modificationJSON, "ueMINTCapability");
|
||||||
if (ue_mint_capability) {
|
if (ue_mint_capability) {
|
||||||
|
@ -268,6 +277,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
|
||||||
ims_vo_ps ? ims_vo_psVariable : 0,
|
ims_vo_ps ? ims_vo_psVariable : 0,
|
||||||
backup_amf_info ? backup_amf_infoList : NULL,
|
backup_amf_info ? backup_amf_infoList : NULL,
|
||||||
eps_interworking_info ? eps_interworking_info_local_nonprim : NULL,
|
eps_interworking_info ? eps_interworking_info_local_nonprim : NULL,
|
||||||
|
ue_srvcc_capability && cJSON_IsNull(ue_srvcc_capability) ? true : false,
|
||||||
ue_srvcc_capability ? true : false,
|
ue_srvcc_capability ? true : false,
|
||||||
ue_srvcc_capability ? ue_srvcc_capability->valueint : 0,
|
ue_srvcc_capability ? ue_srvcc_capability->valueint : 0,
|
||||||
ue_mint_capability ? true : false,
|
ue_mint_capability ? true : false,
|
||||||
|
|
|
@ -30,6 +30,7 @@ typedef struct OpenAPI_amf3_gpp_access_registration_modification_s {
|
||||||
OpenAPI_ims_vo_ps_e ims_vo_ps;
|
OpenAPI_ims_vo_ps_e ims_vo_ps;
|
||||||
OpenAPI_list_t *backup_amf_info;
|
OpenAPI_list_t *backup_amf_info;
|
||||||
struct OpenAPI_eps_interworking_info_s *eps_interworking_info;
|
struct OpenAPI_eps_interworking_info_s *eps_interworking_info;
|
||||||
|
bool is_ue_srvcc_capability_null;
|
||||||
bool is_ue_srvcc_capability;
|
bool is_ue_srvcc_capability;
|
||||||
int ue_srvcc_capability;
|
int ue_srvcc_capability;
|
||||||
bool is_ue_mint_capability;
|
bool is_ue_mint_capability;
|
||||||
|
@ -44,6 +45,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg
|
||||||
OpenAPI_ims_vo_ps_e ims_vo_ps,
|
OpenAPI_ims_vo_ps_e ims_vo_ps,
|
||||||
OpenAPI_list_t *backup_amf_info,
|
OpenAPI_list_t *backup_amf_info,
|
||||||
OpenAPI_eps_interworking_info_t *eps_interworking_info,
|
OpenAPI_eps_interworking_info_t *eps_interworking_info,
|
||||||
|
bool is_ue_srvcc_capability_null,
|
||||||
bool is_ue_srvcc_capability,
|
bool is_ue_srvcc_capability,
|
||||||
int ue_srvcc_capability,
|
int ue_srvcc_capability,
|
||||||
bool is_ue_mint_capability,
|
bool is_ue_mint_capability,
|
||||||
|
|
|
@ -6,9 +6,11 @@
|
||||||
|
|
||||||
OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_data_create(
|
OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_data_create(
|
||||||
char *af_app_id,
|
char *af_app_id,
|
||||||
|
bool is_af_rout_req_null,
|
||||||
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
||||||
char *asp_id,
|
char *asp_id,
|
||||||
char *bdt_ref_id,
|
char *bdt_ref_id,
|
||||||
|
bool is_ev_subsc_null,
|
||||||
OpenAPI_events_subsc_req_data_rm_t *ev_subsc,
|
OpenAPI_events_subsc_req_data_rm_t *ev_subsc,
|
||||||
char *mcptt_id,
|
char *mcptt_id,
|
||||||
char *mc_video_id,
|
char *mc_video_id,
|
||||||
|
@ -31,9 +33,11 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
|
||||||
ogs_assert(app_session_context_update_data_local_var);
|
ogs_assert(app_session_context_update_data_local_var);
|
||||||
|
|
||||||
app_session_context_update_data_local_var->af_app_id = af_app_id;
|
app_session_context_update_data_local_var->af_app_id = af_app_id;
|
||||||
|
app_session_context_update_data_local_var->is_af_rout_req_null = is_af_rout_req_null;
|
||||||
app_session_context_update_data_local_var->af_rout_req = af_rout_req;
|
app_session_context_update_data_local_var->af_rout_req = af_rout_req;
|
||||||
app_session_context_update_data_local_var->asp_id = asp_id;
|
app_session_context_update_data_local_var->asp_id = asp_id;
|
||||||
app_session_context_update_data_local_var->bdt_ref_id = bdt_ref_id;
|
app_session_context_update_data_local_var->bdt_ref_id = bdt_ref_id;
|
||||||
|
app_session_context_update_data_local_var->is_ev_subsc_null = is_ev_subsc_null;
|
||||||
app_session_context_update_data_local_var->ev_subsc = ev_subsc;
|
app_session_context_update_data_local_var->ev_subsc = ev_subsc;
|
||||||
app_session_context_update_data_local_var->mcptt_id = mcptt_id;
|
app_session_context_update_data_local_var->mcptt_id = mcptt_id;
|
||||||
app_session_context_update_data_local_var->mc_video_id = mc_video_id;
|
app_session_context_update_data_local_var->mc_video_id = mc_video_id;
|
||||||
|
@ -162,6 +166,11 @@ cJSON *OpenAPI_app_session_context_update_data_convertToJSON(OpenAPI_app_session
|
||||||
ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed [af_rout_req]");
|
ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed [af_rout_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (app_session_context_update_data->is_af_rout_req_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "afRoutReq") == NULL) {
|
||||||
|
ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed [af_rout_req]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (app_session_context_update_data->asp_id) {
|
if (app_session_context_update_data->asp_id) {
|
||||||
|
@ -189,6 +198,11 @@ cJSON *OpenAPI_app_session_context_update_data_convertToJSON(OpenAPI_app_session
|
||||||
ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed [ev_subsc]");
|
ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed [ev_subsc]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (app_session_context_update_data->is_ev_subsc_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "evSubsc") == NULL) {
|
||||||
|
ogs_error("OpenAPI_app_session_context_update_data_convertToJSON() failed [ev_subsc]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (app_session_context_update_data->mcptt_id) {
|
if (app_session_context_update_data->mcptt_id) {
|
||||||
|
@ -396,12 +410,14 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
|
||||||
|
|
||||||
af_rout_req = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "afRoutReq");
|
af_rout_req = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "afRoutReq");
|
||||||
if (af_rout_req) {
|
if (af_rout_req) {
|
||||||
|
if (!cJSON_IsNull(af_rout_req)) {
|
||||||
af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_rm_parseFromJSON(af_rout_req);
|
af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_rm_parseFromJSON(af_rout_req);
|
||||||
if (!af_rout_req_local_nonprim) {
|
if (!af_rout_req_local_nonprim) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON failed [af_rout_req]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON failed [af_rout_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
asp_id = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "aspId");
|
asp_id = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "aspId");
|
||||||
if (asp_id) {
|
if (asp_id) {
|
||||||
|
@ -421,12 +437,14 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
|
||||||
|
|
||||||
ev_subsc = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "evSubsc");
|
ev_subsc = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "evSubsc");
|
||||||
if (ev_subsc) {
|
if (ev_subsc) {
|
||||||
|
if (!cJSON_IsNull(ev_subsc)) {
|
||||||
ev_subsc_local_nonprim = OpenAPI_events_subsc_req_data_rm_parseFromJSON(ev_subsc);
|
ev_subsc_local_nonprim = OpenAPI_events_subsc_req_data_rm_parseFromJSON(ev_subsc);
|
||||||
if (!ev_subsc_local_nonprim) {
|
if (!ev_subsc_local_nonprim) {
|
||||||
ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON failed [ev_subsc]");
|
ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON failed [ev_subsc]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mcptt_id = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "mcpttId");
|
mcptt_id = cJSON_GetObjectItemCaseSensitive(app_session_context_update_dataJSON, "mcpttId");
|
||||||
if (mcptt_id) {
|
if (mcptt_id) {
|
||||||
|
@ -592,9 +610,11 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da
|
||||||
|
|
||||||
app_session_context_update_data_local_var = OpenAPI_app_session_context_update_data_create (
|
app_session_context_update_data_local_var = OpenAPI_app_session_context_update_data_create (
|
||||||
af_app_id && !cJSON_IsNull(af_app_id) ? ogs_strdup(af_app_id->valuestring) : NULL,
|
af_app_id && !cJSON_IsNull(af_app_id) ? ogs_strdup(af_app_id->valuestring) : NULL,
|
||||||
|
af_rout_req && cJSON_IsNull(af_rout_req) ? true : false,
|
||||||
af_rout_req ? af_rout_req_local_nonprim : NULL,
|
af_rout_req ? af_rout_req_local_nonprim : NULL,
|
||||||
asp_id && !cJSON_IsNull(asp_id) ? ogs_strdup(asp_id->valuestring) : NULL,
|
asp_id && !cJSON_IsNull(asp_id) ? ogs_strdup(asp_id->valuestring) : NULL,
|
||||||
bdt_ref_id && !cJSON_IsNull(bdt_ref_id) ? ogs_strdup(bdt_ref_id->valuestring) : NULL,
|
bdt_ref_id && !cJSON_IsNull(bdt_ref_id) ? ogs_strdup(bdt_ref_id->valuestring) : NULL,
|
||||||
|
ev_subsc && cJSON_IsNull(ev_subsc) ? true : false,
|
||||||
ev_subsc ? ev_subsc_local_nonprim : NULL,
|
ev_subsc ? ev_subsc_local_nonprim : NULL,
|
||||||
mcptt_id && !cJSON_IsNull(mcptt_id) ? ogs_strdup(mcptt_id->valuestring) : NULL,
|
mcptt_id && !cJSON_IsNull(mcptt_id) ? ogs_strdup(mcptt_id->valuestring) : NULL,
|
||||||
mc_video_id && !cJSON_IsNull(mc_video_id) ? ogs_strdup(mc_video_id->valuestring) : NULL,
|
mc_video_id && !cJSON_IsNull(mc_video_id) ? ogs_strdup(mc_video_id->valuestring) : NULL,
|
||||||
|
|
|
@ -31,9 +31,11 @@ extern "C" {
|
||||||
typedef struct OpenAPI_app_session_context_update_data_s OpenAPI_app_session_context_update_data_t;
|
typedef struct OpenAPI_app_session_context_update_data_s OpenAPI_app_session_context_update_data_t;
|
||||||
typedef struct OpenAPI_app_session_context_update_data_s {
|
typedef struct OpenAPI_app_session_context_update_data_s {
|
||||||
char *af_app_id;
|
char *af_app_id;
|
||||||
|
bool is_af_rout_req_null;
|
||||||
struct OpenAPI_af_routing_requirement_rm_s *af_rout_req;
|
struct OpenAPI_af_routing_requirement_rm_s *af_rout_req;
|
||||||
char *asp_id;
|
char *asp_id;
|
||||||
char *bdt_ref_id;
|
char *bdt_ref_id;
|
||||||
|
bool is_ev_subsc_null;
|
||||||
struct OpenAPI_events_subsc_req_data_rm_s *ev_subsc;
|
struct OpenAPI_events_subsc_req_data_rm_s *ev_subsc;
|
||||||
char *mcptt_id;
|
char *mcptt_id;
|
||||||
char *mc_video_id;
|
char *mc_video_id;
|
||||||
|
@ -54,9 +56,11 @@ typedef struct OpenAPI_app_session_context_update_data_s {
|
||||||
|
|
||||||
OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_data_create(
|
OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_data_create(
|
||||||
char *af_app_id,
|
char *af_app_id,
|
||||||
|
bool is_af_rout_req_null,
|
||||||
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
||||||
char *asp_id,
|
char *asp_id,
|
||||||
char *bdt_ref_id,
|
char *bdt_ref_id,
|
||||||
|
bool is_ev_subsc_null,
|
||||||
OpenAPI_events_subsc_req_data_rm_t *ev_subsc,
|
OpenAPI_events_subsc_req_data_rm_t *ev_subsc,
|
||||||
char *mcptt_id,
|
char *mcptt_id,
|
||||||
char *mc_video_id,
|
char *mc_video_id,
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "arp.h"
|
#include "arp.h"
|
||||||
|
|
||||||
OpenAPI_arp_t *OpenAPI_arp_create(
|
OpenAPI_arp_t *OpenAPI_arp_create(
|
||||||
|
bool is_priority_level_null,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
OpenAPI_preemption_capability_e preempt_cap,
|
OpenAPI_preemption_capability_e preempt_cap,
|
||||||
OpenAPI_preemption_vulnerability_e preempt_vuln
|
OpenAPI_preemption_vulnerability_e preempt_vuln
|
||||||
|
@ -13,6 +14,7 @@ OpenAPI_arp_t *OpenAPI_arp_create(
|
||||||
OpenAPI_arp_t *arp_local_var = ogs_malloc(sizeof(OpenAPI_arp_t));
|
OpenAPI_arp_t *arp_local_var = ogs_malloc(sizeof(OpenAPI_arp_t));
|
||||||
ogs_assert(arp_local_var);
|
ogs_assert(arp_local_var);
|
||||||
|
|
||||||
|
arp_local_var->is_priority_level_null = is_priority_level_null;
|
||||||
arp_local_var->priority_level = priority_level;
|
arp_local_var->priority_level = priority_level;
|
||||||
arp_local_var->preempt_cap = preempt_cap;
|
arp_local_var->preempt_cap = preempt_cap;
|
||||||
arp_local_var->preempt_vuln = preempt_vuln;
|
arp_local_var->preempt_vuln = preempt_vuln;
|
||||||
|
@ -110,6 +112,7 @@ OpenAPI_arp_t *OpenAPI_arp_parseFromJSON(cJSON *arpJSON)
|
||||||
preempt_vulnVariable = OpenAPI_preemption_vulnerability_FromString(preempt_vuln->valuestring);
|
preempt_vulnVariable = OpenAPI_preemption_vulnerability_FromString(preempt_vuln->valuestring);
|
||||||
|
|
||||||
arp_local_var = OpenAPI_arp_create (
|
arp_local_var = OpenAPI_arp_create (
|
||||||
|
priority_level && cJSON_IsNull(priority_level) ? true : false,
|
||||||
|
|
||||||
priority_level->valuedouble,
|
priority_level->valuedouble,
|
||||||
preempt_capVariable,
|
preempt_capVariable,
|
||||||
|
|
|
@ -21,12 +21,14 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_arp_s OpenAPI_arp_t;
|
typedef struct OpenAPI_arp_s OpenAPI_arp_t;
|
||||||
typedef struct OpenAPI_arp_s {
|
typedef struct OpenAPI_arp_s {
|
||||||
|
bool is_priority_level_null;
|
||||||
int priority_level;
|
int priority_level;
|
||||||
OpenAPI_preemption_capability_e preempt_cap;
|
OpenAPI_preemption_capability_e preempt_cap;
|
||||||
OpenAPI_preemption_vulnerability_e preempt_vuln;
|
OpenAPI_preemption_vulnerability_e preempt_vuln;
|
||||||
} OpenAPI_arp_t;
|
} OpenAPI_arp_t;
|
||||||
|
|
||||||
OpenAPI_arp_t *OpenAPI_arp_create(
|
OpenAPI_arp_t *OpenAPI_arp_create(
|
||||||
|
bool is_priority_level_null,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
OpenAPI_preemption_capability_e preempt_cap,
|
OpenAPI_preemption_capability_e preempt_cap,
|
||||||
OpenAPI_preemption_vulnerability_e preempt_vuln
|
OpenAPI_preemption_vulnerability_e preempt_vuln
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "arp_1.h"
|
#include "arp_1.h"
|
||||||
|
|
||||||
OpenAPI_arp_1_t *OpenAPI_arp_1_create(
|
OpenAPI_arp_1_t *OpenAPI_arp_1_create(
|
||||||
|
bool is_priority_level_null,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
OpenAPI_preemption_capability_e preempt_cap,
|
OpenAPI_preemption_capability_e preempt_cap,
|
||||||
OpenAPI_preemption_vulnerability_e preempt_vuln
|
OpenAPI_preemption_vulnerability_e preempt_vuln
|
||||||
|
@ -13,6 +14,7 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_create(
|
||||||
OpenAPI_arp_1_t *arp_1_local_var = ogs_malloc(sizeof(OpenAPI_arp_1_t));
|
OpenAPI_arp_1_t *arp_1_local_var = ogs_malloc(sizeof(OpenAPI_arp_1_t));
|
||||||
ogs_assert(arp_1_local_var);
|
ogs_assert(arp_1_local_var);
|
||||||
|
|
||||||
|
arp_1_local_var->is_priority_level_null = is_priority_level_null;
|
||||||
arp_1_local_var->priority_level = priority_level;
|
arp_1_local_var->priority_level = priority_level;
|
||||||
arp_1_local_var->preempt_cap = preempt_cap;
|
arp_1_local_var->preempt_cap = preempt_cap;
|
||||||
arp_1_local_var->preempt_vuln = preempt_vuln;
|
arp_1_local_var->preempt_vuln = preempt_vuln;
|
||||||
|
@ -110,6 +112,7 @@ OpenAPI_arp_1_t *OpenAPI_arp_1_parseFromJSON(cJSON *arp_1JSON)
|
||||||
preempt_vulnVariable = OpenAPI_preemption_vulnerability_FromString(preempt_vuln->valuestring);
|
preempt_vulnVariable = OpenAPI_preemption_vulnerability_FromString(preempt_vuln->valuestring);
|
||||||
|
|
||||||
arp_1_local_var = OpenAPI_arp_1_create (
|
arp_1_local_var = OpenAPI_arp_1_create (
|
||||||
|
priority_level && cJSON_IsNull(priority_level) ? true : false,
|
||||||
|
|
||||||
priority_level->valuedouble,
|
priority_level->valuedouble,
|
||||||
preempt_capVariable,
|
preempt_capVariable,
|
||||||
|
|
|
@ -21,12 +21,14 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_arp_1_s OpenAPI_arp_1_t;
|
typedef struct OpenAPI_arp_1_s OpenAPI_arp_1_t;
|
||||||
typedef struct OpenAPI_arp_1_s {
|
typedef struct OpenAPI_arp_1_s {
|
||||||
|
bool is_priority_level_null;
|
||||||
int priority_level;
|
int priority_level;
|
||||||
OpenAPI_preemption_capability_e preempt_cap;
|
OpenAPI_preemption_capability_e preempt_cap;
|
||||||
OpenAPI_preemption_vulnerability_e preempt_vuln;
|
OpenAPI_preemption_vulnerability_e preempt_vuln;
|
||||||
} OpenAPI_arp_1_t;
|
} OpenAPI_arp_1_t;
|
||||||
|
|
||||||
OpenAPI_arp_1_t *OpenAPI_arp_1_create(
|
OpenAPI_arp_1_t *OpenAPI_arp_1_create(
|
||||||
|
bool is_priority_level_null,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
OpenAPI_preemption_capability_e preempt_cap,
|
OpenAPI_preemption_capability_e preempt_cap,
|
||||||
OpenAPI_preemption_vulnerability_e preempt_vuln
|
OpenAPI_preemption_vulnerability_e preempt_vuln
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
OpenAPI_as_time_distribution_param_t *OpenAPI_as_time_distribution_param_create(
|
OpenAPI_as_time_distribution_param_t *OpenAPI_as_time_distribution_param_create(
|
||||||
bool is_as_time_dist_ind,
|
bool is_as_time_dist_ind,
|
||||||
int as_time_dist_ind,
|
int as_time_dist_ind,
|
||||||
|
bool is_uu_error_budget_null,
|
||||||
bool is_uu_error_budget,
|
bool is_uu_error_budget,
|
||||||
int uu_error_budget
|
int uu_error_budget
|
||||||
)
|
)
|
||||||
|
@ -16,6 +17,7 @@ OpenAPI_as_time_distribution_param_t *OpenAPI_as_time_distribution_param_create(
|
||||||
|
|
||||||
as_time_distribution_param_local_var->is_as_time_dist_ind = is_as_time_dist_ind;
|
as_time_distribution_param_local_var->is_as_time_dist_ind = is_as_time_dist_ind;
|
||||||
as_time_distribution_param_local_var->as_time_dist_ind = as_time_dist_ind;
|
as_time_distribution_param_local_var->as_time_dist_ind = as_time_dist_ind;
|
||||||
|
as_time_distribution_param_local_var->is_uu_error_budget_null = is_uu_error_budget_null;
|
||||||
as_time_distribution_param_local_var->is_uu_error_budget = is_uu_error_budget;
|
as_time_distribution_param_local_var->is_uu_error_budget = is_uu_error_budget;
|
||||||
as_time_distribution_param_local_var->uu_error_budget = uu_error_budget;
|
as_time_distribution_param_local_var->uu_error_budget = uu_error_budget;
|
||||||
|
|
||||||
|
@ -55,6 +57,11 @@ cJSON *OpenAPI_as_time_distribution_param_convertToJSON(OpenAPI_as_time_distribu
|
||||||
ogs_error("OpenAPI_as_time_distribution_param_convertToJSON() failed [uu_error_budget]");
|
ogs_error("OpenAPI_as_time_distribution_param_convertToJSON() failed [uu_error_budget]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (as_time_distribution_param->is_uu_error_budget_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "uuErrorBudget") == NULL) {
|
||||||
|
ogs_error("OpenAPI_as_time_distribution_param_convertToJSON() failed [uu_error_budget]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -77,15 +84,18 @@ OpenAPI_as_time_distribution_param_t *OpenAPI_as_time_distribution_param_parseFr
|
||||||
|
|
||||||
uu_error_budget = cJSON_GetObjectItemCaseSensitive(as_time_distribution_paramJSON, "uuErrorBudget");
|
uu_error_budget = cJSON_GetObjectItemCaseSensitive(as_time_distribution_paramJSON, "uuErrorBudget");
|
||||||
if (uu_error_budget) {
|
if (uu_error_budget) {
|
||||||
|
if (!cJSON_IsNull(uu_error_budget)) {
|
||||||
if (!cJSON_IsNumber(uu_error_budget)) {
|
if (!cJSON_IsNumber(uu_error_budget)) {
|
||||||
ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON() failed [uu_error_budget]");
|
ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON() failed [uu_error_budget]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
as_time_distribution_param_local_var = OpenAPI_as_time_distribution_param_create (
|
as_time_distribution_param_local_var = OpenAPI_as_time_distribution_param_create (
|
||||||
as_time_dist_ind ? true : false,
|
as_time_dist_ind ? true : false,
|
||||||
as_time_dist_ind ? as_time_dist_ind->valueint : 0,
|
as_time_dist_ind ? as_time_dist_ind->valueint : 0,
|
||||||
|
uu_error_budget && cJSON_IsNull(uu_error_budget) ? true : false,
|
||||||
uu_error_budget ? true : false,
|
uu_error_budget ? true : false,
|
||||||
uu_error_budget ? uu_error_budget->valuedouble : 0
|
uu_error_budget ? uu_error_budget->valuedouble : 0
|
||||||
);
|
);
|
||||||
|
|
|
@ -21,6 +21,7 @@ typedef struct OpenAPI_as_time_distribution_param_s OpenAPI_as_time_distribution
|
||||||
typedef struct OpenAPI_as_time_distribution_param_s {
|
typedef struct OpenAPI_as_time_distribution_param_s {
|
||||||
bool is_as_time_dist_ind;
|
bool is_as_time_dist_ind;
|
||||||
int as_time_dist_ind;
|
int as_time_dist_ind;
|
||||||
|
bool is_uu_error_budget_null;
|
||||||
bool is_uu_error_budget;
|
bool is_uu_error_budget;
|
||||||
int uu_error_budget;
|
int uu_error_budget;
|
||||||
} OpenAPI_as_time_distribution_param_t;
|
} OpenAPI_as_time_distribution_param_t;
|
||||||
|
@ -28,6 +29,7 @@ typedef struct OpenAPI_as_time_distribution_param_s {
|
||||||
OpenAPI_as_time_distribution_param_t *OpenAPI_as_time_distribution_param_create(
|
OpenAPI_as_time_distribution_param_t *OpenAPI_as_time_distribution_param_create(
|
||||||
bool is_as_time_dist_ind,
|
bool is_as_time_dist_ind,
|
||||||
int as_time_dist_ind,
|
int as_time_dist_ind,
|
||||||
|
bool is_uu_error_budget_null,
|
||||||
bool is_uu_error_budget,
|
bool is_uu_error_budget,
|
||||||
int uu_error_budget
|
int uu_error_budget
|
||||||
);
|
);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
OpenAPI_atom_t *OpenAPI_atom_create(
|
OpenAPI_atom_t *OpenAPI_atom_create(
|
||||||
char *attr,
|
char *attr,
|
||||||
|
bool is_value_null,
|
||||||
OpenAPI_any_type_t *value,
|
OpenAPI_any_type_t *value,
|
||||||
bool is_negative,
|
bool is_negative,
|
||||||
int negative
|
int negative
|
||||||
|
@ -15,6 +16,7 @@ OpenAPI_atom_t *OpenAPI_atom_create(
|
||||||
ogs_assert(atom_local_var);
|
ogs_assert(atom_local_var);
|
||||||
|
|
||||||
atom_local_var->attr = attr;
|
atom_local_var->attr = attr;
|
||||||
|
atom_local_var->is_value_null = is_value_null;
|
||||||
atom_local_var->value = value;
|
atom_local_var->value = value;
|
||||||
atom_local_var->is_negative = is_negative;
|
atom_local_var->is_negative = is_negative;
|
||||||
atom_local_var->negative = negative;
|
atom_local_var->negative = negative;
|
||||||
|
@ -121,6 +123,7 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON)
|
||||||
|
|
||||||
atom_local_var = OpenAPI_atom_create (
|
atom_local_var = OpenAPI_atom_create (
|
||||||
ogs_strdup(attr->valuestring),
|
ogs_strdup(attr->valuestring),
|
||||||
|
value && cJSON_IsNull(value) ? true : false,
|
||||||
value_local_object,
|
value_local_object,
|
||||||
negative ? true : false,
|
negative ? true : false,
|
||||||
negative ? negative->valueint : 0
|
negative ? negative->valueint : 0
|
||||||
|
|
|
@ -21,6 +21,7 @@ extern "C" {
|
||||||
typedef struct OpenAPI_atom_s OpenAPI_atom_t;
|
typedef struct OpenAPI_atom_s OpenAPI_atom_t;
|
||||||
typedef struct OpenAPI_atom_s {
|
typedef struct OpenAPI_atom_s {
|
||||||
char *attr;
|
char *attr;
|
||||||
|
bool is_value_null;
|
||||||
OpenAPI_any_type_t *value;
|
OpenAPI_any_type_t *value;
|
||||||
bool is_negative;
|
bool is_negative;
|
||||||
int negative;
|
int negative;
|
||||||
|
@ -28,6 +29,7 @@ typedef struct OpenAPI_atom_s {
|
||||||
|
|
||||||
OpenAPI_atom_t *OpenAPI_atom_create(
|
OpenAPI_atom_t *OpenAPI_atom_create(
|
||||||
char *attr,
|
char *attr,
|
||||||
|
bool is_value_null,
|
||||||
OpenAPI_any_type_t *value,
|
OpenAPI_any_type_t *value,
|
||||||
bool is_negative,
|
bool is_negative,
|
||||||
int negative
|
int negative
|
||||||
|
|
|
@ -9,6 +9,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create(
|
||||||
char *serving_network_name,
|
char *serving_network_name,
|
||||||
OpenAPI_resynchronization_info_t *resynchronization_info,
|
OpenAPI_resynchronization_info_t *resynchronization_info,
|
||||||
char *pei,
|
char *pei,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
char *udm_group_id,
|
char *udm_group_id,
|
||||||
char *routing_indicator,
|
char *routing_indicator,
|
||||||
|
@ -31,6 +32,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create(
|
||||||
authentication_info_local_var->serving_network_name = serving_network_name;
|
authentication_info_local_var->serving_network_name = serving_network_name;
|
||||||
authentication_info_local_var->resynchronization_info = resynchronization_info;
|
authentication_info_local_var->resynchronization_info = resynchronization_info;
|
||||||
authentication_info_local_var->pei = pei;
|
authentication_info_local_var->pei = pei;
|
||||||
|
authentication_info_local_var->is_trace_data_null = is_trace_data_null;
|
||||||
authentication_info_local_var->trace_data = trace_data;
|
authentication_info_local_var->trace_data = trace_data;
|
||||||
authentication_info_local_var->udm_group_id = udm_group_id;
|
authentication_info_local_var->udm_group_id = udm_group_id;
|
||||||
authentication_info_local_var->routing_indicator = routing_indicator;
|
authentication_info_local_var->routing_indicator = routing_indicator;
|
||||||
|
@ -157,6 +159,11 @@ cJSON *OpenAPI_authentication_info_convertToJSON(OpenAPI_authentication_info_t *
|
||||||
ogs_error("OpenAPI_authentication_info_convertToJSON() failed [trace_data]");
|
ogs_error("OpenAPI_authentication_info_convertToJSON() failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authentication_info->is_trace_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authentication_info_convertToJSON() failed [trace_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authentication_info->udm_group_id) {
|
if (authentication_info->udm_group_id) {
|
||||||
|
@ -285,12 +292,14 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON *
|
||||||
|
|
||||||
trace_data = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "traceData");
|
trace_data = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "traceData");
|
||||||
if (trace_data) {
|
if (trace_data) {
|
||||||
|
if (!cJSON_IsNull(trace_data)) {
|
||||||
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
||||||
if (!trace_data_local_nonprim) {
|
if (!trace_data_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
udm_group_id = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "udmGroupId");
|
udm_group_id = cJSON_GetObjectItemCaseSensitive(authentication_infoJSON, "udmGroupId");
|
||||||
if (udm_group_id) {
|
if (udm_group_id) {
|
||||||
|
@ -374,6 +383,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON *
|
||||||
ogs_strdup(serving_network_name->valuestring),
|
ogs_strdup(serving_network_name->valuestring),
|
||||||
resynchronization_info ? resynchronization_info_local_nonprim : NULL,
|
resynchronization_info ? resynchronization_info_local_nonprim : NULL,
|
||||||
pei && !cJSON_IsNull(pei) ? ogs_strdup(pei->valuestring) : NULL,
|
pei && !cJSON_IsNull(pei) ? ogs_strdup(pei->valuestring) : NULL,
|
||||||
|
trace_data && cJSON_IsNull(trace_data) ? true : false,
|
||||||
trace_data ? trace_data_local_nonprim : NULL,
|
trace_data ? trace_data_local_nonprim : NULL,
|
||||||
udm_group_id && !cJSON_IsNull(udm_group_id) ? ogs_strdup(udm_group_id->valuestring) : NULL,
|
udm_group_id && !cJSON_IsNull(udm_group_id) ? ogs_strdup(udm_group_id->valuestring) : NULL,
|
||||||
routing_indicator && !cJSON_IsNull(routing_indicator) ? ogs_strdup(routing_indicator->valuestring) : NULL,
|
routing_indicator && !cJSON_IsNull(routing_indicator) ? ogs_strdup(routing_indicator->valuestring) : NULL,
|
||||||
|
|
|
@ -25,6 +25,7 @@ typedef struct OpenAPI_authentication_info_s {
|
||||||
char *serving_network_name;
|
char *serving_network_name;
|
||||||
struct OpenAPI_resynchronization_info_s *resynchronization_info;
|
struct OpenAPI_resynchronization_info_s *resynchronization_info;
|
||||||
char *pei;
|
char *pei;
|
||||||
|
bool is_trace_data_null;
|
||||||
struct OpenAPI_trace_data_s *trace_data;
|
struct OpenAPI_trace_data_s *trace_data;
|
||||||
char *udm_group_id;
|
char *udm_group_id;
|
||||||
char *routing_indicator;
|
char *routing_indicator;
|
||||||
|
@ -45,6 +46,7 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_create(
|
||||||
char *serving_network_name,
|
char *serving_network_name,
|
||||||
OpenAPI_resynchronization_info_t *resynchronization_info,
|
OpenAPI_resynchronization_info_t *resynchronization_info,
|
||||||
char *pei,
|
char *pei,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
char *udm_group_id,
|
char *udm_group_id,
|
||||||
char *routing_indicator,
|
char *routing_indicator,
|
||||||
|
|
|
@ -8,16 +8,24 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create(
|
||||||
bool is__5qi,
|
bool is__5qi,
|
||||||
int _5qi,
|
int _5qi,
|
||||||
OpenAPI_arp_t *arp,
|
OpenAPI_arp_t *arp,
|
||||||
|
bool is_priority_level_null,
|
||||||
bool is_priority_level,
|
bool is_priority_level,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
|
bool is_aver_window_null,
|
||||||
bool is_aver_window,
|
bool is_aver_window,
|
||||||
int aver_window,
|
int aver_window,
|
||||||
|
bool is_max_data_burst_vol_null,
|
||||||
bool is_max_data_burst_vol,
|
bool is_max_data_burst_vol,
|
||||||
int max_data_burst_vol,
|
int max_data_burst_vol,
|
||||||
|
bool is_maxbr_ul_null,
|
||||||
char *maxbr_ul,
|
char *maxbr_ul,
|
||||||
|
bool is_maxbr_dl_null,
|
||||||
char *maxbr_dl,
|
char *maxbr_dl,
|
||||||
|
bool is_gbr_ul_null,
|
||||||
char *gbr_ul,
|
char *gbr_ul,
|
||||||
|
bool is_gbr_dl_null,
|
||||||
char *gbr_dl,
|
char *gbr_dl,
|
||||||
|
bool is_ext_max_data_burst_vol_null,
|
||||||
bool is_ext_max_data_burst_vol,
|
bool is_ext_max_data_burst_vol,
|
||||||
int ext_max_data_burst_vol
|
int ext_max_data_burst_vol
|
||||||
)
|
)
|
||||||
|
@ -28,16 +36,24 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create(
|
||||||
authorized_default_qos_local_var->is__5qi = is__5qi;
|
authorized_default_qos_local_var->is__5qi = is__5qi;
|
||||||
authorized_default_qos_local_var->_5qi = _5qi;
|
authorized_default_qos_local_var->_5qi = _5qi;
|
||||||
authorized_default_qos_local_var->arp = arp;
|
authorized_default_qos_local_var->arp = arp;
|
||||||
|
authorized_default_qos_local_var->is_priority_level_null = is_priority_level_null;
|
||||||
authorized_default_qos_local_var->is_priority_level = is_priority_level;
|
authorized_default_qos_local_var->is_priority_level = is_priority_level;
|
||||||
authorized_default_qos_local_var->priority_level = priority_level;
|
authorized_default_qos_local_var->priority_level = priority_level;
|
||||||
|
authorized_default_qos_local_var->is_aver_window_null = is_aver_window_null;
|
||||||
authorized_default_qos_local_var->is_aver_window = is_aver_window;
|
authorized_default_qos_local_var->is_aver_window = is_aver_window;
|
||||||
authorized_default_qos_local_var->aver_window = aver_window;
|
authorized_default_qos_local_var->aver_window = aver_window;
|
||||||
|
authorized_default_qos_local_var->is_max_data_burst_vol_null = is_max_data_burst_vol_null;
|
||||||
authorized_default_qos_local_var->is_max_data_burst_vol = is_max_data_burst_vol;
|
authorized_default_qos_local_var->is_max_data_burst_vol = is_max_data_burst_vol;
|
||||||
authorized_default_qos_local_var->max_data_burst_vol = max_data_burst_vol;
|
authorized_default_qos_local_var->max_data_burst_vol = max_data_burst_vol;
|
||||||
|
authorized_default_qos_local_var->is_maxbr_ul_null = is_maxbr_ul_null;
|
||||||
authorized_default_qos_local_var->maxbr_ul = maxbr_ul;
|
authorized_default_qos_local_var->maxbr_ul = maxbr_ul;
|
||||||
|
authorized_default_qos_local_var->is_maxbr_dl_null = is_maxbr_dl_null;
|
||||||
authorized_default_qos_local_var->maxbr_dl = maxbr_dl;
|
authorized_default_qos_local_var->maxbr_dl = maxbr_dl;
|
||||||
|
authorized_default_qos_local_var->is_gbr_ul_null = is_gbr_ul_null;
|
||||||
authorized_default_qos_local_var->gbr_ul = gbr_ul;
|
authorized_default_qos_local_var->gbr_ul = gbr_ul;
|
||||||
|
authorized_default_qos_local_var->is_gbr_dl_null = is_gbr_dl_null;
|
||||||
authorized_default_qos_local_var->gbr_dl = gbr_dl;
|
authorized_default_qos_local_var->gbr_dl = gbr_dl;
|
||||||
|
authorized_default_qos_local_var->is_ext_max_data_burst_vol_null = is_ext_max_data_burst_vol_null;
|
||||||
authorized_default_qos_local_var->is_ext_max_data_burst_vol = is_ext_max_data_burst_vol;
|
authorized_default_qos_local_var->is_ext_max_data_burst_vol = is_ext_max_data_burst_vol;
|
||||||
authorized_default_qos_local_var->ext_max_data_burst_vol = ext_max_data_burst_vol;
|
authorized_default_qos_local_var->ext_max_data_burst_vol = ext_max_data_burst_vol;
|
||||||
|
|
||||||
|
@ -110,6 +126,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [priority_level]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [priority_level]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_priority_level_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "priorityLevel") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [priority_level]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->is_aver_window) {
|
if (authorized_default_qos->is_aver_window) {
|
||||||
|
@ -117,6 +138,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [aver_window]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [aver_window]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_aver_window_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "averWindow") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [aver_window]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->is_max_data_burst_vol) {
|
if (authorized_default_qos->is_max_data_burst_vol) {
|
||||||
|
@ -124,6 +150,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [max_data_burst_vol]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_max_data_burst_vol_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxDataBurstVol") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [max_data_burst_vol]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->maxbr_ul) {
|
if (authorized_default_qos->maxbr_ul) {
|
||||||
|
@ -131,6 +162,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [maxbr_ul]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [maxbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_maxbr_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxbrUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [maxbr_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->maxbr_dl) {
|
if (authorized_default_qos->maxbr_dl) {
|
||||||
|
@ -138,6 +174,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [maxbr_dl]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [maxbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_maxbr_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxbrDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [maxbr_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->gbr_ul) {
|
if (authorized_default_qos->gbr_ul) {
|
||||||
|
@ -145,6 +186,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [gbr_ul]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [gbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_gbr_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "gbrUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [gbr_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->gbr_dl) {
|
if (authorized_default_qos->gbr_dl) {
|
||||||
|
@ -152,6 +198,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [gbr_dl]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [gbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_gbr_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "gbrDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [gbr_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (authorized_default_qos->is_ext_max_data_burst_vol) {
|
if (authorized_default_qos->is_ext_max_data_burst_vol) {
|
||||||
|
@ -159,6 +210,11 @@ cJSON *OpenAPI_authorized_default_qos_convertToJSON(OpenAPI_authorized_default_q
|
||||||
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [ext_max_data_burst_vol]");
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [ext_max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (authorized_default_qos->is_ext_max_data_burst_vol_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "extMaxDataBurstVol") == NULL) {
|
||||||
|
ogs_error("OpenAPI_authorized_default_qos_convertToJSON() failed [ext_max_data_burst_vol]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -199,82 +255,106 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_parseFromJSON(c
|
||||||
|
|
||||||
priority_level = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "priorityLevel");
|
priority_level = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "priorityLevel");
|
||||||
if (priority_level) {
|
if (priority_level) {
|
||||||
|
if (!cJSON_IsNull(priority_level)) {
|
||||||
if (!cJSON_IsNumber(priority_level)) {
|
if (!cJSON_IsNumber(priority_level)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [priority_level]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [priority_level]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
aver_window = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "averWindow");
|
aver_window = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "averWindow");
|
||||||
if (aver_window) {
|
if (aver_window) {
|
||||||
|
if (!cJSON_IsNull(aver_window)) {
|
||||||
if (!cJSON_IsNumber(aver_window)) {
|
if (!cJSON_IsNumber(aver_window)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [aver_window]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [aver_window]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "maxDataBurstVol");
|
max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "maxDataBurstVol");
|
||||||
if (max_data_burst_vol) {
|
if (max_data_burst_vol) {
|
||||||
|
if (!cJSON_IsNull(max_data_burst_vol)) {
|
||||||
if (!cJSON_IsNumber(max_data_burst_vol)) {
|
if (!cJSON_IsNumber(max_data_burst_vol)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [max_data_burst_vol]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
maxbr_ul = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "maxbrUl");
|
maxbr_ul = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "maxbrUl");
|
||||||
if (maxbr_ul) {
|
if (maxbr_ul) {
|
||||||
|
if (!cJSON_IsNull(maxbr_ul)) {
|
||||||
if (!cJSON_IsString(maxbr_ul) && !cJSON_IsNull(maxbr_ul)) {
|
if (!cJSON_IsString(maxbr_ul) && !cJSON_IsNull(maxbr_ul)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [maxbr_ul]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [maxbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
maxbr_dl = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "maxbrDl");
|
maxbr_dl = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "maxbrDl");
|
||||||
if (maxbr_dl) {
|
if (maxbr_dl) {
|
||||||
|
if (!cJSON_IsNull(maxbr_dl)) {
|
||||||
if (!cJSON_IsString(maxbr_dl) && !cJSON_IsNull(maxbr_dl)) {
|
if (!cJSON_IsString(maxbr_dl) && !cJSON_IsNull(maxbr_dl)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [maxbr_dl]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [maxbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
gbr_ul = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "gbrUl");
|
gbr_ul = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "gbrUl");
|
||||||
if (gbr_ul) {
|
if (gbr_ul) {
|
||||||
|
if (!cJSON_IsNull(gbr_ul)) {
|
||||||
if (!cJSON_IsString(gbr_ul) && !cJSON_IsNull(gbr_ul)) {
|
if (!cJSON_IsString(gbr_ul) && !cJSON_IsNull(gbr_ul)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [gbr_ul]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [gbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
gbr_dl = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "gbrDl");
|
gbr_dl = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "gbrDl");
|
||||||
if (gbr_dl) {
|
if (gbr_dl) {
|
||||||
|
if (!cJSON_IsNull(gbr_dl)) {
|
||||||
if (!cJSON_IsString(gbr_dl) && !cJSON_IsNull(gbr_dl)) {
|
if (!cJSON_IsString(gbr_dl) && !cJSON_IsNull(gbr_dl)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [gbr_dl]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [gbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ext_max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "extMaxDataBurstVol");
|
ext_max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(authorized_default_qosJSON, "extMaxDataBurstVol");
|
||||||
if (ext_max_data_burst_vol) {
|
if (ext_max_data_burst_vol) {
|
||||||
|
if (!cJSON_IsNull(ext_max_data_burst_vol)) {
|
||||||
if (!cJSON_IsNumber(ext_max_data_burst_vol)) {
|
if (!cJSON_IsNumber(ext_max_data_burst_vol)) {
|
||||||
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [ext_max_data_burst_vol]");
|
ogs_error("OpenAPI_authorized_default_qos_parseFromJSON() failed [ext_max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
authorized_default_qos_local_var = OpenAPI_authorized_default_qos_create (
|
authorized_default_qos_local_var = OpenAPI_authorized_default_qos_create (
|
||||||
_5qi ? true : false,
|
_5qi ? true : false,
|
||||||
_5qi ? _5qi->valuedouble : 0,
|
_5qi ? _5qi->valuedouble : 0,
|
||||||
arp ? arp_local_nonprim : NULL,
|
arp ? arp_local_nonprim : NULL,
|
||||||
|
priority_level && cJSON_IsNull(priority_level) ? true : false,
|
||||||
priority_level ? true : false,
|
priority_level ? true : false,
|
||||||
priority_level ? priority_level->valuedouble : 0,
|
priority_level ? priority_level->valuedouble : 0,
|
||||||
|
aver_window && cJSON_IsNull(aver_window) ? true : false,
|
||||||
aver_window ? true : false,
|
aver_window ? true : false,
|
||||||
aver_window ? aver_window->valuedouble : 0,
|
aver_window ? aver_window->valuedouble : 0,
|
||||||
|
max_data_burst_vol && cJSON_IsNull(max_data_burst_vol) ? true : false,
|
||||||
max_data_burst_vol ? true : false,
|
max_data_burst_vol ? true : false,
|
||||||
max_data_burst_vol ? max_data_burst_vol->valuedouble : 0,
|
max_data_burst_vol ? max_data_burst_vol->valuedouble : 0,
|
||||||
|
maxbr_ul && cJSON_IsNull(maxbr_ul) ? true : false,
|
||||||
maxbr_ul && !cJSON_IsNull(maxbr_ul) ? ogs_strdup(maxbr_ul->valuestring) : NULL,
|
maxbr_ul && !cJSON_IsNull(maxbr_ul) ? ogs_strdup(maxbr_ul->valuestring) : NULL,
|
||||||
|
maxbr_dl && cJSON_IsNull(maxbr_dl) ? true : false,
|
||||||
maxbr_dl && !cJSON_IsNull(maxbr_dl) ? ogs_strdup(maxbr_dl->valuestring) : NULL,
|
maxbr_dl && !cJSON_IsNull(maxbr_dl) ? ogs_strdup(maxbr_dl->valuestring) : NULL,
|
||||||
|
gbr_ul && cJSON_IsNull(gbr_ul) ? true : false,
|
||||||
gbr_ul && !cJSON_IsNull(gbr_ul) ? ogs_strdup(gbr_ul->valuestring) : NULL,
|
gbr_ul && !cJSON_IsNull(gbr_ul) ? ogs_strdup(gbr_ul->valuestring) : NULL,
|
||||||
|
gbr_dl && cJSON_IsNull(gbr_dl) ? true : false,
|
||||||
gbr_dl && !cJSON_IsNull(gbr_dl) ? ogs_strdup(gbr_dl->valuestring) : NULL,
|
gbr_dl && !cJSON_IsNull(gbr_dl) ? ogs_strdup(gbr_dl->valuestring) : NULL,
|
||||||
|
ext_max_data_burst_vol && cJSON_IsNull(ext_max_data_burst_vol) ? true : false,
|
||||||
ext_max_data_burst_vol ? true : false,
|
ext_max_data_burst_vol ? true : false,
|
||||||
ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0
|
ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0
|
||||||
);
|
);
|
||||||
|
|
|
@ -23,16 +23,24 @@ typedef struct OpenAPI_authorized_default_qos_s {
|
||||||
bool is__5qi;
|
bool is__5qi;
|
||||||
int _5qi;
|
int _5qi;
|
||||||
struct OpenAPI_arp_s *arp;
|
struct OpenAPI_arp_s *arp;
|
||||||
|
bool is_priority_level_null;
|
||||||
bool is_priority_level;
|
bool is_priority_level;
|
||||||
int priority_level;
|
int priority_level;
|
||||||
|
bool is_aver_window_null;
|
||||||
bool is_aver_window;
|
bool is_aver_window;
|
||||||
int aver_window;
|
int aver_window;
|
||||||
|
bool is_max_data_burst_vol_null;
|
||||||
bool is_max_data_burst_vol;
|
bool is_max_data_burst_vol;
|
||||||
int max_data_burst_vol;
|
int max_data_burst_vol;
|
||||||
|
bool is_maxbr_ul_null;
|
||||||
char *maxbr_ul;
|
char *maxbr_ul;
|
||||||
|
bool is_maxbr_dl_null;
|
||||||
char *maxbr_dl;
|
char *maxbr_dl;
|
||||||
|
bool is_gbr_ul_null;
|
||||||
char *gbr_ul;
|
char *gbr_ul;
|
||||||
|
bool is_gbr_dl_null;
|
||||||
char *gbr_dl;
|
char *gbr_dl;
|
||||||
|
bool is_ext_max_data_burst_vol_null;
|
||||||
bool is_ext_max_data_burst_vol;
|
bool is_ext_max_data_burst_vol;
|
||||||
int ext_max_data_burst_vol;
|
int ext_max_data_burst_vol;
|
||||||
} OpenAPI_authorized_default_qos_t;
|
} OpenAPI_authorized_default_qos_t;
|
||||||
|
@ -41,16 +49,24 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_create(
|
||||||
bool is__5qi,
|
bool is__5qi,
|
||||||
int _5qi,
|
int _5qi,
|
||||||
OpenAPI_arp_t *arp,
|
OpenAPI_arp_t *arp,
|
||||||
|
bool is_priority_level_null,
|
||||||
bool is_priority_level,
|
bool is_priority_level,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
|
bool is_aver_window_null,
|
||||||
bool is_aver_window,
|
bool is_aver_window,
|
||||||
int aver_window,
|
int aver_window,
|
||||||
|
bool is_max_data_burst_vol_null,
|
||||||
bool is_max_data_burst_vol,
|
bool is_max_data_burst_vol,
|
||||||
int max_data_burst_vol,
|
int max_data_burst_vol,
|
||||||
|
bool is_maxbr_ul_null,
|
||||||
char *maxbr_ul,
|
char *maxbr_ul,
|
||||||
|
bool is_maxbr_dl_null,
|
||||||
char *maxbr_dl,
|
char *maxbr_dl,
|
||||||
|
bool is_gbr_ul_null,
|
||||||
char *gbr_ul,
|
char *gbr_ul,
|
||||||
|
bool is_gbr_dl_null,
|
||||||
char *gbr_dl,
|
char *gbr_dl,
|
||||||
|
bool is_ext_max_data_burst_vol_null,
|
||||||
bool is_ext_max_data_burst_vol,
|
bool is_ext_max_data_burst_vol,
|
||||||
int ext_max_data_burst_vol
|
int ext_max_data_burst_vol
|
||||||
);
|
);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_create(
|
OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_create(
|
||||||
OpenAPI_snssai_t *snssai,
|
OpenAPI_snssai_t *snssai,
|
||||||
|
bool is_dnns_null,
|
||||||
OpenAPI_list_t *dnns
|
OpenAPI_list_t *dnns
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -13,6 +14,7 @@ OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_create(
|
||||||
ogs_assert(candidate_for_replacement_local_var);
|
ogs_assert(candidate_for_replacement_local_var);
|
||||||
|
|
||||||
candidate_for_replacement_local_var->snssai = snssai;
|
candidate_for_replacement_local_var->snssai = snssai;
|
||||||
|
candidate_for_replacement_local_var->is_dnns_null = is_dnns_null;
|
||||||
candidate_for_replacement_local_var->dnns = dnns;
|
candidate_for_replacement_local_var->dnns = dnns;
|
||||||
|
|
||||||
return candidate_for_replacement_local_var;
|
return candidate_for_replacement_local_var;
|
||||||
|
@ -77,6 +79,11 @@ cJSON *OpenAPI_candidate_for_replacement_convertToJSON(OpenAPI_candidate_for_rep
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (candidate_for_replacement->is_dnns_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "dnns") == NULL) {
|
||||||
|
ogs_error("OpenAPI_candidate_for_replacement_convertToJSON() failed [dnns]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -104,6 +111,7 @@ OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_parseFrom
|
||||||
|
|
||||||
dnns = cJSON_GetObjectItemCaseSensitive(candidate_for_replacementJSON, "dnns");
|
dnns = cJSON_GetObjectItemCaseSensitive(candidate_for_replacementJSON, "dnns");
|
||||||
if (dnns) {
|
if (dnns) {
|
||||||
|
if (!cJSON_IsNull(dnns)) {
|
||||||
cJSON *dnns_local = NULL;
|
cJSON *dnns_local = NULL;
|
||||||
if (!cJSON_IsArray(dnns)) {
|
if (!cJSON_IsArray(dnns)) {
|
||||||
ogs_error("OpenAPI_candidate_for_replacement_parseFromJSON() failed [dnns]");
|
ogs_error("OpenAPI_candidate_for_replacement_parseFromJSON() failed [dnns]");
|
||||||
|
@ -122,9 +130,11 @@ OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_parseFrom
|
||||||
OpenAPI_list_add(dnnsList, ogs_strdup(dnns_local->valuestring));
|
OpenAPI_list_add(dnnsList, ogs_strdup(dnns_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
candidate_for_replacement_local_var = OpenAPI_candidate_for_replacement_create (
|
candidate_for_replacement_local_var = OpenAPI_candidate_for_replacement_create (
|
||||||
snssai_local_nonprim,
|
snssai_local_nonprim,
|
||||||
|
dnns && cJSON_IsNull(dnns) ? true : false,
|
||||||
dnns ? dnnsList : NULL
|
dnns ? dnnsList : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -21,11 +21,13 @@ extern "C" {
|
||||||
typedef struct OpenAPI_candidate_for_replacement_s OpenAPI_candidate_for_replacement_t;
|
typedef struct OpenAPI_candidate_for_replacement_s OpenAPI_candidate_for_replacement_t;
|
||||||
typedef struct OpenAPI_candidate_for_replacement_s {
|
typedef struct OpenAPI_candidate_for_replacement_s {
|
||||||
struct OpenAPI_snssai_s *snssai;
|
struct OpenAPI_snssai_s *snssai;
|
||||||
|
bool is_dnns_null;
|
||||||
OpenAPI_list_t *dnns;
|
OpenAPI_list_t *dnns;
|
||||||
} OpenAPI_candidate_for_replacement_t;
|
} OpenAPI_candidate_for_replacement_t;
|
||||||
|
|
||||||
OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_create(
|
OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_create(
|
||||||
OpenAPI_snssai_t *snssai,
|
OpenAPI_snssai_t *snssai,
|
||||||
|
bool is_dnns_null,
|
||||||
OpenAPI_list_t *dnns
|
OpenAPI_list_t *dnns
|
||||||
);
|
);
|
||||||
void OpenAPI_candidate_for_replacement_free(OpenAPI_candidate_for_replacement_t *candidate_for_replacement);
|
void OpenAPI_candidate_for_replacement_free(OpenAPI_candidate_for_replacement_t *candidate_for_replacement);
|
||||||
|
|
|
@ -8,7 +8,9 @@ OpenAPI_change_item_t *OpenAPI_change_item_create(
|
||||||
OpenAPI_change_type_e op,
|
OpenAPI_change_type_e op,
|
||||||
char *path,
|
char *path,
|
||||||
char *from,
|
char *from,
|
||||||
|
bool is_orig_value_null,
|
||||||
OpenAPI_any_type_t *orig_value,
|
OpenAPI_any_type_t *orig_value,
|
||||||
|
bool is_new_value_null,
|
||||||
OpenAPI_any_type_t *new_value
|
OpenAPI_any_type_t *new_value
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -18,7 +20,9 @@ OpenAPI_change_item_t *OpenAPI_change_item_create(
|
||||||
change_item_local_var->op = op;
|
change_item_local_var->op = op;
|
||||||
change_item_local_var->path = path;
|
change_item_local_var->path = path;
|
||||||
change_item_local_var->from = from;
|
change_item_local_var->from = from;
|
||||||
|
change_item_local_var->is_orig_value_null = is_orig_value_null;
|
||||||
change_item_local_var->orig_value = orig_value;
|
change_item_local_var->orig_value = orig_value;
|
||||||
|
change_item_local_var->is_new_value_null = is_new_value_null;
|
||||||
change_item_local_var->new_value = new_value;
|
change_item_local_var->new_value = new_value;
|
||||||
|
|
||||||
return change_item_local_var;
|
return change_item_local_var;
|
||||||
|
@ -97,6 +101,11 @@ cJSON *OpenAPI_change_item_convertToJSON(OpenAPI_change_item_t *change_item)
|
||||||
ogs_error("OpenAPI_change_item_convertToJSON() failed [orig_value]");
|
ogs_error("OpenAPI_change_item_convertToJSON() failed [orig_value]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (change_item->is_orig_value_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "origValue") == NULL) {
|
||||||
|
ogs_error("OpenAPI_change_item_convertToJSON() failed [orig_value]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (change_item->new_value) {
|
if (change_item->new_value) {
|
||||||
|
@ -110,6 +119,11 @@ cJSON *OpenAPI_change_item_convertToJSON(OpenAPI_change_item_t *change_item)
|
||||||
ogs_error("OpenAPI_change_item_convertToJSON() failed [new_value]");
|
ogs_error("OpenAPI_change_item_convertToJSON() failed [new_value]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (change_item->is_new_value_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "newValue") == NULL) {
|
||||||
|
ogs_error("OpenAPI_change_item_convertToJSON() failed [new_value]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -159,19 +173,25 @@ OpenAPI_change_item_t *OpenAPI_change_item_parseFromJSON(cJSON *change_itemJSON)
|
||||||
|
|
||||||
orig_value = cJSON_GetObjectItemCaseSensitive(change_itemJSON, "origValue");
|
orig_value = cJSON_GetObjectItemCaseSensitive(change_itemJSON, "origValue");
|
||||||
if (orig_value) {
|
if (orig_value) {
|
||||||
|
if (!cJSON_IsNull(orig_value)) {
|
||||||
orig_value_local_object = OpenAPI_any_type_parseFromJSON(orig_value);
|
orig_value_local_object = OpenAPI_any_type_parseFromJSON(orig_value);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
new_value = cJSON_GetObjectItemCaseSensitive(change_itemJSON, "newValue");
|
new_value = cJSON_GetObjectItemCaseSensitive(change_itemJSON, "newValue");
|
||||||
if (new_value) {
|
if (new_value) {
|
||||||
|
if (!cJSON_IsNull(new_value)) {
|
||||||
new_value_local_object = OpenAPI_any_type_parseFromJSON(new_value);
|
new_value_local_object = OpenAPI_any_type_parseFromJSON(new_value);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
change_item_local_var = OpenAPI_change_item_create (
|
change_item_local_var = OpenAPI_change_item_create (
|
||||||
opVariable,
|
opVariable,
|
||||||
ogs_strdup(path->valuestring),
|
ogs_strdup(path->valuestring),
|
||||||
from && !cJSON_IsNull(from) ? ogs_strdup(from->valuestring) : NULL,
|
from && !cJSON_IsNull(from) ? ogs_strdup(from->valuestring) : NULL,
|
||||||
|
orig_value && cJSON_IsNull(orig_value) ? true : false,
|
||||||
orig_value ? orig_value_local_object : NULL,
|
orig_value ? orig_value_local_object : NULL,
|
||||||
|
new_value && cJSON_IsNull(new_value) ? true : false,
|
||||||
new_value ? new_value_local_object : NULL
|
new_value ? new_value_local_object : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,9 @@ typedef struct OpenAPI_change_item_s {
|
||||||
OpenAPI_change_type_e op;
|
OpenAPI_change_type_e op;
|
||||||
char *path;
|
char *path;
|
||||||
char *from;
|
char *from;
|
||||||
|
bool is_orig_value_null;
|
||||||
OpenAPI_any_type_t *orig_value;
|
OpenAPI_any_type_t *orig_value;
|
||||||
|
bool is_new_value_null;
|
||||||
OpenAPI_any_type_t *new_value;
|
OpenAPI_any_type_t *new_value;
|
||||||
} OpenAPI_change_item_t;
|
} OpenAPI_change_item_t;
|
||||||
|
|
||||||
|
@ -32,7 +34,9 @@ OpenAPI_change_item_t *OpenAPI_change_item_create(
|
||||||
OpenAPI_change_type_e op,
|
OpenAPI_change_type_e op,
|
||||||
char *path,
|
char *path,
|
||||||
char *from,
|
char *from,
|
||||||
|
bool is_orig_value_null,
|
||||||
OpenAPI_any_type_t *orig_value,
|
OpenAPI_any_type_t *orig_value,
|
||||||
|
bool is_new_value_null,
|
||||||
OpenAPI_any_type_t *new_value
|
OpenAPI_any_type_t *new_value
|
||||||
);
|
);
|
||||||
void OpenAPI_change_item_free(OpenAPI_change_item_t *change_item);
|
void OpenAPI_change_item_free(OpenAPI_change_item_t *change_item);
|
||||||
|
|
|
@ -5,24 +5,36 @@
|
||||||
#include "communication_characteristics.h"
|
#include "communication_characteristics.h"
|
||||||
|
|
||||||
OpenAPI_communication_characteristics_t *OpenAPI_communication_characteristics_create(
|
OpenAPI_communication_characteristics_t *OpenAPI_communication_characteristics_create(
|
||||||
|
bool is_pp_subs_reg_timer_null,
|
||||||
OpenAPI_pp_subs_reg_timer_t *pp_subs_reg_timer,
|
OpenAPI_pp_subs_reg_timer_t *pp_subs_reg_timer,
|
||||||
|
bool is_pp_active_time_null,
|
||||||
OpenAPI_pp_active_time_t *pp_active_time,
|
OpenAPI_pp_active_time_t *pp_active_time,
|
||||||
|
bool is_pp_dl_packet_count_null,
|
||||||
bool is_pp_dl_packet_count,
|
bool is_pp_dl_packet_count,
|
||||||
int pp_dl_packet_count,
|
int pp_dl_packet_count,
|
||||||
|
bool is_pp_dl_packet_count_ext_null,
|
||||||
OpenAPI_pp_dl_packet_count_ext_t *pp_dl_packet_count_ext,
|
OpenAPI_pp_dl_packet_count_ext_t *pp_dl_packet_count_ext,
|
||||||
|
bool is_pp_maximum_response_time_null,
|
||||||
OpenAPI_pp_maximum_response_time_t *pp_maximum_response_time,
|
OpenAPI_pp_maximum_response_time_t *pp_maximum_response_time,
|
||||||
|
bool is_pp_maximum_latency_null,
|
||||||
OpenAPI_pp_maximum_latency_t *pp_maximum_latency
|
OpenAPI_pp_maximum_latency_t *pp_maximum_latency
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
OpenAPI_communication_characteristics_t *communication_characteristics_local_var = ogs_malloc(sizeof(OpenAPI_communication_characteristics_t));
|
OpenAPI_communication_characteristics_t *communication_characteristics_local_var = ogs_malloc(sizeof(OpenAPI_communication_characteristics_t));
|
||||||
ogs_assert(communication_characteristics_local_var);
|
ogs_assert(communication_characteristics_local_var);
|
||||||
|
|
||||||
|
communication_characteristics_local_var->is_pp_subs_reg_timer_null = is_pp_subs_reg_timer_null;
|
||||||
communication_characteristics_local_var->pp_subs_reg_timer = pp_subs_reg_timer;
|
communication_characteristics_local_var->pp_subs_reg_timer = pp_subs_reg_timer;
|
||||||
|
communication_characteristics_local_var->is_pp_active_time_null = is_pp_active_time_null;
|
||||||
communication_characteristics_local_var->pp_active_time = pp_active_time;
|
communication_characteristics_local_var->pp_active_time = pp_active_time;
|
||||||
|
communication_characteristics_local_var->is_pp_dl_packet_count_null = is_pp_dl_packet_count_null;
|
||||||
communication_characteristics_local_var->is_pp_dl_packet_count = is_pp_dl_packet_count;
|
communication_characteristics_local_var->is_pp_dl_packet_count = is_pp_dl_packet_count;
|
||||||
communication_characteristics_local_var->pp_dl_packet_count = pp_dl_packet_count;
|
communication_characteristics_local_var->pp_dl_packet_count = pp_dl_packet_count;
|
||||||
|
communication_characteristics_local_var->is_pp_dl_packet_count_ext_null = is_pp_dl_packet_count_ext_null;
|
||||||
communication_characteristics_local_var->pp_dl_packet_count_ext = pp_dl_packet_count_ext;
|
communication_characteristics_local_var->pp_dl_packet_count_ext = pp_dl_packet_count_ext;
|
||||||
|
communication_characteristics_local_var->is_pp_maximum_response_time_null = is_pp_maximum_response_time_null;
|
||||||
communication_characteristics_local_var->pp_maximum_response_time = pp_maximum_response_time;
|
communication_characteristics_local_var->pp_maximum_response_time = pp_maximum_response_time;
|
||||||
|
communication_characteristics_local_var->is_pp_maximum_latency_null = is_pp_maximum_latency_null;
|
||||||
communication_characteristics_local_var->pp_maximum_latency = pp_maximum_latency;
|
communication_characteristics_local_var->pp_maximum_latency = pp_maximum_latency;
|
||||||
|
|
||||||
return communication_characteristics_local_var;
|
return communication_characteristics_local_var;
|
||||||
|
@ -80,6 +92,11 @@ cJSON *OpenAPI_communication_characteristics_convertToJSON(OpenAPI_communication
|
||||||
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_subs_reg_timer]");
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_subs_reg_timer]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics->is_pp_subs_reg_timer_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppSubsRegTimer") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_subs_reg_timer]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (communication_characteristics->pp_active_time) {
|
if (communication_characteristics->pp_active_time) {
|
||||||
|
@ -93,6 +110,11 @@ cJSON *OpenAPI_communication_characteristics_convertToJSON(OpenAPI_communication
|
||||||
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_active_time]");
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_active_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics->is_pp_active_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppActiveTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_active_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (communication_characteristics->is_pp_dl_packet_count) {
|
if (communication_characteristics->is_pp_dl_packet_count) {
|
||||||
|
@ -100,6 +122,11 @@ cJSON *OpenAPI_communication_characteristics_convertToJSON(OpenAPI_communication
|
||||||
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_dl_packet_count]");
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_dl_packet_count]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics->is_pp_dl_packet_count_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppDlPacketCount") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_dl_packet_count]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (communication_characteristics->pp_dl_packet_count_ext) {
|
if (communication_characteristics->pp_dl_packet_count_ext) {
|
||||||
|
@ -113,6 +140,11 @@ cJSON *OpenAPI_communication_characteristics_convertToJSON(OpenAPI_communication
|
||||||
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_dl_packet_count_ext]");
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_dl_packet_count_ext]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics->is_pp_dl_packet_count_ext_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppDlPacketCountExt") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_dl_packet_count_ext]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (communication_characteristics->pp_maximum_response_time) {
|
if (communication_characteristics->pp_maximum_response_time) {
|
||||||
|
@ -126,6 +158,11 @@ cJSON *OpenAPI_communication_characteristics_convertToJSON(OpenAPI_communication
|
||||||
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_maximum_response_time]");
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_maximum_response_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics->is_pp_maximum_response_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppMaximumResponseTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_maximum_response_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (communication_characteristics->pp_maximum_latency) {
|
if (communication_characteristics->pp_maximum_latency) {
|
||||||
|
@ -139,6 +176,11 @@ cJSON *OpenAPI_communication_characteristics_convertToJSON(OpenAPI_communication
|
||||||
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_maximum_latency]");
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_maximum_latency]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics->is_pp_maximum_latency_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppMaximumLatency") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_convertToJSON() failed [pp_maximum_latency]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -162,64 +204,82 @@ OpenAPI_communication_characteristics_t *OpenAPI_communication_characteristics_p
|
||||||
OpenAPI_pp_maximum_latency_t *pp_maximum_latency_local_nonprim = NULL;
|
OpenAPI_pp_maximum_latency_t *pp_maximum_latency_local_nonprim = NULL;
|
||||||
pp_subs_reg_timer = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppSubsRegTimer");
|
pp_subs_reg_timer = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppSubsRegTimer");
|
||||||
if (pp_subs_reg_timer) {
|
if (pp_subs_reg_timer) {
|
||||||
|
if (!cJSON_IsNull(pp_subs_reg_timer)) {
|
||||||
pp_subs_reg_timer_local_nonprim = OpenAPI_pp_subs_reg_timer_parseFromJSON(pp_subs_reg_timer);
|
pp_subs_reg_timer_local_nonprim = OpenAPI_pp_subs_reg_timer_parseFromJSON(pp_subs_reg_timer);
|
||||||
if (!pp_subs_reg_timer_local_nonprim) {
|
if (!pp_subs_reg_timer_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pp_subs_reg_timer_parseFromJSON failed [pp_subs_reg_timer]");
|
ogs_error("OpenAPI_pp_subs_reg_timer_parseFromJSON failed [pp_subs_reg_timer]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_active_time = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppActiveTime");
|
pp_active_time = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppActiveTime");
|
||||||
if (pp_active_time) {
|
if (pp_active_time) {
|
||||||
|
if (!cJSON_IsNull(pp_active_time)) {
|
||||||
pp_active_time_local_nonprim = OpenAPI_pp_active_time_parseFromJSON(pp_active_time);
|
pp_active_time_local_nonprim = OpenAPI_pp_active_time_parseFromJSON(pp_active_time);
|
||||||
if (!pp_active_time_local_nonprim) {
|
if (!pp_active_time_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pp_active_time_parseFromJSON failed [pp_active_time]");
|
ogs_error("OpenAPI_pp_active_time_parseFromJSON failed [pp_active_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_dl_packet_count = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppDlPacketCount");
|
pp_dl_packet_count = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppDlPacketCount");
|
||||||
if (pp_dl_packet_count) {
|
if (pp_dl_packet_count) {
|
||||||
|
if (!cJSON_IsNull(pp_dl_packet_count)) {
|
||||||
if (!cJSON_IsNumber(pp_dl_packet_count)) {
|
if (!cJSON_IsNumber(pp_dl_packet_count)) {
|
||||||
ogs_error("OpenAPI_communication_characteristics_parseFromJSON() failed [pp_dl_packet_count]");
|
ogs_error("OpenAPI_communication_characteristics_parseFromJSON() failed [pp_dl_packet_count]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_dl_packet_count_ext = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppDlPacketCountExt");
|
pp_dl_packet_count_ext = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppDlPacketCountExt");
|
||||||
if (pp_dl_packet_count_ext) {
|
if (pp_dl_packet_count_ext) {
|
||||||
|
if (!cJSON_IsNull(pp_dl_packet_count_ext)) {
|
||||||
pp_dl_packet_count_ext_local_nonprim = OpenAPI_pp_dl_packet_count_ext_parseFromJSON(pp_dl_packet_count_ext);
|
pp_dl_packet_count_ext_local_nonprim = OpenAPI_pp_dl_packet_count_ext_parseFromJSON(pp_dl_packet_count_ext);
|
||||||
if (!pp_dl_packet_count_ext_local_nonprim) {
|
if (!pp_dl_packet_count_ext_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pp_dl_packet_count_ext_parseFromJSON failed [pp_dl_packet_count_ext]");
|
ogs_error("OpenAPI_pp_dl_packet_count_ext_parseFromJSON failed [pp_dl_packet_count_ext]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_maximum_response_time = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppMaximumResponseTime");
|
pp_maximum_response_time = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppMaximumResponseTime");
|
||||||
if (pp_maximum_response_time) {
|
if (pp_maximum_response_time) {
|
||||||
|
if (!cJSON_IsNull(pp_maximum_response_time)) {
|
||||||
pp_maximum_response_time_local_nonprim = OpenAPI_pp_maximum_response_time_parseFromJSON(pp_maximum_response_time);
|
pp_maximum_response_time_local_nonprim = OpenAPI_pp_maximum_response_time_parseFromJSON(pp_maximum_response_time);
|
||||||
if (!pp_maximum_response_time_local_nonprim) {
|
if (!pp_maximum_response_time_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pp_maximum_response_time_parseFromJSON failed [pp_maximum_response_time]");
|
ogs_error("OpenAPI_pp_maximum_response_time_parseFromJSON failed [pp_maximum_response_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_maximum_latency = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppMaximumLatency");
|
pp_maximum_latency = cJSON_GetObjectItemCaseSensitive(communication_characteristicsJSON, "ppMaximumLatency");
|
||||||
if (pp_maximum_latency) {
|
if (pp_maximum_latency) {
|
||||||
|
if (!cJSON_IsNull(pp_maximum_latency)) {
|
||||||
pp_maximum_latency_local_nonprim = OpenAPI_pp_maximum_latency_parseFromJSON(pp_maximum_latency);
|
pp_maximum_latency_local_nonprim = OpenAPI_pp_maximum_latency_parseFromJSON(pp_maximum_latency);
|
||||||
if (!pp_maximum_latency_local_nonprim) {
|
if (!pp_maximum_latency_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pp_maximum_latency_parseFromJSON failed [pp_maximum_latency]");
|
ogs_error("OpenAPI_pp_maximum_latency_parseFromJSON failed [pp_maximum_latency]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
communication_characteristics_local_var = OpenAPI_communication_characteristics_create (
|
communication_characteristics_local_var = OpenAPI_communication_characteristics_create (
|
||||||
|
pp_subs_reg_timer && cJSON_IsNull(pp_subs_reg_timer) ? true : false,
|
||||||
pp_subs_reg_timer ? pp_subs_reg_timer_local_nonprim : NULL,
|
pp_subs_reg_timer ? pp_subs_reg_timer_local_nonprim : NULL,
|
||||||
|
pp_active_time && cJSON_IsNull(pp_active_time) ? true : false,
|
||||||
pp_active_time ? pp_active_time_local_nonprim : NULL,
|
pp_active_time ? pp_active_time_local_nonprim : NULL,
|
||||||
|
pp_dl_packet_count && cJSON_IsNull(pp_dl_packet_count) ? true : false,
|
||||||
pp_dl_packet_count ? true : false,
|
pp_dl_packet_count ? true : false,
|
||||||
pp_dl_packet_count ? pp_dl_packet_count->valuedouble : 0,
|
pp_dl_packet_count ? pp_dl_packet_count->valuedouble : 0,
|
||||||
|
pp_dl_packet_count_ext && cJSON_IsNull(pp_dl_packet_count_ext) ? true : false,
|
||||||
pp_dl_packet_count_ext ? pp_dl_packet_count_ext_local_nonprim : NULL,
|
pp_dl_packet_count_ext ? pp_dl_packet_count_ext_local_nonprim : NULL,
|
||||||
|
pp_maximum_response_time && cJSON_IsNull(pp_maximum_response_time) ? true : false,
|
||||||
pp_maximum_response_time ? pp_maximum_response_time_local_nonprim : NULL,
|
pp_maximum_response_time ? pp_maximum_response_time_local_nonprim : NULL,
|
||||||
|
pp_maximum_latency && cJSON_IsNull(pp_maximum_latency) ? true : false,
|
||||||
pp_maximum_latency ? pp_maximum_latency_local_nonprim : NULL
|
pp_maximum_latency ? pp_maximum_latency_local_nonprim : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -24,22 +24,34 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_communication_characteristics_s OpenAPI_communication_characteristics_t;
|
typedef struct OpenAPI_communication_characteristics_s OpenAPI_communication_characteristics_t;
|
||||||
typedef struct OpenAPI_communication_characteristics_s {
|
typedef struct OpenAPI_communication_characteristics_s {
|
||||||
|
bool is_pp_subs_reg_timer_null;
|
||||||
struct OpenAPI_pp_subs_reg_timer_s *pp_subs_reg_timer;
|
struct OpenAPI_pp_subs_reg_timer_s *pp_subs_reg_timer;
|
||||||
|
bool is_pp_active_time_null;
|
||||||
struct OpenAPI_pp_active_time_s *pp_active_time;
|
struct OpenAPI_pp_active_time_s *pp_active_time;
|
||||||
|
bool is_pp_dl_packet_count_null;
|
||||||
bool is_pp_dl_packet_count;
|
bool is_pp_dl_packet_count;
|
||||||
int pp_dl_packet_count;
|
int pp_dl_packet_count;
|
||||||
|
bool is_pp_dl_packet_count_ext_null;
|
||||||
struct OpenAPI_pp_dl_packet_count_ext_s *pp_dl_packet_count_ext;
|
struct OpenAPI_pp_dl_packet_count_ext_s *pp_dl_packet_count_ext;
|
||||||
|
bool is_pp_maximum_response_time_null;
|
||||||
struct OpenAPI_pp_maximum_response_time_s *pp_maximum_response_time;
|
struct OpenAPI_pp_maximum_response_time_s *pp_maximum_response_time;
|
||||||
|
bool is_pp_maximum_latency_null;
|
||||||
struct OpenAPI_pp_maximum_latency_s *pp_maximum_latency;
|
struct OpenAPI_pp_maximum_latency_s *pp_maximum_latency;
|
||||||
} OpenAPI_communication_characteristics_t;
|
} OpenAPI_communication_characteristics_t;
|
||||||
|
|
||||||
OpenAPI_communication_characteristics_t *OpenAPI_communication_characteristics_create(
|
OpenAPI_communication_characteristics_t *OpenAPI_communication_characteristics_create(
|
||||||
|
bool is_pp_subs_reg_timer_null,
|
||||||
OpenAPI_pp_subs_reg_timer_t *pp_subs_reg_timer,
|
OpenAPI_pp_subs_reg_timer_t *pp_subs_reg_timer,
|
||||||
|
bool is_pp_active_time_null,
|
||||||
OpenAPI_pp_active_time_t *pp_active_time,
|
OpenAPI_pp_active_time_t *pp_active_time,
|
||||||
|
bool is_pp_dl_packet_count_null,
|
||||||
bool is_pp_dl_packet_count,
|
bool is_pp_dl_packet_count,
|
||||||
int pp_dl_packet_count,
|
int pp_dl_packet_count,
|
||||||
|
bool is_pp_dl_packet_count_ext_null,
|
||||||
OpenAPI_pp_dl_packet_count_ext_t *pp_dl_packet_count_ext,
|
OpenAPI_pp_dl_packet_count_ext_t *pp_dl_packet_count_ext,
|
||||||
|
bool is_pp_maximum_response_time_null,
|
||||||
OpenAPI_pp_maximum_response_time_t *pp_maximum_response_time,
|
OpenAPI_pp_maximum_response_time_t *pp_maximum_response_time,
|
||||||
|
bool is_pp_maximum_latency_null,
|
||||||
OpenAPI_pp_maximum_latency_t *pp_maximum_latency
|
OpenAPI_pp_maximum_latency_t *pp_maximum_latency
|
||||||
);
|
);
|
||||||
void OpenAPI_communication_characteristics_free(OpenAPI_communication_characteristics_t *communication_characteristics);
|
void OpenAPI_communication_characteristics_free(OpenAPI_communication_characteristics_t *communication_characteristics);
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "communication_characteristics_af.h"
|
#include "communication_characteristics_af.h"
|
||||||
|
|
||||||
OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristics_af_create(
|
OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristics_af_create(
|
||||||
|
bool is_pp_dl_packet_count_null,
|
||||||
bool is_pp_dl_packet_count,
|
bool is_pp_dl_packet_count,
|
||||||
int pp_dl_packet_count,
|
int pp_dl_packet_count,
|
||||||
bool is_maximum_response_time,
|
bool is_maximum_response_time,
|
||||||
|
@ -16,6 +17,7 @@ OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristic
|
||||||
OpenAPI_communication_characteristics_af_t *communication_characteristics_af_local_var = ogs_malloc(sizeof(OpenAPI_communication_characteristics_af_t));
|
OpenAPI_communication_characteristics_af_t *communication_characteristics_af_local_var = ogs_malloc(sizeof(OpenAPI_communication_characteristics_af_t));
|
||||||
ogs_assert(communication_characteristics_af_local_var);
|
ogs_assert(communication_characteristics_af_local_var);
|
||||||
|
|
||||||
|
communication_characteristics_af_local_var->is_pp_dl_packet_count_null = is_pp_dl_packet_count_null;
|
||||||
communication_characteristics_af_local_var->is_pp_dl_packet_count = is_pp_dl_packet_count;
|
communication_characteristics_af_local_var->is_pp_dl_packet_count = is_pp_dl_packet_count;
|
||||||
communication_characteristics_af_local_var->pp_dl_packet_count = pp_dl_packet_count;
|
communication_characteristics_af_local_var->pp_dl_packet_count = pp_dl_packet_count;
|
||||||
communication_characteristics_af_local_var->is_maximum_response_time = is_maximum_response_time;
|
communication_characteristics_af_local_var->is_maximum_response_time = is_maximum_response_time;
|
||||||
|
@ -52,6 +54,11 @@ cJSON *OpenAPI_communication_characteristics_af_convertToJSON(OpenAPI_communicat
|
||||||
ogs_error("OpenAPI_communication_characteristics_af_convertToJSON() failed [pp_dl_packet_count]");
|
ogs_error("OpenAPI_communication_characteristics_af_convertToJSON() failed [pp_dl_packet_count]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (communication_characteristics_af->is_pp_dl_packet_count_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ppDlPacketCount") == NULL) {
|
||||||
|
ogs_error("OpenAPI_communication_characteristics_af_convertToJSON() failed [pp_dl_packet_count]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (communication_characteristics_af->is_maximum_response_time) {
|
if (communication_characteristics_af->is_maximum_response_time) {
|
||||||
|
@ -81,11 +88,13 @@ OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristic
|
||||||
cJSON *maximum_latency = NULL;
|
cJSON *maximum_latency = NULL;
|
||||||
pp_dl_packet_count = cJSON_GetObjectItemCaseSensitive(communication_characteristics_afJSON, "ppDlPacketCount");
|
pp_dl_packet_count = cJSON_GetObjectItemCaseSensitive(communication_characteristics_afJSON, "ppDlPacketCount");
|
||||||
if (pp_dl_packet_count) {
|
if (pp_dl_packet_count) {
|
||||||
|
if (!cJSON_IsNull(pp_dl_packet_count)) {
|
||||||
if (!cJSON_IsNumber(pp_dl_packet_count)) {
|
if (!cJSON_IsNumber(pp_dl_packet_count)) {
|
||||||
ogs_error("OpenAPI_communication_characteristics_af_parseFromJSON() failed [pp_dl_packet_count]");
|
ogs_error("OpenAPI_communication_characteristics_af_parseFromJSON() failed [pp_dl_packet_count]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
maximum_response_time = cJSON_GetObjectItemCaseSensitive(communication_characteristics_afJSON, "maximumResponseTime");
|
maximum_response_time = cJSON_GetObjectItemCaseSensitive(communication_characteristics_afJSON, "maximumResponseTime");
|
||||||
if (maximum_response_time) {
|
if (maximum_response_time) {
|
||||||
|
@ -104,6 +113,7 @@ OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristic
|
||||||
}
|
}
|
||||||
|
|
||||||
communication_characteristics_af_local_var = OpenAPI_communication_characteristics_af_create (
|
communication_characteristics_af_local_var = OpenAPI_communication_characteristics_af_create (
|
||||||
|
pp_dl_packet_count && cJSON_IsNull(pp_dl_packet_count) ? true : false,
|
||||||
pp_dl_packet_count ? true : false,
|
pp_dl_packet_count ? true : false,
|
||||||
pp_dl_packet_count ? pp_dl_packet_count->valuedouble : 0,
|
pp_dl_packet_count ? pp_dl_packet_count->valuedouble : 0,
|
||||||
maximum_response_time ? true : false,
|
maximum_response_time ? true : false,
|
||||||
|
|
|
@ -19,6 +19,7 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_communication_characteristics_af_s OpenAPI_communication_characteristics_af_t;
|
typedef struct OpenAPI_communication_characteristics_af_s OpenAPI_communication_characteristics_af_t;
|
||||||
typedef struct OpenAPI_communication_characteristics_af_s {
|
typedef struct OpenAPI_communication_characteristics_af_s {
|
||||||
|
bool is_pp_dl_packet_count_null;
|
||||||
bool is_pp_dl_packet_count;
|
bool is_pp_dl_packet_count;
|
||||||
int pp_dl_packet_count;
|
int pp_dl_packet_count;
|
||||||
bool is_maximum_response_time;
|
bool is_maximum_response_time;
|
||||||
|
@ -28,6 +29,7 @@ typedef struct OpenAPI_communication_characteristics_af_s {
|
||||||
} OpenAPI_communication_characteristics_af_t;
|
} OpenAPI_communication_characteristics_af_t;
|
||||||
|
|
||||||
OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristics_af_create(
|
OpenAPI_communication_characteristics_af_t *OpenAPI_communication_characteristics_af_create(
|
||||||
|
bool is_pp_dl_packet_count_null,
|
||||||
bool is_pp_dl_packet_count,
|
bool is_pp_dl_packet_count,
|
||||||
int pp_dl_packet_count,
|
int pp_dl_packet_count,
|
||||||
bool is_maximum_response_time,
|
bool is_maximum_response_time,
|
||||||
|
|
|
@ -6,7 +6,9 @@
|
||||||
|
|
||||||
OpenAPI_condition_data_t *OpenAPI_condition_data_create(
|
OpenAPI_condition_data_t *OpenAPI_condition_data_create(
|
||||||
char *cond_id,
|
char *cond_id,
|
||||||
|
bool is_activation_time_null,
|
||||||
char *activation_time,
|
char *activation_time,
|
||||||
|
bool is_deactivation_time_null,
|
||||||
char *deactivation_time,
|
char *deactivation_time,
|
||||||
OpenAPI_access_type_e access_type,
|
OpenAPI_access_type_e access_type,
|
||||||
OpenAPI_rat_type_e rat_type
|
OpenAPI_rat_type_e rat_type
|
||||||
|
@ -16,7 +18,9 @@ OpenAPI_condition_data_t *OpenAPI_condition_data_create(
|
||||||
ogs_assert(condition_data_local_var);
|
ogs_assert(condition_data_local_var);
|
||||||
|
|
||||||
condition_data_local_var->cond_id = cond_id;
|
condition_data_local_var->cond_id = cond_id;
|
||||||
|
condition_data_local_var->is_activation_time_null = is_activation_time_null;
|
||||||
condition_data_local_var->activation_time = activation_time;
|
condition_data_local_var->activation_time = activation_time;
|
||||||
|
condition_data_local_var->is_deactivation_time_null = is_deactivation_time_null;
|
||||||
condition_data_local_var->deactivation_time = deactivation_time;
|
condition_data_local_var->deactivation_time = deactivation_time;
|
||||||
condition_data_local_var->access_type = access_type;
|
condition_data_local_var->access_type = access_type;
|
||||||
condition_data_local_var->rat_type = rat_type;
|
condition_data_local_var->rat_type = rat_type;
|
||||||
|
@ -71,6 +75,11 @@ cJSON *OpenAPI_condition_data_convertToJSON(OpenAPI_condition_data_t *condition_
|
||||||
ogs_error("OpenAPI_condition_data_convertToJSON() failed [activation_time]");
|
ogs_error("OpenAPI_condition_data_convertToJSON() failed [activation_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (condition_data->is_activation_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "activationTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_condition_data_convertToJSON() failed [activation_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (condition_data->deactivation_time) {
|
if (condition_data->deactivation_time) {
|
||||||
|
@ -78,6 +87,11 @@ cJSON *OpenAPI_condition_data_convertToJSON(OpenAPI_condition_data_t *condition_
|
||||||
ogs_error("OpenAPI_condition_data_convertToJSON() failed [deactivation_time]");
|
ogs_error("OpenAPI_condition_data_convertToJSON() failed [deactivation_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (condition_data->is_deactivation_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "deactivationTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_condition_data_convertToJSON() failed [deactivation_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (condition_data->access_type != OpenAPI_access_type_NULL) {
|
if (condition_data->access_type != OpenAPI_access_type_NULL) {
|
||||||
|
@ -121,19 +135,23 @@ OpenAPI_condition_data_t *OpenAPI_condition_data_parseFromJSON(cJSON *condition_
|
||||||
|
|
||||||
activation_time = cJSON_GetObjectItemCaseSensitive(condition_dataJSON, "activationTime");
|
activation_time = cJSON_GetObjectItemCaseSensitive(condition_dataJSON, "activationTime");
|
||||||
if (activation_time) {
|
if (activation_time) {
|
||||||
|
if (!cJSON_IsNull(activation_time)) {
|
||||||
if (!cJSON_IsString(activation_time) && !cJSON_IsNull(activation_time)) {
|
if (!cJSON_IsString(activation_time) && !cJSON_IsNull(activation_time)) {
|
||||||
ogs_error("OpenAPI_condition_data_parseFromJSON() failed [activation_time]");
|
ogs_error("OpenAPI_condition_data_parseFromJSON() failed [activation_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
deactivation_time = cJSON_GetObjectItemCaseSensitive(condition_dataJSON, "deactivationTime");
|
deactivation_time = cJSON_GetObjectItemCaseSensitive(condition_dataJSON, "deactivationTime");
|
||||||
if (deactivation_time) {
|
if (deactivation_time) {
|
||||||
|
if (!cJSON_IsNull(deactivation_time)) {
|
||||||
if (!cJSON_IsString(deactivation_time) && !cJSON_IsNull(deactivation_time)) {
|
if (!cJSON_IsString(deactivation_time) && !cJSON_IsNull(deactivation_time)) {
|
||||||
ogs_error("OpenAPI_condition_data_parseFromJSON() failed [deactivation_time]");
|
ogs_error("OpenAPI_condition_data_parseFromJSON() failed [deactivation_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
access_type = cJSON_GetObjectItemCaseSensitive(condition_dataJSON, "accessType");
|
access_type = cJSON_GetObjectItemCaseSensitive(condition_dataJSON, "accessType");
|
||||||
if (access_type) {
|
if (access_type) {
|
||||||
|
@ -155,7 +173,9 @@ OpenAPI_condition_data_t *OpenAPI_condition_data_parseFromJSON(cJSON *condition_
|
||||||
|
|
||||||
condition_data_local_var = OpenAPI_condition_data_create (
|
condition_data_local_var = OpenAPI_condition_data_create (
|
||||||
ogs_strdup(cond_id->valuestring),
|
ogs_strdup(cond_id->valuestring),
|
||||||
|
activation_time && cJSON_IsNull(activation_time) ? true : false,
|
||||||
activation_time && !cJSON_IsNull(activation_time) ? ogs_strdup(activation_time->valuestring) : NULL,
|
activation_time && !cJSON_IsNull(activation_time) ? ogs_strdup(activation_time->valuestring) : NULL,
|
||||||
|
deactivation_time && cJSON_IsNull(deactivation_time) ? true : false,
|
||||||
deactivation_time && !cJSON_IsNull(deactivation_time) ? ogs_strdup(deactivation_time->valuestring) : NULL,
|
deactivation_time && !cJSON_IsNull(deactivation_time) ? ogs_strdup(deactivation_time->valuestring) : NULL,
|
||||||
access_type ? access_typeVariable : 0,
|
access_type ? access_typeVariable : 0,
|
||||||
rat_type ? rat_typeVariable : 0
|
rat_type ? rat_typeVariable : 0
|
||||||
|
|
|
@ -22,7 +22,9 @@ extern "C" {
|
||||||
typedef struct OpenAPI_condition_data_s OpenAPI_condition_data_t;
|
typedef struct OpenAPI_condition_data_s OpenAPI_condition_data_t;
|
||||||
typedef struct OpenAPI_condition_data_s {
|
typedef struct OpenAPI_condition_data_s {
|
||||||
char *cond_id;
|
char *cond_id;
|
||||||
|
bool is_activation_time_null;
|
||||||
char *activation_time;
|
char *activation_time;
|
||||||
|
bool is_deactivation_time_null;
|
||||||
char *deactivation_time;
|
char *deactivation_time;
|
||||||
OpenAPI_access_type_e access_type;
|
OpenAPI_access_type_e access_type;
|
||||||
OpenAPI_rat_type_e rat_type;
|
OpenAPI_rat_type_e rat_type;
|
||||||
|
@ -30,7 +32,9 @@ typedef struct OpenAPI_condition_data_s {
|
||||||
|
|
||||||
OpenAPI_condition_data_t *OpenAPI_condition_data_create(
|
OpenAPI_condition_data_t *OpenAPI_condition_data_create(
|
||||||
char *cond_id,
|
char *cond_id,
|
||||||
|
bool is_activation_time_null,
|
||||||
char *activation_time,
|
char *activation_time,
|
||||||
|
bool is_deactivation_time_null,
|
||||||
char *deactivation_time,
|
char *deactivation_time,
|
||||||
OpenAPI_access_type_e access_type,
|
OpenAPI_access_type_e access_type,
|
||||||
OpenAPI_rat_type_e rat_type
|
OpenAPI_rat_type_e rat_type
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "confirmation_data.h"
|
#include "confirmation_data.h"
|
||||||
|
|
||||||
OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_create(
|
OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_create(
|
||||||
|
bool is_res_star_null,
|
||||||
char *res_star,
|
char *res_star,
|
||||||
char *supported_features
|
char *supported_features
|
||||||
)
|
)
|
||||||
|
@ -12,6 +13,7 @@ OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_create(
|
||||||
OpenAPI_confirmation_data_t *confirmation_data_local_var = ogs_malloc(sizeof(OpenAPI_confirmation_data_t));
|
OpenAPI_confirmation_data_t *confirmation_data_local_var = ogs_malloc(sizeof(OpenAPI_confirmation_data_t));
|
||||||
ogs_assert(confirmation_data_local_var);
|
ogs_assert(confirmation_data_local_var);
|
||||||
|
|
||||||
|
confirmation_data_local_var->is_res_star_null = is_res_star_null;
|
||||||
confirmation_data_local_var->res_star = res_star;
|
confirmation_data_local_var->res_star = res_star;
|
||||||
confirmation_data_local_var->supported_features = supported_features;
|
confirmation_data_local_var->supported_features = supported_features;
|
||||||
|
|
||||||
|
@ -92,6 +94,7 @@ OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_parseFromJSON(cJSON *conf
|
||||||
}
|
}
|
||||||
|
|
||||||
confirmation_data_local_var = OpenAPI_confirmation_data_create (
|
confirmation_data_local_var = OpenAPI_confirmation_data_create (
|
||||||
|
res_star && cJSON_IsNull(res_star) ? true : false,
|
||||||
ogs_strdup(res_star->valuestring),
|
ogs_strdup(res_star->valuestring),
|
||||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
|
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
|
||||||
);
|
);
|
||||||
|
|
|
@ -19,11 +19,13 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_confirmation_data_s OpenAPI_confirmation_data_t;
|
typedef struct OpenAPI_confirmation_data_s OpenAPI_confirmation_data_t;
|
||||||
typedef struct OpenAPI_confirmation_data_s {
|
typedef struct OpenAPI_confirmation_data_s {
|
||||||
|
bool is_res_star_null;
|
||||||
char *res_star;
|
char *res_star;
|
||||||
char *supported_features;
|
char *supported_features;
|
||||||
} OpenAPI_confirmation_data_t;
|
} OpenAPI_confirmation_data_t;
|
||||||
|
|
||||||
OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_create(
|
OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_create(
|
||||||
|
bool is_res_star_null,
|
||||||
char *res_star,
|
char *res_star,
|
||||||
char *supported_features
|
char *supported_features
|
||||||
);
|
);
|
||||||
|
|
|
@ -36,6 +36,7 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_create(
|
||||||
char *iptv_acc_ctrl_info,
|
char *iptv_acc_ctrl_info,
|
||||||
OpenAPI_ip_index_t *ipv4_index,
|
OpenAPI_ip_index_t *ipv4_index,
|
||||||
OpenAPI_ip_index_t *ipv6_index,
|
OpenAPI_ip_index_t *ipv6_index,
|
||||||
|
bool is_ecs_addr_config_info_null,
|
||||||
OpenAPI_ecs_addr_config_info_t *ecs_addr_config_info,
|
OpenAPI_ecs_addr_config_info_t *ecs_addr_config_info,
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
||||||
char *shared_ecs_addr_config_info,
|
char *shared_ecs_addr_config_info,
|
||||||
|
@ -83,6 +84,7 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_create(
|
||||||
dnn_configuration_local_var->iptv_acc_ctrl_info = iptv_acc_ctrl_info;
|
dnn_configuration_local_var->iptv_acc_ctrl_info = iptv_acc_ctrl_info;
|
||||||
dnn_configuration_local_var->ipv4_index = ipv4_index;
|
dnn_configuration_local_var->ipv4_index = ipv4_index;
|
||||||
dnn_configuration_local_var->ipv6_index = ipv6_index;
|
dnn_configuration_local_var->ipv6_index = ipv6_index;
|
||||||
|
dnn_configuration_local_var->is_ecs_addr_config_info_null = is_ecs_addr_config_info_null;
|
||||||
dnn_configuration_local_var->ecs_addr_config_info = ecs_addr_config_info;
|
dnn_configuration_local_var->ecs_addr_config_info = ecs_addr_config_info;
|
||||||
dnn_configuration_local_var->additional_ecs_addr_config_infos = additional_ecs_addr_config_infos;
|
dnn_configuration_local_var->additional_ecs_addr_config_infos = additional_ecs_addr_config_infos;
|
||||||
dnn_configuration_local_var->shared_ecs_addr_config_info = shared_ecs_addr_config_info;
|
dnn_configuration_local_var->shared_ecs_addr_config_info = shared_ecs_addr_config_info;
|
||||||
|
@ -511,6 +513,11 @@ cJSON *OpenAPI_dnn_configuration_convertToJSON(OpenAPI_dnn_configuration_t *dnn_
|
||||||
ogs_error("OpenAPI_dnn_configuration_convertToJSON() failed [ecs_addr_config_info]");
|
ogs_error("OpenAPI_dnn_configuration_convertToJSON() failed [ecs_addr_config_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (dnn_configuration->is_ecs_addr_config_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ecsAddrConfigInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_dnn_configuration_convertToJSON() failed [ecs_addr_config_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dnn_configuration->additional_ecs_addr_config_infos) {
|
if (dnn_configuration->additional_ecs_addr_config_infos) {
|
||||||
|
@ -919,12 +926,14 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_parseFromJSON(cJSON *dnn_
|
||||||
|
|
||||||
ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "ecsAddrConfigInfo");
|
ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "ecsAddrConfigInfo");
|
||||||
if (ecs_addr_config_info) {
|
if (ecs_addr_config_info) {
|
||||||
|
if (!cJSON_IsNull(ecs_addr_config_info)) {
|
||||||
ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_parseFromJSON(ecs_addr_config_info);
|
ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_parseFromJSON(ecs_addr_config_info);
|
||||||
if (!ecs_addr_config_info_local_nonprim) {
|
if (!ecs_addr_config_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_ecs_addr_config_info_parseFromJSON failed [ecs_addr_config_info]");
|
ogs_error("OpenAPI_ecs_addr_config_info_parseFromJSON failed [ecs_addr_config_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "additionalEcsAddrConfigInfos");
|
additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(dnn_configurationJSON, "additionalEcsAddrConfigInfos");
|
||||||
if (additional_ecs_addr_config_infos) {
|
if (additional_ecs_addr_config_infos) {
|
||||||
|
@ -1044,6 +1053,7 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_parseFromJSON(cJSON *dnn_
|
||||||
iptv_acc_ctrl_info && !cJSON_IsNull(iptv_acc_ctrl_info) ? ogs_strdup(iptv_acc_ctrl_info->valuestring) : NULL,
|
iptv_acc_ctrl_info && !cJSON_IsNull(iptv_acc_ctrl_info) ? ogs_strdup(iptv_acc_ctrl_info->valuestring) : NULL,
|
||||||
ipv4_index ? ipv4_index_local_nonprim : NULL,
|
ipv4_index ? ipv4_index_local_nonprim : NULL,
|
||||||
ipv6_index ? ipv6_index_local_nonprim : NULL,
|
ipv6_index ? ipv6_index_local_nonprim : NULL,
|
||||||
|
ecs_addr_config_info && cJSON_IsNull(ecs_addr_config_info) ? true : false,
|
||||||
ecs_addr_config_info ? ecs_addr_config_info_local_nonprim : NULL,
|
ecs_addr_config_info ? ecs_addr_config_info_local_nonprim : NULL,
|
||||||
additional_ecs_addr_config_infos ? additional_ecs_addr_config_infosList : NULL,
|
additional_ecs_addr_config_infos ? additional_ecs_addr_config_infosList : NULL,
|
||||||
shared_ecs_addr_config_info && !cJSON_IsNull(shared_ecs_addr_config_info) ? ogs_strdup(shared_ecs_addr_config_info->valuestring) : NULL,
|
shared_ecs_addr_config_info && !cJSON_IsNull(shared_ecs_addr_config_info) ? ogs_strdup(shared_ecs_addr_config_info->valuestring) : NULL,
|
||||||
|
|
|
@ -63,6 +63,7 @@ typedef struct OpenAPI_dnn_configuration_s {
|
||||||
char *iptv_acc_ctrl_info;
|
char *iptv_acc_ctrl_info;
|
||||||
struct OpenAPI_ip_index_s *ipv4_index;
|
struct OpenAPI_ip_index_s *ipv4_index;
|
||||||
struct OpenAPI_ip_index_s *ipv6_index;
|
struct OpenAPI_ip_index_s *ipv6_index;
|
||||||
|
bool is_ecs_addr_config_info_null;
|
||||||
struct OpenAPI_ecs_addr_config_info_s *ecs_addr_config_info;
|
struct OpenAPI_ecs_addr_config_info_s *ecs_addr_config_info;
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos;
|
OpenAPI_list_t *additional_ecs_addr_config_infos;
|
||||||
char *shared_ecs_addr_config_info;
|
char *shared_ecs_addr_config_info;
|
||||||
|
@ -108,6 +109,7 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_create(
|
||||||
char *iptv_acc_ctrl_info,
|
char *iptv_acc_ctrl_info,
|
||||||
OpenAPI_ip_index_t *ipv4_index,
|
OpenAPI_ip_index_t *ipv4_index,
|
||||||
OpenAPI_ip_index_t *ipv6_index,
|
OpenAPI_ip_index_t *ipv6_index,
|
||||||
|
bool is_ecs_addr_config_info_null,
|
||||||
OpenAPI_ecs_addr_config_info_t *ecs_addr_config_info,
|
OpenAPI_ecs_addr_config_info_t *ecs_addr_config_info,
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
||||||
char *shared_ecs_addr_config_info,
|
char *shared_ecs_addr_config_info,
|
||||||
|
|
|
@ -36,6 +36,7 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_create(
|
||||||
char *iptv_acc_ctrl_info,
|
char *iptv_acc_ctrl_info,
|
||||||
OpenAPI_ip_index_t *ipv4_index,
|
OpenAPI_ip_index_t *ipv4_index,
|
||||||
OpenAPI_ip_index_t *ipv6_index,
|
OpenAPI_ip_index_t *ipv6_index,
|
||||||
|
bool is_ecs_addr_config_info_null,
|
||||||
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
||||||
char *shared_ecs_addr_config_info,
|
char *shared_ecs_addr_config_info,
|
||||||
|
@ -83,6 +84,7 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_create(
|
||||||
dnn_configuration_1_local_var->iptv_acc_ctrl_info = iptv_acc_ctrl_info;
|
dnn_configuration_1_local_var->iptv_acc_ctrl_info = iptv_acc_ctrl_info;
|
||||||
dnn_configuration_1_local_var->ipv4_index = ipv4_index;
|
dnn_configuration_1_local_var->ipv4_index = ipv4_index;
|
||||||
dnn_configuration_1_local_var->ipv6_index = ipv6_index;
|
dnn_configuration_1_local_var->ipv6_index = ipv6_index;
|
||||||
|
dnn_configuration_1_local_var->is_ecs_addr_config_info_null = is_ecs_addr_config_info_null;
|
||||||
dnn_configuration_1_local_var->ecs_addr_config_info = ecs_addr_config_info;
|
dnn_configuration_1_local_var->ecs_addr_config_info = ecs_addr_config_info;
|
||||||
dnn_configuration_1_local_var->additional_ecs_addr_config_infos = additional_ecs_addr_config_infos;
|
dnn_configuration_1_local_var->additional_ecs_addr_config_infos = additional_ecs_addr_config_infos;
|
||||||
dnn_configuration_1_local_var->shared_ecs_addr_config_info = shared_ecs_addr_config_info;
|
dnn_configuration_1_local_var->shared_ecs_addr_config_info = shared_ecs_addr_config_info;
|
||||||
|
@ -511,6 +513,11 @@ cJSON *OpenAPI_dnn_configuration_1_convertToJSON(OpenAPI_dnn_configuration_1_t *
|
||||||
ogs_error("OpenAPI_dnn_configuration_1_convertToJSON() failed [ecs_addr_config_info]");
|
ogs_error("OpenAPI_dnn_configuration_1_convertToJSON() failed [ecs_addr_config_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (dnn_configuration_1->is_ecs_addr_config_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ecsAddrConfigInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_dnn_configuration_1_convertToJSON() failed [ecs_addr_config_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dnn_configuration_1->additional_ecs_addr_config_infos) {
|
if (dnn_configuration_1->additional_ecs_addr_config_infos) {
|
||||||
|
@ -919,12 +926,14 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_parseFromJSON(cJSON *
|
||||||
|
|
||||||
ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "ecsAddrConfigInfo");
|
ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "ecsAddrConfigInfo");
|
||||||
if (ecs_addr_config_info) {
|
if (ecs_addr_config_info) {
|
||||||
|
if (!cJSON_IsNull(ecs_addr_config_info)) {
|
||||||
ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_1_parseFromJSON(ecs_addr_config_info);
|
ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_1_parseFromJSON(ecs_addr_config_info);
|
||||||
if (!ecs_addr_config_info_local_nonprim) {
|
if (!ecs_addr_config_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_ecs_addr_config_info_1_parseFromJSON failed [ecs_addr_config_info]");
|
ogs_error("OpenAPI_ecs_addr_config_info_1_parseFromJSON failed [ecs_addr_config_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "additionalEcsAddrConfigInfos");
|
additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(dnn_configuration_1JSON, "additionalEcsAddrConfigInfos");
|
||||||
if (additional_ecs_addr_config_infos) {
|
if (additional_ecs_addr_config_infos) {
|
||||||
|
@ -1044,6 +1053,7 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_parseFromJSON(cJSON *
|
||||||
iptv_acc_ctrl_info && !cJSON_IsNull(iptv_acc_ctrl_info) ? ogs_strdup(iptv_acc_ctrl_info->valuestring) : NULL,
|
iptv_acc_ctrl_info && !cJSON_IsNull(iptv_acc_ctrl_info) ? ogs_strdup(iptv_acc_ctrl_info->valuestring) : NULL,
|
||||||
ipv4_index ? ipv4_index_local_nonprim : NULL,
|
ipv4_index ? ipv4_index_local_nonprim : NULL,
|
||||||
ipv6_index ? ipv6_index_local_nonprim : NULL,
|
ipv6_index ? ipv6_index_local_nonprim : NULL,
|
||||||
|
ecs_addr_config_info && cJSON_IsNull(ecs_addr_config_info) ? true : false,
|
||||||
ecs_addr_config_info ? ecs_addr_config_info_local_nonprim : NULL,
|
ecs_addr_config_info ? ecs_addr_config_info_local_nonprim : NULL,
|
||||||
additional_ecs_addr_config_infos ? additional_ecs_addr_config_infosList : NULL,
|
additional_ecs_addr_config_infos ? additional_ecs_addr_config_infosList : NULL,
|
||||||
shared_ecs_addr_config_info && !cJSON_IsNull(shared_ecs_addr_config_info) ? ogs_strdup(shared_ecs_addr_config_info->valuestring) : NULL,
|
shared_ecs_addr_config_info && !cJSON_IsNull(shared_ecs_addr_config_info) ? ogs_strdup(shared_ecs_addr_config_info->valuestring) : NULL,
|
||||||
|
|
|
@ -63,6 +63,7 @@ typedef struct OpenAPI_dnn_configuration_1_s {
|
||||||
char *iptv_acc_ctrl_info;
|
char *iptv_acc_ctrl_info;
|
||||||
struct OpenAPI_ip_index_s *ipv4_index;
|
struct OpenAPI_ip_index_s *ipv4_index;
|
||||||
struct OpenAPI_ip_index_s *ipv6_index;
|
struct OpenAPI_ip_index_s *ipv6_index;
|
||||||
|
bool is_ecs_addr_config_info_null;
|
||||||
struct OpenAPI_ecs_addr_config_info_1_s *ecs_addr_config_info;
|
struct OpenAPI_ecs_addr_config_info_1_s *ecs_addr_config_info;
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos;
|
OpenAPI_list_t *additional_ecs_addr_config_infos;
|
||||||
char *shared_ecs_addr_config_info;
|
char *shared_ecs_addr_config_info;
|
||||||
|
@ -108,6 +109,7 @@ OpenAPI_dnn_configuration_1_t *OpenAPI_dnn_configuration_1_create(
|
||||||
char *iptv_acc_ctrl_info,
|
char *iptv_acc_ctrl_info,
|
||||||
OpenAPI_ip_index_t *ipv4_index,
|
OpenAPI_ip_index_t *ipv4_index,
|
||||||
OpenAPI_ip_index_t *ipv6_index,
|
OpenAPI_ip_index_t *ipv6_index,
|
||||||
|
bool is_ecs_addr_config_info_null,
|
||||||
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
||||||
char *shared_ecs_addr_config_info,
|
char *shared_ecs_addr_config_info,
|
||||||
|
|
|
@ -5,14 +5,18 @@
|
||||||
#include "downlink_data_notification_control_rm.h"
|
#include "downlink_data_notification_control_rm.h"
|
||||||
|
|
||||||
OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notification_control_rm_create(
|
OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notification_control_rm_create(
|
||||||
|
bool is_notif_ctrl_inds_null,
|
||||||
OpenAPI_list_t *notif_ctrl_inds,
|
OpenAPI_list_t *notif_ctrl_inds,
|
||||||
|
bool is_types_of_notif_null,
|
||||||
OpenAPI_list_t *types_of_notif
|
OpenAPI_list_t *types_of_notif
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
OpenAPI_downlink_data_notification_control_rm_t *downlink_data_notification_control_rm_local_var = ogs_malloc(sizeof(OpenAPI_downlink_data_notification_control_rm_t));
|
OpenAPI_downlink_data_notification_control_rm_t *downlink_data_notification_control_rm_local_var = ogs_malloc(sizeof(OpenAPI_downlink_data_notification_control_rm_t));
|
||||||
ogs_assert(downlink_data_notification_control_rm_local_var);
|
ogs_assert(downlink_data_notification_control_rm_local_var);
|
||||||
|
|
||||||
|
downlink_data_notification_control_rm_local_var->is_notif_ctrl_inds_null = is_notif_ctrl_inds_null;
|
||||||
downlink_data_notification_control_rm_local_var->notif_ctrl_inds = notif_ctrl_inds;
|
downlink_data_notification_control_rm_local_var->notif_ctrl_inds = notif_ctrl_inds;
|
||||||
|
downlink_data_notification_control_rm_local_var->is_types_of_notif_null = is_types_of_notif_null;
|
||||||
downlink_data_notification_control_rm_local_var->types_of_notif = types_of_notif;
|
downlink_data_notification_control_rm_local_var->types_of_notif = types_of_notif;
|
||||||
|
|
||||||
return downlink_data_notification_control_rm_local_var;
|
return downlink_data_notification_control_rm_local_var;
|
||||||
|
@ -59,6 +63,11 @@ cJSON *OpenAPI_downlink_data_notification_control_rm_convertToJSON(OpenAPI_downl
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (downlink_data_notification_control_rm->is_notif_ctrl_inds_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "notifCtrlInds") == NULL) {
|
||||||
|
ogs_error("OpenAPI_downlink_data_notification_control_rm_convertToJSON() failed [notif_ctrl_inds]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (downlink_data_notification_control_rm->types_of_notif != OpenAPI_dl_data_delivery_status_NULL) {
|
if (downlink_data_notification_control_rm->types_of_notif != OpenAPI_dl_data_delivery_status_NULL) {
|
||||||
|
@ -73,6 +82,11 @@ cJSON *OpenAPI_downlink_data_notification_control_rm_convertToJSON(OpenAPI_downl
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (downlink_data_notification_control_rm->is_types_of_notif_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "typesOfNotif") == NULL) {
|
||||||
|
ogs_error("OpenAPI_downlink_data_notification_control_rm_convertToJSON() failed [types_of_notif]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -89,6 +103,7 @@ OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notificat
|
||||||
OpenAPI_list_t *types_of_notifList = NULL;
|
OpenAPI_list_t *types_of_notifList = NULL;
|
||||||
notif_ctrl_inds = cJSON_GetObjectItemCaseSensitive(downlink_data_notification_control_rmJSON, "notifCtrlInds");
|
notif_ctrl_inds = cJSON_GetObjectItemCaseSensitive(downlink_data_notification_control_rmJSON, "notifCtrlInds");
|
||||||
if (notif_ctrl_inds) {
|
if (notif_ctrl_inds) {
|
||||||
|
if (!cJSON_IsNull(notif_ctrl_inds)) {
|
||||||
cJSON *notif_ctrl_inds_local = NULL;
|
cJSON *notif_ctrl_inds_local = NULL;
|
||||||
if (!cJSON_IsArray(notif_ctrl_inds)) {
|
if (!cJSON_IsArray(notif_ctrl_inds)) {
|
||||||
ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON() failed [notif_ctrl_inds]");
|
ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON() failed [notif_ctrl_inds]");
|
||||||
|
@ -111,9 +126,11 @@ OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notificat
|
||||||
OpenAPI_list_add(notif_ctrl_indsList, (void *)localEnum);
|
OpenAPI_list_add(notif_ctrl_indsList, (void *)localEnum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
types_of_notif = cJSON_GetObjectItemCaseSensitive(downlink_data_notification_control_rmJSON, "typesOfNotif");
|
types_of_notif = cJSON_GetObjectItemCaseSensitive(downlink_data_notification_control_rmJSON, "typesOfNotif");
|
||||||
if (types_of_notif) {
|
if (types_of_notif) {
|
||||||
|
if (!cJSON_IsNull(types_of_notif)) {
|
||||||
cJSON *types_of_notif_local = NULL;
|
cJSON *types_of_notif_local = NULL;
|
||||||
if (!cJSON_IsArray(types_of_notif)) {
|
if (!cJSON_IsArray(types_of_notif)) {
|
||||||
ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON() failed [types_of_notif]");
|
ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON() failed [types_of_notif]");
|
||||||
|
@ -136,9 +153,12 @@ OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notificat
|
||||||
OpenAPI_list_add(types_of_notifList, (void *)localEnum);
|
OpenAPI_list_add(types_of_notifList, (void *)localEnum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
downlink_data_notification_control_rm_local_var = OpenAPI_downlink_data_notification_control_rm_create (
|
downlink_data_notification_control_rm_local_var = OpenAPI_downlink_data_notification_control_rm_create (
|
||||||
|
notif_ctrl_inds && cJSON_IsNull(notif_ctrl_inds) ? true : false,
|
||||||
notif_ctrl_inds ? notif_ctrl_indsList : NULL,
|
notif_ctrl_inds ? notif_ctrl_indsList : NULL,
|
||||||
|
types_of_notif && cJSON_IsNull(types_of_notif) ? true : false,
|
||||||
types_of_notif ? types_of_notifList : NULL
|
types_of_notif ? types_of_notifList : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -21,12 +21,16 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_downlink_data_notification_control_rm_s OpenAPI_downlink_data_notification_control_rm_t;
|
typedef struct OpenAPI_downlink_data_notification_control_rm_s OpenAPI_downlink_data_notification_control_rm_t;
|
||||||
typedef struct OpenAPI_downlink_data_notification_control_rm_s {
|
typedef struct OpenAPI_downlink_data_notification_control_rm_s {
|
||||||
|
bool is_notif_ctrl_inds_null;
|
||||||
OpenAPI_list_t *notif_ctrl_inds;
|
OpenAPI_list_t *notif_ctrl_inds;
|
||||||
|
bool is_types_of_notif_null;
|
||||||
OpenAPI_list_t *types_of_notif;
|
OpenAPI_list_t *types_of_notif;
|
||||||
} OpenAPI_downlink_data_notification_control_rm_t;
|
} OpenAPI_downlink_data_notification_control_rm_t;
|
||||||
|
|
||||||
OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notification_control_rm_create(
|
OpenAPI_downlink_data_notification_control_rm_t *OpenAPI_downlink_data_notification_control_rm_create(
|
||||||
|
bool is_notif_ctrl_inds_null,
|
||||||
OpenAPI_list_t *notif_ctrl_inds,
|
OpenAPI_list_t *notif_ctrl_inds,
|
||||||
|
bool is_types_of_notif_null,
|
||||||
OpenAPI_list_t *types_of_notif
|
OpenAPI_list_t *types_of_notif
|
||||||
);
|
);
|
||||||
void OpenAPI_downlink_data_notification_control_rm_free(OpenAPI_downlink_data_notification_control_rm_t *downlink_data_notification_control_rm);
|
void OpenAPI_downlink_data_notification_control_rm_free(OpenAPI_downlink_data_notification_control_rm_t *downlink_data_notification_control_rm);
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "eap_auth_method_200_response.h"
|
#include "eap_auth_method_200_response.h"
|
||||||
|
|
||||||
OpenAPI_eap_auth_method_200_response_t *OpenAPI_eap_auth_method_200_response_create(
|
OpenAPI_eap_auth_method_200_response_t *OpenAPI_eap_auth_method_200_response_create(
|
||||||
|
bool is_eap_payload_null,
|
||||||
char *eap_payload,
|
char *eap_payload,
|
||||||
OpenAPI_list_t* _links
|
OpenAPI_list_t* _links
|
||||||
)
|
)
|
||||||
|
@ -12,6 +13,7 @@ OpenAPI_eap_auth_method_200_response_t *OpenAPI_eap_auth_method_200_response_cre
|
||||||
OpenAPI_eap_auth_method_200_response_t *eap_auth_method_200_response_local_var = ogs_malloc(sizeof(OpenAPI_eap_auth_method_200_response_t));
|
OpenAPI_eap_auth_method_200_response_t *eap_auth_method_200_response_local_var = ogs_malloc(sizeof(OpenAPI_eap_auth_method_200_response_t));
|
||||||
ogs_assert(eap_auth_method_200_response_local_var);
|
ogs_assert(eap_auth_method_200_response_local_var);
|
||||||
|
|
||||||
|
eap_auth_method_200_response_local_var->is_eap_payload_null = is_eap_payload_null;
|
||||||
eap_auth_method_200_response_local_var->eap_payload = eap_payload;
|
eap_auth_method_200_response_local_var->eap_payload = eap_payload;
|
||||||
eap_auth_method_200_response_local_var->_links = _links;
|
eap_auth_method_200_response_local_var->_links = _links;
|
||||||
|
|
||||||
|
@ -144,6 +146,7 @@ OpenAPI_eap_auth_method_200_response_t *OpenAPI_eap_auth_method_200_response_par
|
||||||
}
|
}
|
||||||
|
|
||||||
eap_auth_method_200_response_local_var = OpenAPI_eap_auth_method_200_response_create (
|
eap_auth_method_200_response_local_var = OpenAPI_eap_auth_method_200_response_create (
|
||||||
|
eap_payload && cJSON_IsNull(eap_payload) ? true : false,
|
||||||
ogs_strdup(eap_payload->valuestring),
|
ogs_strdup(eap_payload->valuestring),
|
||||||
_linksList
|
_linksList
|
||||||
);
|
);
|
||||||
|
|
|
@ -20,11 +20,13 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_eap_auth_method_200_response_s OpenAPI_eap_auth_method_200_response_t;
|
typedef struct OpenAPI_eap_auth_method_200_response_s OpenAPI_eap_auth_method_200_response_t;
|
||||||
typedef struct OpenAPI_eap_auth_method_200_response_s {
|
typedef struct OpenAPI_eap_auth_method_200_response_s {
|
||||||
|
bool is_eap_payload_null;
|
||||||
char *eap_payload;
|
char *eap_payload;
|
||||||
OpenAPI_list_t* _links;
|
OpenAPI_list_t* _links;
|
||||||
} OpenAPI_eap_auth_method_200_response_t;
|
} OpenAPI_eap_auth_method_200_response_t;
|
||||||
|
|
||||||
OpenAPI_eap_auth_method_200_response_t *OpenAPI_eap_auth_method_200_response_create(
|
OpenAPI_eap_auth_method_200_response_t *OpenAPI_eap_auth_method_200_response_create(
|
||||||
|
bool is_eap_payload_null,
|
||||||
char *eap_payload,
|
char *eap_payload,
|
||||||
OpenAPI_list_t* _links
|
OpenAPI_list_t* _links
|
||||||
);
|
);
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#include "eap_session.h"
|
#include "eap_session.h"
|
||||||
|
|
||||||
OpenAPI_eap_session_t *OpenAPI_eap_session_create(
|
OpenAPI_eap_session_t *OpenAPI_eap_session_create(
|
||||||
|
bool is_eap_payload_null,
|
||||||
char *eap_payload,
|
char *eap_payload,
|
||||||
char *k_seaf,
|
char *k_seaf,
|
||||||
OpenAPI_list_t* _links,
|
OpenAPI_list_t* _links,
|
||||||
|
@ -18,6 +19,7 @@ OpenAPI_eap_session_t *OpenAPI_eap_session_create(
|
||||||
OpenAPI_eap_session_t *eap_session_local_var = ogs_malloc(sizeof(OpenAPI_eap_session_t));
|
OpenAPI_eap_session_t *eap_session_local_var = ogs_malloc(sizeof(OpenAPI_eap_session_t));
|
||||||
ogs_assert(eap_session_local_var);
|
ogs_assert(eap_session_local_var);
|
||||||
|
|
||||||
|
eap_session_local_var->is_eap_payload_null = is_eap_payload_null;
|
||||||
eap_session_local_var->eap_payload = eap_payload;
|
eap_session_local_var->eap_payload = eap_payload;
|
||||||
eap_session_local_var->k_seaf = k_seaf;
|
eap_session_local_var->k_seaf = k_seaf;
|
||||||
eap_session_local_var->_links = _links;
|
eap_session_local_var->_links = _links;
|
||||||
|
@ -299,6 +301,7 @@ OpenAPI_eap_session_t *OpenAPI_eap_session_parseFromJSON(cJSON *eap_sessionJSON)
|
||||||
}
|
}
|
||||||
|
|
||||||
eap_session_local_var = OpenAPI_eap_session_create (
|
eap_session_local_var = OpenAPI_eap_session_create (
|
||||||
|
eap_payload && cJSON_IsNull(eap_payload) ? true : false,
|
||||||
ogs_strdup(eap_payload->valuestring),
|
ogs_strdup(eap_payload->valuestring),
|
||||||
k_seaf && !cJSON_IsNull(k_seaf) ? ogs_strdup(k_seaf->valuestring) : NULL,
|
k_seaf && !cJSON_IsNull(k_seaf) ? ogs_strdup(k_seaf->valuestring) : NULL,
|
||||||
_links ? _linksList : NULL,
|
_links ? _linksList : NULL,
|
||||||
|
|
|
@ -22,6 +22,7 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_eap_session_s OpenAPI_eap_session_t;
|
typedef struct OpenAPI_eap_session_s OpenAPI_eap_session_t;
|
||||||
typedef struct OpenAPI_eap_session_s {
|
typedef struct OpenAPI_eap_session_s {
|
||||||
|
bool is_eap_payload_null;
|
||||||
char *eap_payload;
|
char *eap_payload;
|
||||||
char *k_seaf;
|
char *k_seaf;
|
||||||
OpenAPI_list_t* _links;
|
OpenAPI_list_t* _links;
|
||||||
|
@ -33,6 +34,7 @@ typedef struct OpenAPI_eap_session_s {
|
||||||
} OpenAPI_eap_session_t;
|
} OpenAPI_eap_session_t;
|
||||||
|
|
||||||
OpenAPI_eap_session_t *OpenAPI_eap_session_create(
|
OpenAPI_eap_session_t *OpenAPI_eap_session_create(
|
||||||
|
bool is_eap_payload_null,
|
||||||
char *eap_payload,
|
char *eap_payload,
|
||||||
char *k_seaf,
|
char *k_seaf,
|
||||||
OpenAPI_list_t* _links,
|
OpenAPI_list_t* _links,
|
||||||
|
|
|
@ -8,10 +8,13 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_create(
|
||||||
OpenAPI_list_t *events,
|
OpenAPI_list_t *events,
|
||||||
char *notif_uri,
|
char *notif_uri,
|
||||||
OpenAPI_list_t *req_qos_mon_params,
|
OpenAPI_list_t *req_qos_mon_params,
|
||||||
|
bool is_qos_mon_null,
|
||||||
OpenAPI_qos_monitoring_information_rm_t *qos_mon,
|
OpenAPI_qos_monitoring_information_rm_t *qos_mon,
|
||||||
OpenAPI_list_t *req_anis,
|
OpenAPI_list_t *req_anis,
|
||||||
|
bool is_usg_thres_null,
|
||||||
OpenAPI_usage_threshold_rm_t *usg_thres,
|
OpenAPI_usage_threshold_rm_t *usg_thres,
|
||||||
char *notif_corre_id,
|
char *notif_corre_id,
|
||||||
|
bool is_direct_notif_ind_null,
|
||||||
bool is_direct_notif_ind,
|
bool is_direct_notif_ind,
|
||||||
int direct_notif_ind
|
int direct_notif_ind
|
||||||
)
|
)
|
||||||
|
@ -22,10 +25,13 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_create(
|
||||||
events_subsc_req_data_rm_local_var->events = events;
|
events_subsc_req_data_rm_local_var->events = events;
|
||||||
events_subsc_req_data_rm_local_var->notif_uri = notif_uri;
|
events_subsc_req_data_rm_local_var->notif_uri = notif_uri;
|
||||||
events_subsc_req_data_rm_local_var->req_qos_mon_params = req_qos_mon_params;
|
events_subsc_req_data_rm_local_var->req_qos_mon_params = req_qos_mon_params;
|
||||||
|
events_subsc_req_data_rm_local_var->is_qos_mon_null = is_qos_mon_null;
|
||||||
events_subsc_req_data_rm_local_var->qos_mon = qos_mon;
|
events_subsc_req_data_rm_local_var->qos_mon = qos_mon;
|
||||||
events_subsc_req_data_rm_local_var->req_anis = req_anis;
|
events_subsc_req_data_rm_local_var->req_anis = req_anis;
|
||||||
|
events_subsc_req_data_rm_local_var->is_usg_thres_null = is_usg_thres_null;
|
||||||
events_subsc_req_data_rm_local_var->usg_thres = usg_thres;
|
events_subsc_req_data_rm_local_var->usg_thres = usg_thres;
|
||||||
events_subsc_req_data_rm_local_var->notif_corre_id = notif_corre_id;
|
events_subsc_req_data_rm_local_var->notif_corre_id = notif_corre_id;
|
||||||
|
events_subsc_req_data_rm_local_var->is_direct_notif_ind_null = is_direct_notif_ind_null;
|
||||||
events_subsc_req_data_rm_local_var->is_direct_notif_ind = is_direct_notif_ind;
|
events_subsc_req_data_rm_local_var->is_direct_notif_ind = is_direct_notif_ind;
|
||||||
events_subsc_req_data_rm_local_var->direct_notif_ind = direct_notif_ind;
|
events_subsc_req_data_rm_local_var->direct_notif_ind = direct_notif_ind;
|
||||||
|
|
||||||
|
@ -134,6 +140,11 @@ cJSON *OpenAPI_events_subsc_req_data_rm_convertToJSON(OpenAPI_events_subsc_req_d
|
||||||
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [qos_mon]");
|
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [qos_mon]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (events_subsc_req_data_rm->is_qos_mon_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "qosMon") == NULL) {
|
||||||
|
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [qos_mon]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (events_subsc_req_data_rm->req_anis != OpenAPI_required_access_info_NULL) {
|
if (events_subsc_req_data_rm->req_anis != OpenAPI_required_access_info_NULL) {
|
||||||
|
@ -161,6 +172,11 @@ cJSON *OpenAPI_events_subsc_req_data_rm_convertToJSON(OpenAPI_events_subsc_req_d
|
||||||
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [usg_thres]");
|
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [usg_thres]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (events_subsc_req_data_rm->is_usg_thres_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "usgThres") == NULL) {
|
||||||
|
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [usg_thres]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (events_subsc_req_data_rm->notif_corre_id) {
|
if (events_subsc_req_data_rm->notif_corre_id) {
|
||||||
|
@ -175,6 +191,11 @@ cJSON *OpenAPI_events_subsc_req_data_rm_convertToJSON(OpenAPI_events_subsc_req_d
|
||||||
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [direct_notif_ind]");
|
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [direct_notif_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (events_subsc_req_data_rm->is_direct_notif_ind_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "directNotifInd") == NULL) {
|
||||||
|
ogs_error("OpenAPI_events_subsc_req_data_rm_convertToJSON() failed [direct_notif_ind]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -259,12 +280,14 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_parseFromJS
|
||||||
|
|
||||||
qos_mon = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "qosMon");
|
qos_mon = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "qosMon");
|
||||||
if (qos_mon) {
|
if (qos_mon) {
|
||||||
|
if (!cJSON_IsNull(qos_mon)) {
|
||||||
qos_mon_local_nonprim = OpenAPI_qos_monitoring_information_rm_parseFromJSON(qos_mon);
|
qos_mon_local_nonprim = OpenAPI_qos_monitoring_information_rm_parseFromJSON(qos_mon);
|
||||||
if (!qos_mon_local_nonprim) {
|
if (!qos_mon_local_nonprim) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_information_rm_parseFromJSON failed [qos_mon]");
|
ogs_error("OpenAPI_qos_monitoring_information_rm_parseFromJSON failed [qos_mon]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
req_anis = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "reqAnis");
|
req_anis = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "reqAnis");
|
||||||
if (req_anis) {
|
if (req_anis) {
|
||||||
|
@ -293,12 +316,14 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_parseFromJS
|
||||||
|
|
||||||
usg_thres = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "usgThres");
|
usg_thres = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "usgThres");
|
||||||
if (usg_thres) {
|
if (usg_thres) {
|
||||||
|
if (!cJSON_IsNull(usg_thres)) {
|
||||||
usg_thres_local_nonprim = OpenAPI_usage_threshold_rm_parseFromJSON(usg_thres);
|
usg_thres_local_nonprim = OpenAPI_usage_threshold_rm_parseFromJSON(usg_thres);
|
||||||
if (!usg_thres_local_nonprim) {
|
if (!usg_thres_local_nonprim) {
|
||||||
ogs_error("OpenAPI_usage_threshold_rm_parseFromJSON failed [usg_thres]");
|
ogs_error("OpenAPI_usage_threshold_rm_parseFromJSON failed [usg_thres]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
notif_corre_id = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "notifCorreId");
|
notif_corre_id = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "notifCorreId");
|
||||||
if (notif_corre_id) {
|
if (notif_corre_id) {
|
||||||
|
@ -310,20 +335,25 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_parseFromJS
|
||||||
|
|
||||||
direct_notif_ind = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "directNotifInd");
|
direct_notif_ind = cJSON_GetObjectItemCaseSensitive(events_subsc_req_data_rmJSON, "directNotifInd");
|
||||||
if (direct_notif_ind) {
|
if (direct_notif_ind) {
|
||||||
|
if (!cJSON_IsNull(direct_notif_ind)) {
|
||||||
if (!cJSON_IsBool(direct_notif_ind)) {
|
if (!cJSON_IsBool(direct_notif_ind)) {
|
||||||
ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON() failed [direct_notif_ind]");
|
ogs_error("OpenAPI_events_subsc_req_data_rm_parseFromJSON() failed [direct_notif_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
events_subsc_req_data_rm_local_var = OpenAPI_events_subsc_req_data_rm_create (
|
events_subsc_req_data_rm_local_var = OpenAPI_events_subsc_req_data_rm_create (
|
||||||
eventsList,
|
eventsList,
|
||||||
notif_uri && !cJSON_IsNull(notif_uri) ? ogs_strdup(notif_uri->valuestring) : NULL,
|
notif_uri && !cJSON_IsNull(notif_uri) ? ogs_strdup(notif_uri->valuestring) : NULL,
|
||||||
req_qos_mon_params ? req_qos_mon_paramsList : NULL,
|
req_qos_mon_params ? req_qos_mon_paramsList : NULL,
|
||||||
|
qos_mon && cJSON_IsNull(qos_mon) ? true : false,
|
||||||
qos_mon ? qos_mon_local_nonprim : NULL,
|
qos_mon ? qos_mon_local_nonprim : NULL,
|
||||||
req_anis ? req_anisList : NULL,
|
req_anis ? req_anisList : NULL,
|
||||||
|
usg_thres && cJSON_IsNull(usg_thres) ? true : false,
|
||||||
usg_thres ? usg_thres_local_nonprim : NULL,
|
usg_thres ? usg_thres_local_nonprim : NULL,
|
||||||
notif_corre_id && !cJSON_IsNull(notif_corre_id) ? ogs_strdup(notif_corre_id->valuestring) : NULL,
|
notif_corre_id && !cJSON_IsNull(notif_corre_id) ? ogs_strdup(notif_corre_id->valuestring) : NULL,
|
||||||
|
direct_notif_ind && cJSON_IsNull(direct_notif_ind) ? true : false,
|
||||||
direct_notif_ind ? true : false,
|
direct_notif_ind ? true : false,
|
||||||
direct_notif_ind ? direct_notif_ind->valueint : 0
|
direct_notif_ind ? direct_notif_ind->valueint : 0
|
||||||
);
|
);
|
||||||
|
|
|
@ -27,10 +27,13 @@ typedef struct OpenAPI_events_subsc_req_data_rm_s {
|
||||||
OpenAPI_list_t *events;
|
OpenAPI_list_t *events;
|
||||||
char *notif_uri;
|
char *notif_uri;
|
||||||
OpenAPI_list_t *req_qos_mon_params;
|
OpenAPI_list_t *req_qos_mon_params;
|
||||||
|
bool is_qos_mon_null;
|
||||||
struct OpenAPI_qos_monitoring_information_rm_s *qos_mon;
|
struct OpenAPI_qos_monitoring_information_rm_s *qos_mon;
|
||||||
OpenAPI_list_t *req_anis;
|
OpenAPI_list_t *req_anis;
|
||||||
|
bool is_usg_thres_null;
|
||||||
struct OpenAPI_usage_threshold_rm_s *usg_thres;
|
struct OpenAPI_usage_threshold_rm_s *usg_thres;
|
||||||
char *notif_corre_id;
|
char *notif_corre_id;
|
||||||
|
bool is_direct_notif_ind_null;
|
||||||
bool is_direct_notif_ind;
|
bool is_direct_notif_ind;
|
||||||
int direct_notif_ind;
|
int direct_notif_ind;
|
||||||
} OpenAPI_events_subsc_req_data_rm_t;
|
} OpenAPI_events_subsc_req_data_rm_t;
|
||||||
|
@ -39,10 +42,13 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_create(
|
||||||
OpenAPI_list_t *events,
|
OpenAPI_list_t *events,
|
||||||
char *notif_uri,
|
char *notif_uri,
|
||||||
OpenAPI_list_t *req_qos_mon_params,
|
OpenAPI_list_t *req_qos_mon_params,
|
||||||
|
bool is_qos_mon_null,
|
||||||
OpenAPI_qos_monitoring_information_rm_t *qos_mon,
|
OpenAPI_qos_monitoring_information_rm_t *qos_mon,
|
||||||
OpenAPI_list_t *req_anis,
|
OpenAPI_list_t *req_anis,
|
||||||
|
bool is_usg_thres_null,
|
||||||
OpenAPI_usage_threshold_rm_t *usg_thres,
|
OpenAPI_usage_threshold_rm_t *usg_thres,
|
||||||
char *notif_corre_id,
|
char *notif_corre_id,
|
||||||
|
bool is_direct_notif_ind_null,
|
||||||
bool is_direct_notif_ind,
|
bool is_direct_notif_ind,
|
||||||
int direct_notif_ind
|
int direct_notif_ind
|
||||||
);
|
);
|
||||||
|
|
|
@ -8,12 +8,15 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_create(
|
||||||
char *af_instance_id,
|
char *af_instance_id,
|
||||||
int reference_id,
|
int reference_id,
|
||||||
OpenAPI_stationary_indication_rm_t *stationary_indication,
|
OpenAPI_stationary_indication_rm_t *stationary_indication,
|
||||||
|
bool is_communication_duration_time_null,
|
||||||
bool is_communication_duration_time,
|
bool is_communication_duration_time,
|
||||||
int communication_duration_time,
|
int communication_duration_time,
|
||||||
OpenAPI_scheduled_communication_type_rm_t *scheduled_communication_type,
|
OpenAPI_scheduled_communication_type_rm_t *scheduled_communication_type,
|
||||||
|
bool is_periodic_time_null,
|
||||||
bool is_periodic_time,
|
bool is_periodic_time,
|
||||||
int periodic_time,
|
int periodic_time,
|
||||||
OpenAPI_scheduled_communication_time_rm_t *scheduled_communication_time,
|
OpenAPI_scheduled_communication_time_rm_t *scheduled_communication_time,
|
||||||
|
bool is_expected_umts_null,
|
||||||
OpenAPI_list_t *expected_umts,
|
OpenAPI_list_t *expected_umts,
|
||||||
OpenAPI_traffic_profile_rm_t *traffic_profile,
|
OpenAPI_traffic_profile_rm_t *traffic_profile,
|
||||||
OpenAPI_battery_indication_rm_t *battery_indication,
|
OpenAPI_battery_indication_rm_t *battery_indication,
|
||||||
|
@ -27,12 +30,15 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_create(
|
||||||
expected_ue_behaviour_local_var->af_instance_id = af_instance_id;
|
expected_ue_behaviour_local_var->af_instance_id = af_instance_id;
|
||||||
expected_ue_behaviour_local_var->reference_id = reference_id;
|
expected_ue_behaviour_local_var->reference_id = reference_id;
|
||||||
expected_ue_behaviour_local_var->stationary_indication = stationary_indication;
|
expected_ue_behaviour_local_var->stationary_indication = stationary_indication;
|
||||||
|
expected_ue_behaviour_local_var->is_communication_duration_time_null = is_communication_duration_time_null;
|
||||||
expected_ue_behaviour_local_var->is_communication_duration_time = is_communication_duration_time;
|
expected_ue_behaviour_local_var->is_communication_duration_time = is_communication_duration_time;
|
||||||
expected_ue_behaviour_local_var->communication_duration_time = communication_duration_time;
|
expected_ue_behaviour_local_var->communication_duration_time = communication_duration_time;
|
||||||
expected_ue_behaviour_local_var->scheduled_communication_type = scheduled_communication_type;
|
expected_ue_behaviour_local_var->scheduled_communication_type = scheduled_communication_type;
|
||||||
|
expected_ue_behaviour_local_var->is_periodic_time_null = is_periodic_time_null;
|
||||||
expected_ue_behaviour_local_var->is_periodic_time = is_periodic_time;
|
expected_ue_behaviour_local_var->is_periodic_time = is_periodic_time;
|
||||||
expected_ue_behaviour_local_var->periodic_time = periodic_time;
|
expected_ue_behaviour_local_var->periodic_time = periodic_time;
|
||||||
expected_ue_behaviour_local_var->scheduled_communication_time = scheduled_communication_time;
|
expected_ue_behaviour_local_var->scheduled_communication_time = scheduled_communication_time;
|
||||||
|
expected_ue_behaviour_local_var->is_expected_umts_null = is_expected_umts_null;
|
||||||
expected_ue_behaviour_local_var->expected_umts = expected_umts;
|
expected_ue_behaviour_local_var->expected_umts = expected_umts;
|
||||||
expected_ue_behaviour_local_var->traffic_profile = traffic_profile;
|
expected_ue_behaviour_local_var->traffic_profile = traffic_profile;
|
||||||
expected_ue_behaviour_local_var->battery_indication = battery_indication;
|
expected_ue_behaviour_local_var->battery_indication = battery_indication;
|
||||||
|
@ -134,6 +140,11 @@ cJSON *OpenAPI_expected_ue_behaviour_convertToJSON(OpenAPI_expected_ue_behaviour
|
||||||
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [communication_duration_time]");
|
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [communication_duration_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (expected_ue_behaviour->is_communication_duration_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "communicationDurationTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [communication_duration_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (expected_ue_behaviour->scheduled_communication_type) {
|
if (expected_ue_behaviour->scheduled_communication_type) {
|
||||||
|
@ -154,6 +165,11 @@ cJSON *OpenAPI_expected_ue_behaviour_convertToJSON(OpenAPI_expected_ue_behaviour
|
||||||
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [periodic_time]");
|
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [periodic_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (expected_ue_behaviour->is_periodic_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "periodicTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [periodic_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (expected_ue_behaviour->scheduled_communication_time) {
|
if (expected_ue_behaviour->scheduled_communication_time) {
|
||||||
|
@ -183,6 +199,11 @@ cJSON *OpenAPI_expected_ue_behaviour_convertToJSON(OpenAPI_expected_ue_behaviour
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(expected_umtsList, itemLocal);
|
cJSON_AddItemToArray(expected_umtsList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (expected_ue_behaviour->is_expected_umts_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "expectedUmts") == NULL) {
|
||||||
|
ogs_error("OpenAPI_expected_ue_behaviour_convertToJSON() failed [expected_umts]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (expected_ue_behaviour->traffic_profile) {
|
if (expected_ue_behaviour->traffic_profile) {
|
||||||
|
@ -282,11 +303,13 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS
|
||||||
|
|
||||||
communication_duration_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "communicationDurationTime");
|
communication_duration_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "communicationDurationTime");
|
||||||
if (communication_duration_time) {
|
if (communication_duration_time) {
|
||||||
|
if (!cJSON_IsNull(communication_duration_time)) {
|
||||||
if (!cJSON_IsNumber(communication_duration_time)) {
|
if (!cJSON_IsNumber(communication_duration_time)) {
|
||||||
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON() failed [communication_duration_time]");
|
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON() failed [communication_duration_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
scheduled_communication_type = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "scheduledCommunicationType");
|
scheduled_communication_type = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "scheduledCommunicationType");
|
||||||
if (scheduled_communication_type) {
|
if (scheduled_communication_type) {
|
||||||
|
@ -299,11 +322,13 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS
|
||||||
|
|
||||||
periodic_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "periodicTime");
|
periodic_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "periodicTime");
|
||||||
if (periodic_time) {
|
if (periodic_time) {
|
||||||
|
if (!cJSON_IsNull(periodic_time)) {
|
||||||
if (!cJSON_IsNumber(periodic_time)) {
|
if (!cJSON_IsNumber(periodic_time)) {
|
||||||
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON() failed [periodic_time]");
|
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON() failed [periodic_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
scheduled_communication_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "scheduledCommunicationTime");
|
scheduled_communication_time = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "scheduledCommunicationTime");
|
||||||
if (scheduled_communication_time) {
|
if (scheduled_communication_time) {
|
||||||
|
@ -316,6 +341,7 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS
|
||||||
|
|
||||||
expected_umts = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "expectedUmts");
|
expected_umts = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "expectedUmts");
|
||||||
if (expected_umts) {
|
if (expected_umts) {
|
||||||
|
if (!cJSON_IsNull(expected_umts)) {
|
||||||
cJSON *expected_umts_local = NULL;
|
cJSON *expected_umts_local = NULL;
|
||||||
if (!cJSON_IsArray(expected_umts)) {
|
if (!cJSON_IsArray(expected_umts)) {
|
||||||
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON() failed [expected_umts]");
|
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON() failed [expected_umts]");
|
||||||
|
@ -337,6 +363,7 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS
|
||||||
OpenAPI_list_add(expected_umtsList, expected_umtsItem);
|
OpenAPI_list_add(expected_umtsList, expected_umtsItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
traffic_profile = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "trafficProfile");
|
traffic_profile = cJSON_GetObjectItemCaseSensitive(expected_ue_behaviourJSON, "trafficProfile");
|
||||||
if (traffic_profile) {
|
if (traffic_profile) {
|
||||||
|
@ -377,12 +404,15 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS
|
||||||
|
|
||||||
reference_id->valuedouble,
|
reference_id->valuedouble,
|
||||||
stationary_indication ? stationary_indication_local_nonprim : NULL,
|
stationary_indication ? stationary_indication_local_nonprim : NULL,
|
||||||
|
communication_duration_time && cJSON_IsNull(communication_duration_time) ? true : false,
|
||||||
communication_duration_time ? true : false,
|
communication_duration_time ? true : false,
|
||||||
communication_duration_time ? communication_duration_time->valuedouble : 0,
|
communication_duration_time ? communication_duration_time->valuedouble : 0,
|
||||||
scheduled_communication_type ? scheduled_communication_type_local_nonprim : NULL,
|
scheduled_communication_type ? scheduled_communication_type_local_nonprim : NULL,
|
||||||
|
periodic_time && cJSON_IsNull(periodic_time) ? true : false,
|
||||||
periodic_time ? true : false,
|
periodic_time ? true : false,
|
||||||
periodic_time ? periodic_time->valuedouble : 0,
|
periodic_time ? periodic_time->valuedouble : 0,
|
||||||
scheduled_communication_time ? scheduled_communication_time_local_nonprim : NULL,
|
scheduled_communication_time ? scheduled_communication_time_local_nonprim : NULL,
|
||||||
|
expected_umts && cJSON_IsNull(expected_umts) ? true : false,
|
||||||
expected_umts ? expected_umtsList : NULL,
|
expected_umts ? expected_umtsList : NULL,
|
||||||
traffic_profile ? traffic_profile_local_nonprim : NULL,
|
traffic_profile ? traffic_profile_local_nonprim : NULL,
|
||||||
battery_indication ? battery_indication_local_nonprim : NULL,
|
battery_indication ? battery_indication_local_nonprim : NULL,
|
||||||
|
|
|
@ -28,12 +28,15 @@ typedef struct OpenAPI_expected_ue_behaviour_s {
|
||||||
char *af_instance_id;
|
char *af_instance_id;
|
||||||
int reference_id;
|
int reference_id;
|
||||||
struct OpenAPI_stationary_indication_rm_s *stationary_indication;
|
struct OpenAPI_stationary_indication_rm_s *stationary_indication;
|
||||||
|
bool is_communication_duration_time_null;
|
||||||
bool is_communication_duration_time;
|
bool is_communication_duration_time;
|
||||||
int communication_duration_time;
|
int communication_duration_time;
|
||||||
struct OpenAPI_scheduled_communication_type_rm_s *scheduled_communication_type;
|
struct OpenAPI_scheduled_communication_type_rm_s *scheduled_communication_type;
|
||||||
|
bool is_periodic_time_null;
|
||||||
bool is_periodic_time;
|
bool is_periodic_time;
|
||||||
int periodic_time;
|
int periodic_time;
|
||||||
struct OpenAPI_scheduled_communication_time_rm_s *scheduled_communication_time;
|
struct OpenAPI_scheduled_communication_time_rm_s *scheduled_communication_time;
|
||||||
|
bool is_expected_umts_null;
|
||||||
OpenAPI_list_t *expected_umts;
|
OpenAPI_list_t *expected_umts;
|
||||||
struct OpenAPI_traffic_profile_rm_s *traffic_profile;
|
struct OpenAPI_traffic_profile_rm_s *traffic_profile;
|
||||||
struct OpenAPI_battery_indication_rm_s *battery_indication;
|
struct OpenAPI_battery_indication_rm_s *battery_indication;
|
||||||
|
@ -45,12 +48,15 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_create(
|
||||||
char *af_instance_id,
|
char *af_instance_id,
|
||||||
int reference_id,
|
int reference_id,
|
||||||
OpenAPI_stationary_indication_rm_t *stationary_indication,
|
OpenAPI_stationary_indication_rm_t *stationary_indication,
|
||||||
|
bool is_communication_duration_time_null,
|
||||||
bool is_communication_duration_time,
|
bool is_communication_duration_time,
|
||||||
int communication_duration_time,
|
int communication_duration_time,
|
||||||
OpenAPI_scheduled_communication_type_rm_t *scheduled_communication_type,
|
OpenAPI_scheduled_communication_type_rm_t *scheduled_communication_type,
|
||||||
|
bool is_periodic_time_null,
|
||||||
bool is_periodic_time,
|
bool is_periodic_time,
|
||||||
int periodic_time,
|
int periodic_time,
|
||||||
OpenAPI_scheduled_communication_time_rm_t *scheduled_communication_time,
|
OpenAPI_scheduled_communication_time_rm_t *scheduled_communication_time,
|
||||||
|
bool is_expected_umts_null,
|
||||||
OpenAPI_list_t *expected_umts,
|
OpenAPI_list_t *expected_umts,
|
||||||
OpenAPI_traffic_profile_rm_t *traffic_profile,
|
OpenAPI_traffic_profile_rm_t *traffic_profile,
|
||||||
OpenAPI_battery_indication_rm_t *battery_indication,
|
OpenAPI_battery_indication_rm_t *battery_indication,
|
||||||
|
|
|
@ -10,8 +10,11 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_create(
|
||||||
char *pack_filt_id,
|
char *pack_filt_id,
|
||||||
bool is_packet_filter_usage,
|
bool is_packet_filter_usage,
|
||||||
int packet_filter_usage,
|
int packet_filter_usage,
|
||||||
|
bool is_tos_traffic_class_null,
|
||||||
char *tos_traffic_class,
|
char *tos_traffic_class,
|
||||||
|
bool is_spi_null,
|
||||||
char *spi,
|
char *spi,
|
||||||
|
bool is_flow_label_null,
|
||||||
char *flow_label,
|
char *flow_label,
|
||||||
OpenAPI_flow_direction_e flow_direction
|
OpenAPI_flow_direction_e flow_direction
|
||||||
)
|
)
|
||||||
|
@ -24,8 +27,11 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_create(
|
||||||
flow_information_local_var->pack_filt_id = pack_filt_id;
|
flow_information_local_var->pack_filt_id = pack_filt_id;
|
||||||
flow_information_local_var->is_packet_filter_usage = is_packet_filter_usage;
|
flow_information_local_var->is_packet_filter_usage = is_packet_filter_usage;
|
||||||
flow_information_local_var->packet_filter_usage = packet_filter_usage;
|
flow_information_local_var->packet_filter_usage = packet_filter_usage;
|
||||||
|
flow_information_local_var->is_tos_traffic_class_null = is_tos_traffic_class_null;
|
||||||
flow_information_local_var->tos_traffic_class = tos_traffic_class;
|
flow_information_local_var->tos_traffic_class = tos_traffic_class;
|
||||||
|
flow_information_local_var->is_spi_null = is_spi_null;
|
||||||
flow_information_local_var->spi = spi;
|
flow_information_local_var->spi = spi;
|
||||||
|
flow_information_local_var->is_flow_label_null = is_flow_label_null;
|
||||||
flow_information_local_var->flow_label = flow_label;
|
flow_information_local_var->flow_label = flow_label;
|
||||||
flow_information_local_var->flow_direction = flow_direction;
|
flow_information_local_var->flow_direction = flow_direction;
|
||||||
|
|
||||||
|
@ -116,6 +122,11 @@ cJSON *OpenAPI_flow_information_convertToJSON(OpenAPI_flow_information_t *flow_i
|
||||||
ogs_error("OpenAPI_flow_information_convertToJSON() failed [tos_traffic_class]");
|
ogs_error("OpenAPI_flow_information_convertToJSON() failed [tos_traffic_class]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (flow_information->is_tos_traffic_class_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tosTrafficClass") == NULL) {
|
||||||
|
ogs_error("OpenAPI_flow_information_convertToJSON() failed [tos_traffic_class]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flow_information->spi) {
|
if (flow_information->spi) {
|
||||||
|
@ -123,6 +134,11 @@ cJSON *OpenAPI_flow_information_convertToJSON(OpenAPI_flow_information_t *flow_i
|
||||||
ogs_error("OpenAPI_flow_information_convertToJSON() failed [spi]");
|
ogs_error("OpenAPI_flow_information_convertToJSON() failed [spi]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (flow_information->is_spi_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "spi") == NULL) {
|
||||||
|
ogs_error("OpenAPI_flow_information_convertToJSON() failed [spi]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flow_information->flow_label) {
|
if (flow_information->flow_label) {
|
||||||
|
@ -130,6 +146,11 @@ cJSON *OpenAPI_flow_information_convertToJSON(OpenAPI_flow_information_t *flow_i
|
||||||
ogs_error("OpenAPI_flow_information_convertToJSON() failed [flow_label]");
|
ogs_error("OpenAPI_flow_information_convertToJSON() failed [flow_label]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (flow_information->is_flow_label_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "flowLabel") == NULL) {
|
||||||
|
ogs_error("OpenAPI_flow_information_convertToJSON() failed [flow_label]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flow_information->flow_direction != OpenAPI_flow_direction_NULL) {
|
if (flow_information->flow_direction != OpenAPI_flow_direction_NULL) {
|
||||||
|
@ -192,27 +213,33 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_parseFromJSON(cJSON *flow_i
|
||||||
|
|
||||||
tos_traffic_class = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "tosTrafficClass");
|
tos_traffic_class = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "tosTrafficClass");
|
||||||
if (tos_traffic_class) {
|
if (tos_traffic_class) {
|
||||||
|
if (!cJSON_IsNull(tos_traffic_class)) {
|
||||||
if (!cJSON_IsString(tos_traffic_class) && !cJSON_IsNull(tos_traffic_class)) {
|
if (!cJSON_IsString(tos_traffic_class) && !cJSON_IsNull(tos_traffic_class)) {
|
||||||
ogs_error("OpenAPI_flow_information_parseFromJSON() failed [tos_traffic_class]");
|
ogs_error("OpenAPI_flow_information_parseFromJSON() failed [tos_traffic_class]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
spi = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "spi");
|
spi = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "spi");
|
||||||
if (spi) {
|
if (spi) {
|
||||||
|
if (!cJSON_IsNull(spi)) {
|
||||||
if (!cJSON_IsString(spi) && !cJSON_IsNull(spi)) {
|
if (!cJSON_IsString(spi) && !cJSON_IsNull(spi)) {
|
||||||
ogs_error("OpenAPI_flow_information_parseFromJSON() failed [spi]");
|
ogs_error("OpenAPI_flow_information_parseFromJSON() failed [spi]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
flow_label = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "flowLabel");
|
flow_label = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "flowLabel");
|
||||||
if (flow_label) {
|
if (flow_label) {
|
||||||
|
if (!cJSON_IsNull(flow_label)) {
|
||||||
if (!cJSON_IsString(flow_label) && !cJSON_IsNull(flow_label)) {
|
if (!cJSON_IsString(flow_label) && !cJSON_IsNull(flow_label)) {
|
||||||
ogs_error("OpenAPI_flow_information_parseFromJSON() failed [flow_label]");
|
ogs_error("OpenAPI_flow_information_parseFromJSON() failed [flow_label]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
flow_direction = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "flowDirection");
|
flow_direction = cJSON_GetObjectItemCaseSensitive(flow_informationJSON, "flowDirection");
|
||||||
if (flow_direction) {
|
if (flow_direction) {
|
||||||
|
@ -229,8 +256,11 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_parseFromJSON(cJSON *flow_i
|
||||||
pack_filt_id && !cJSON_IsNull(pack_filt_id) ? ogs_strdup(pack_filt_id->valuestring) : NULL,
|
pack_filt_id && !cJSON_IsNull(pack_filt_id) ? ogs_strdup(pack_filt_id->valuestring) : NULL,
|
||||||
packet_filter_usage ? true : false,
|
packet_filter_usage ? true : false,
|
||||||
packet_filter_usage ? packet_filter_usage->valueint : 0,
|
packet_filter_usage ? packet_filter_usage->valueint : 0,
|
||||||
|
tos_traffic_class && cJSON_IsNull(tos_traffic_class) ? true : false,
|
||||||
tos_traffic_class && !cJSON_IsNull(tos_traffic_class) ? ogs_strdup(tos_traffic_class->valuestring) : NULL,
|
tos_traffic_class && !cJSON_IsNull(tos_traffic_class) ? ogs_strdup(tos_traffic_class->valuestring) : NULL,
|
||||||
|
spi && cJSON_IsNull(spi) ? true : false,
|
||||||
spi && !cJSON_IsNull(spi) ? ogs_strdup(spi->valuestring) : NULL,
|
spi && !cJSON_IsNull(spi) ? ogs_strdup(spi->valuestring) : NULL,
|
||||||
|
flow_label && cJSON_IsNull(flow_label) ? true : false,
|
||||||
flow_label && !cJSON_IsNull(flow_label) ? ogs_strdup(flow_label->valuestring) : NULL,
|
flow_label && !cJSON_IsNull(flow_label) ? ogs_strdup(flow_label->valuestring) : NULL,
|
||||||
flow_direction ? flow_directionVariable : 0
|
flow_direction ? flow_directionVariable : 0
|
||||||
);
|
);
|
||||||
|
|
|
@ -26,8 +26,11 @@ typedef struct OpenAPI_flow_information_s {
|
||||||
char *pack_filt_id;
|
char *pack_filt_id;
|
||||||
bool is_packet_filter_usage;
|
bool is_packet_filter_usage;
|
||||||
int packet_filter_usage;
|
int packet_filter_usage;
|
||||||
|
bool is_tos_traffic_class_null;
|
||||||
char *tos_traffic_class;
|
char *tos_traffic_class;
|
||||||
|
bool is_spi_null;
|
||||||
char *spi;
|
char *spi;
|
||||||
|
bool is_flow_label_null;
|
||||||
char *flow_label;
|
char *flow_label;
|
||||||
OpenAPI_flow_direction_e flow_direction;
|
OpenAPI_flow_direction_e flow_direction;
|
||||||
} OpenAPI_flow_information_t;
|
} OpenAPI_flow_information_t;
|
||||||
|
@ -38,8 +41,11 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_create(
|
||||||
char *pack_filt_id,
|
char *pack_filt_id,
|
||||||
bool is_packet_filter_usage,
|
bool is_packet_filter_usage,
|
||||||
int packet_filter_usage,
|
int packet_filter_usage,
|
||||||
|
bool is_tos_traffic_class_null,
|
||||||
char *tos_traffic_class,
|
char *tos_traffic_class,
|
||||||
|
bool is_spi_null,
|
||||||
char *spi,
|
char *spi,
|
||||||
|
bool is_flow_label_null,
|
||||||
char *flow_label,
|
char *flow_label,
|
||||||
OpenAPI_flow_direction_e flow_direction
|
OpenAPI_flow_direction_e flow_direction
|
||||||
);
|
);
|
||||||
|
|
|
@ -82,6 +82,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create(
|
||||||
char *ismf_pdu_session_uri,
|
char *ismf_pdu_session_uri,
|
||||||
char *ismf_id,
|
char *ismf_id,
|
||||||
char *i_smf_service_instance_id,
|
char *i_smf_service_instance_id,
|
||||||
|
bool is_dl_serving_plmn_rate_ctl_null,
|
||||||
bool is_dl_serving_plmn_rate_ctl,
|
bool is_dl_serving_plmn_rate_ctl,
|
||||||
int dl_serving_plmn_rate_ctl,
|
int dl_serving_plmn_rate_ctl,
|
||||||
OpenAPI_list_t *dnai_list,
|
OpenAPI_list_t *dnai_list,
|
||||||
|
@ -95,6 +96,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create(
|
||||||
OpenAPI_guami_t *guami,
|
OpenAPI_guami_t *guami,
|
||||||
OpenAPI_list_t *secondary_rat_usage_data_report_container,
|
OpenAPI_list_t *secondary_rat_usage_data_report_container,
|
||||||
OpenAPI_hsmf_update_data_sm_policy_notify_ind_e sm_policy_notify_ind,
|
OpenAPI_hsmf_update_data_sm_policy_notify_ind_e sm_policy_notify_ind,
|
||||||
|
bool is_pcf_ue_callback_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
||||||
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
||||||
OpenAPI_max_integrity_protected_data_rate_e max_integrity_protected_data_rate_ul,
|
OpenAPI_max_integrity_protected_data_rate_e max_integrity_protected_data_rate_ul,
|
||||||
|
@ -159,6 +161,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create(
|
||||||
hsmf_update_data_local_var->ismf_pdu_session_uri = ismf_pdu_session_uri;
|
hsmf_update_data_local_var->ismf_pdu_session_uri = ismf_pdu_session_uri;
|
||||||
hsmf_update_data_local_var->ismf_id = ismf_id;
|
hsmf_update_data_local_var->ismf_id = ismf_id;
|
||||||
hsmf_update_data_local_var->i_smf_service_instance_id = i_smf_service_instance_id;
|
hsmf_update_data_local_var->i_smf_service_instance_id = i_smf_service_instance_id;
|
||||||
|
hsmf_update_data_local_var->is_dl_serving_plmn_rate_ctl_null = is_dl_serving_plmn_rate_ctl_null;
|
||||||
hsmf_update_data_local_var->is_dl_serving_plmn_rate_ctl = is_dl_serving_plmn_rate_ctl;
|
hsmf_update_data_local_var->is_dl_serving_plmn_rate_ctl = is_dl_serving_plmn_rate_ctl;
|
||||||
hsmf_update_data_local_var->dl_serving_plmn_rate_ctl = dl_serving_plmn_rate_ctl;
|
hsmf_update_data_local_var->dl_serving_plmn_rate_ctl = dl_serving_plmn_rate_ctl;
|
||||||
hsmf_update_data_local_var->dnai_list = dnai_list;
|
hsmf_update_data_local_var->dnai_list = dnai_list;
|
||||||
|
@ -172,6 +175,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create(
|
||||||
hsmf_update_data_local_var->guami = guami;
|
hsmf_update_data_local_var->guami = guami;
|
||||||
hsmf_update_data_local_var->secondary_rat_usage_data_report_container = secondary_rat_usage_data_report_container;
|
hsmf_update_data_local_var->secondary_rat_usage_data_report_container = secondary_rat_usage_data_report_container;
|
||||||
hsmf_update_data_local_var->sm_policy_notify_ind = sm_policy_notify_ind;
|
hsmf_update_data_local_var->sm_policy_notify_ind = sm_policy_notify_ind;
|
||||||
|
hsmf_update_data_local_var->is_pcf_ue_callback_info_null = is_pcf_ue_callback_info_null;
|
||||||
hsmf_update_data_local_var->pcf_ue_callback_info = pcf_ue_callback_info;
|
hsmf_update_data_local_var->pcf_ue_callback_info = pcf_ue_callback_info;
|
||||||
hsmf_update_data_local_var->satellite_backhaul_cat = satellite_backhaul_cat;
|
hsmf_update_data_local_var->satellite_backhaul_cat = satellite_backhaul_cat;
|
||||||
hsmf_update_data_local_var->max_integrity_protected_data_rate_ul = max_integrity_protected_data_rate_ul;
|
hsmf_update_data_local_var->max_integrity_protected_data_rate_ul = max_integrity_protected_data_rate_ul;
|
||||||
|
@ -875,6 +879,11 @@ cJSON *OpenAPI_hsmf_update_data_convertToJSON(OpenAPI_hsmf_update_data_t *hsmf_u
|
||||||
ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed [dl_serving_plmn_rate_ctl]");
|
ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed [dl_serving_plmn_rate_ctl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (hsmf_update_data->is_dl_serving_plmn_rate_ctl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "dlServingPlmnRateCtl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed [dl_serving_plmn_rate_ctl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hsmf_update_data->dnai_list) {
|
if (hsmf_update_data->dnai_list) {
|
||||||
|
@ -1015,6 +1024,11 @@ cJSON *OpenAPI_hsmf_update_data_convertToJSON(OpenAPI_hsmf_update_data_t *hsmf_u
|
||||||
ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed [pcf_ue_callback_info]");
|
ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed [pcf_ue_callback_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (hsmf_update_data->is_pcf_ue_callback_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "pcfUeCallbackInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_hsmf_update_data_convertToJSON() failed [pcf_ue_callback_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hsmf_update_data->satellite_backhaul_cat != OpenAPI_satellite_backhaul_category_NULL) {
|
if (hsmf_update_data->satellite_backhaul_cat != OpenAPI_satellite_backhaul_category_NULL) {
|
||||||
|
@ -1688,11 +1702,13 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u
|
||||||
|
|
||||||
dl_serving_plmn_rate_ctl = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "dlServingPlmnRateCtl");
|
dl_serving_plmn_rate_ctl = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "dlServingPlmnRateCtl");
|
||||||
if (dl_serving_plmn_rate_ctl) {
|
if (dl_serving_plmn_rate_ctl) {
|
||||||
|
if (!cJSON_IsNull(dl_serving_plmn_rate_ctl)) {
|
||||||
if (!cJSON_IsNumber(dl_serving_plmn_rate_ctl)) {
|
if (!cJSON_IsNumber(dl_serving_plmn_rate_ctl)) {
|
||||||
ogs_error("OpenAPI_hsmf_update_data_parseFromJSON() failed [dl_serving_plmn_rate_ctl]");
|
ogs_error("OpenAPI_hsmf_update_data_parseFromJSON() failed [dl_serving_plmn_rate_ctl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dnai_list = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "dnaiList");
|
dnai_list = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "dnaiList");
|
||||||
if (dnai_list) {
|
if (dnai_list) {
|
||||||
|
@ -1817,12 +1833,14 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u
|
||||||
|
|
||||||
pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "pcfUeCallbackInfo");
|
pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "pcfUeCallbackInfo");
|
||||||
if (pcf_ue_callback_info) {
|
if (pcf_ue_callback_info) {
|
||||||
|
if (!cJSON_IsNull(pcf_ue_callback_info)) {
|
||||||
pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info);
|
pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info);
|
||||||
if (!pcf_ue_callback_info_local_nonprim) {
|
if (!pcf_ue_callback_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_callback_info]");
|
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_callback_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "satelliteBackhaulCat");
|
satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(hsmf_update_dataJSON, "satelliteBackhaulCat");
|
||||||
if (satellite_backhaul_cat) {
|
if (satellite_backhaul_cat) {
|
||||||
|
@ -1915,6 +1933,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u
|
||||||
ismf_pdu_session_uri && !cJSON_IsNull(ismf_pdu_session_uri) ? ogs_strdup(ismf_pdu_session_uri->valuestring) : NULL,
|
ismf_pdu_session_uri && !cJSON_IsNull(ismf_pdu_session_uri) ? ogs_strdup(ismf_pdu_session_uri->valuestring) : NULL,
|
||||||
ismf_id && !cJSON_IsNull(ismf_id) ? ogs_strdup(ismf_id->valuestring) : NULL,
|
ismf_id && !cJSON_IsNull(ismf_id) ? ogs_strdup(ismf_id->valuestring) : NULL,
|
||||||
i_smf_service_instance_id && !cJSON_IsNull(i_smf_service_instance_id) ? ogs_strdup(i_smf_service_instance_id->valuestring) : NULL,
|
i_smf_service_instance_id && !cJSON_IsNull(i_smf_service_instance_id) ? ogs_strdup(i_smf_service_instance_id->valuestring) : NULL,
|
||||||
|
dl_serving_plmn_rate_ctl && cJSON_IsNull(dl_serving_plmn_rate_ctl) ? true : false,
|
||||||
dl_serving_plmn_rate_ctl ? true : false,
|
dl_serving_plmn_rate_ctl ? true : false,
|
||||||
dl_serving_plmn_rate_ctl ? dl_serving_plmn_rate_ctl->valuedouble : 0,
|
dl_serving_plmn_rate_ctl ? dl_serving_plmn_rate_ctl->valuedouble : 0,
|
||||||
dnai_list ? dnai_listList : NULL,
|
dnai_list ? dnai_listList : NULL,
|
||||||
|
@ -1928,6 +1947,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u
|
||||||
guami ? guami_local_nonprim : NULL,
|
guami ? guami_local_nonprim : NULL,
|
||||||
secondary_rat_usage_data_report_container ? secondary_rat_usage_data_report_containerList : NULL,
|
secondary_rat_usage_data_report_container ? secondary_rat_usage_data_report_containerList : NULL,
|
||||||
sm_policy_notify_ind ? sm_policy_notify_indVariable : 0,
|
sm_policy_notify_ind ? sm_policy_notify_indVariable : 0,
|
||||||
|
pcf_ue_callback_info && cJSON_IsNull(pcf_ue_callback_info) ? true : false,
|
||||||
pcf_ue_callback_info ? pcf_ue_callback_info_local_nonprim : NULL,
|
pcf_ue_callback_info ? pcf_ue_callback_info_local_nonprim : NULL,
|
||||||
satellite_backhaul_cat ? satellite_backhaul_catVariable : 0,
|
satellite_backhaul_cat ? satellite_backhaul_catVariable : 0,
|
||||||
max_integrity_protected_data_rate_ul ? max_integrity_protected_data_rate_ulVariable : 0,
|
max_integrity_protected_data_rate_ul ? max_integrity_protected_data_rate_ulVariable : 0,
|
||||||
|
|
|
@ -109,6 +109,7 @@ typedef struct OpenAPI_hsmf_update_data_s {
|
||||||
char *ismf_pdu_session_uri;
|
char *ismf_pdu_session_uri;
|
||||||
char *ismf_id;
|
char *ismf_id;
|
||||||
char *i_smf_service_instance_id;
|
char *i_smf_service_instance_id;
|
||||||
|
bool is_dl_serving_plmn_rate_ctl_null;
|
||||||
bool is_dl_serving_plmn_rate_ctl;
|
bool is_dl_serving_plmn_rate_ctl;
|
||||||
int dl_serving_plmn_rate_ctl;
|
int dl_serving_plmn_rate_ctl;
|
||||||
OpenAPI_list_t *dnai_list;
|
OpenAPI_list_t *dnai_list;
|
||||||
|
@ -122,6 +123,7 @@ typedef struct OpenAPI_hsmf_update_data_s {
|
||||||
struct OpenAPI_guami_s *guami;
|
struct OpenAPI_guami_s *guami;
|
||||||
OpenAPI_list_t *secondary_rat_usage_data_report_container;
|
OpenAPI_list_t *secondary_rat_usage_data_report_container;
|
||||||
OpenAPI_hsmf_update_data_sm_policy_notify_ind_e sm_policy_notify_ind;
|
OpenAPI_hsmf_update_data_sm_policy_notify_ind_e sm_policy_notify_ind;
|
||||||
|
bool is_pcf_ue_callback_info_null;
|
||||||
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_callback_info;
|
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_callback_info;
|
||||||
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat;
|
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat;
|
||||||
OpenAPI_max_integrity_protected_data_rate_e max_integrity_protected_data_rate_ul;
|
OpenAPI_max_integrity_protected_data_rate_e max_integrity_protected_data_rate_ul;
|
||||||
|
@ -184,6 +186,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create(
|
||||||
char *ismf_pdu_session_uri,
|
char *ismf_pdu_session_uri,
|
||||||
char *ismf_id,
|
char *ismf_id,
|
||||||
char *i_smf_service_instance_id,
|
char *i_smf_service_instance_id,
|
||||||
|
bool is_dl_serving_plmn_rate_ctl_null,
|
||||||
bool is_dl_serving_plmn_rate_ctl,
|
bool is_dl_serving_plmn_rate_ctl,
|
||||||
int dl_serving_plmn_rate_ctl,
|
int dl_serving_plmn_rate_ctl,
|
||||||
OpenAPI_list_t *dnai_list,
|
OpenAPI_list_t *dnai_list,
|
||||||
|
@ -197,6 +200,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_create(
|
||||||
OpenAPI_guami_t *guami,
|
OpenAPI_guami_t *guami,
|
||||||
OpenAPI_list_t *secondary_rat_usage_data_report_container,
|
OpenAPI_list_t *secondary_rat_usage_data_report_container,
|
||||||
OpenAPI_hsmf_update_data_sm_policy_notify_ind_e sm_policy_notify_ind,
|
OpenAPI_hsmf_update_data_sm_policy_notify_ind_e sm_policy_notify_ind,
|
||||||
|
bool is_pcf_ue_callback_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
||||||
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
||||||
OpenAPI_max_integrity_protected_data_rate_e max_integrity_protected_data_rate_ul,
|
OpenAPI_max_integrity_protected_data_rate_e max_integrity_protected_data_rate_ul,
|
||||||
|
|
|
@ -12,6 +12,7 @@ OpenAPI_immediate_report_t *OpenAPI_immediate_report_create(
|
||||||
OpenAPI_ue_context_in_smsf_data_t *uec_smsf_data,
|
OpenAPI_ue_context_in_smsf_data_t *uec_smsf_data,
|
||||||
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
||||||
OpenAPI_sm_subs_data_t *sm_data,
|
OpenAPI_sm_subs_data_t *sm_data,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
||||||
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
||||||
|
@ -33,6 +34,7 @@ OpenAPI_immediate_report_t *OpenAPI_immediate_report_create(
|
||||||
immediate_report_local_var->uec_smsf_data = uec_smsf_data;
|
immediate_report_local_var->uec_smsf_data = uec_smsf_data;
|
||||||
immediate_report_local_var->sms_subs_data = sms_subs_data;
|
immediate_report_local_var->sms_subs_data = sms_subs_data;
|
||||||
immediate_report_local_var->sm_data = sm_data;
|
immediate_report_local_var->sm_data = sm_data;
|
||||||
|
immediate_report_local_var->is_trace_data_null = is_trace_data_null;
|
||||||
immediate_report_local_var->trace_data = trace_data;
|
immediate_report_local_var->trace_data = trace_data;
|
||||||
immediate_report_local_var->sms_mng_data = sms_mng_data;
|
immediate_report_local_var->sms_mng_data = sms_mng_data;
|
||||||
immediate_report_local_var->lcs_privacy_data = lcs_privacy_data;
|
immediate_report_local_var->lcs_privacy_data = lcs_privacy_data;
|
||||||
|
@ -233,6 +235,11 @@ cJSON *OpenAPI_immediate_report_convertToJSON(OpenAPI_immediate_report_t *immedi
|
||||||
ogs_error("OpenAPI_immediate_report_convertToJSON() failed [trace_data]");
|
ogs_error("OpenAPI_immediate_report_convertToJSON() failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (immediate_report->is_trace_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_immediate_report_convertToJSON() failed [trace_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (immediate_report->sms_mng_data) {
|
if (immediate_report->sms_mng_data) {
|
||||||
|
@ -444,12 +451,14 @@ OpenAPI_immediate_report_t *OpenAPI_immediate_report_parseFromJSON(cJSON *immedi
|
||||||
|
|
||||||
trace_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "traceData");
|
trace_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "traceData");
|
||||||
if (trace_data) {
|
if (trace_data) {
|
||||||
|
if (!cJSON_IsNull(trace_data)) {
|
||||||
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
||||||
if (!trace_data_local_nonprim) {
|
if (!trace_data_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sms_mng_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "smsMngData");
|
sms_mng_data = cJSON_GetObjectItemCaseSensitive(immediate_reportJSON, "smsMngData");
|
||||||
if (sms_mng_data) {
|
if (sms_mng_data) {
|
||||||
|
@ -531,6 +540,7 @@ OpenAPI_immediate_report_t *OpenAPI_immediate_report_parseFromJSON(cJSON *immedi
|
||||||
uec_smsf_data ? uec_smsf_data_local_nonprim : NULL,
|
uec_smsf_data ? uec_smsf_data_local_nonprim : NULL,
|
||||||
sms_subs_data ? sms_subs_data_local_nonprim : NULL,
|
sms_subs_data ? sms_subs_data_local_nonprim : NULL,
|
||||||
sm_data ? sm_data_local_nonprim : NULL,
|
sm_data ? sm_data_local_nonprim : NULL,
|
||||||
|
trace_data && cJSON_IsNull(trace_data) ? true : false,
|
||||||
trace_data ? trace_data_local_nonprim : NULL,
|
trace_data ? trace_data_local_nonprim : NULL,
|
||||||
sms_mng_data ? sms_mng_data_local_nonprim : NULL,
|
sms_mng_data ? sms_mng_data_local_nonprim : NULL,
|
||||||
lcs_privacy_data ? lcs_privacy_data_local_nonprim : NULL,
|
lcs_privacy_data ? lcs_privacy_data_local_nonprim : NULL,
|
||||||
|
|
|
@ -44,6 +44,7 @@ typedef struct OpenAPI_immediate_report_s {
|
||||||
struct OpenAPI_ue_context_in_smsf_data_s *uec_smsf_data;
|
struct OpenAPI_ue_context_in_smsf_data_s *uec_smsf_data;
|
||||||
struct OpenAPI_sms_subscription_data_s *sms_subs_data;
|
struct OpenAPI_sms_subscription_data_s *sms_subs_data;
|
||||||
struct OpenAPI_sm_subs_data_s *sm_data;
|
struct OpenAPI_sm_subs_data_s *sm_data;
|
||||||
|
bool is_trace_data_null;
|
||||||
struct OpenAPI_trace_data_s *trace_data;
|
struct OpenAPI_trace_data_s *trace_data;
|
||||||
struct OpenAPI_sms_management_subscription_data_s *sms_mng_data;
|
struct OpenAPI_sms_management_subscription_data_s *sms_mng_data;
|
||||||
struct OpenAPI_lcs_privacy_data_s *lcs_privacy_data;
|
struct OpenAPI_lcs_privacy_data_s *lcs_privacy_data;
|
||||||
|
@ -63,6 +64,7 @@ OpenAPI_immediate_report_t *OpenAPI_immediate_report_create(
|
||||||
OpenAPI_ue_context_in_smsf_data_t *uec_smsf_data,
|
OpenAPI_ue_context_in_smsf_data_t *uec_smsf_data,
|
||||||
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
||||||
OpenAPI_sm_subs_data_t *sm_data,
|
OpenAPI_sm_subs_data_t *sm_data,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
||||||
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_create(
|
OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_create(
|
||||||
char *supi,
|
char *supi,
|
||||||
|
bool is_inter_group_id_null,
|
||||||
OpenAPI_any_type_t *inter_group_id,
|
OpenAPI_any_type_t *inter_group_id,
|
||||||
char *dnn,
|
char *dnn,
|
||||||
OpenAPI_snssai_t *snssai,
|
OpenAPI_snssai_t *snssai,
|
||||||
|
@ -20,6 +21,7 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_create(
|
||||||
ogs_assert(iptv_config_data_local_var);
|
ogs_assert(iptv_config_data_local_var);
|
||||||
|
|
||||||
iptv_config_data_local_var->supi = supi;
|
iptv_config_data_local_var->supi = supi;
|
||||||
|
iptv_config_data_local_var->is_inter_group_id_null = is_inter_group_id_null;
|
||||||
iptv_config_data_local_var->inter_group_id = inter_group_id;
|
iptv_config_data_local_var->inter_group_id = inter_group_id;
|
||||||
iptv_config_data_local_var->dnn = dnn;
|
iptv_config_data_local_var->dnn = dnn;
|
||||||
iptv_config_data_local_var->snssai = snssai;
|
iptv_config_data_local_var->snssai = snssai;
|
||||||
|
@ -116,6 +118,11 @@ cJSON *OpenAPI_iptv_config_data_convertToJSON(OpenAPI_iptv_config_data_t *iptv_c
|
||||||
ogs_error("OpenAPI_iptv_config_data_convertToJSON() failed [inter_group_id]");
|
ogs_error("OpenAPI_iptv_config_data_convertToJSON() failed [inter_group_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (iptv_config_data->is_inter_group_id_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "interGroupId") == NULL) {
|
||||||
|
ogs_error("OpenAPI_iptv_config_data_convertToJSON() failed [inter_group_id]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (iptv_config_data->dnn) {
|
if (iptv_config_data->dnn) {
|
||||||
|
@ -238,8 +245,10 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_parseFromJSON(cJSON *iptv_c
|
||||||
|
|
||||||
inter_group_id = cJSON_GetObjectItemCaseSensitive(iptv_config_dataJSON, "interGroupId");
|
inter_group_id = cJSON_GetObjectItemCaseSensitive(iptv_config_dataJSON, "interGroupId");
|
||||||
if (inter_group_id) {
|
if (inter_group_id) {
|
||||||
|
if (!cJSON_IsNull(inter_group_id)) {
|
||||||
inter_group_id_local_object = OpenAPI_any_type_parseFromJSON(inter_group_id);
|
inter_group_id_local_object = OpenAPI_any_type_parseFromJSON(inter_group_id);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dnn = cJSON_GetObjectItemCaseSensitive(iptv_config_dataJSON, "dnn");
|
dnn = cJSON_GetObjectItemCaseSensitive(iptv_config_dataJSON, "dnn");
|
||||||
if (dnn) {
|
if (dnn) {
|
||||||
|
@ -335,6 +344,7 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_parseFromJSON(cJSON *iptv_c
|
||||||
|
|
||||||
iptv_config_data_local_var = OpenAPI_iptv_config_data_create (
|
iptv_config_data_local_var = OpenAPI_iptv_config_data_create (
|
||||||
supi && !cJSON_IsNull(supi) ? ogs_strdup(supi->valuestring) : NULL,
|
supi && !cJSON_IsNull(supi) ? ogs_strdup(supi->valuestring) : NULL,
|
||||||
|
inter_group_id && cJSON_IsNull(inter_group_id) ? true : false,
|
||||||
inter_group_id ? inter_group_id_local_object : NULL,
|
inter_group_id ? inter_group_id_local_object : NULL,
|
||||||
dnn && !cJSON_IsNull(dnn) ? ogs_strdup(dnn->valuestring) : NULL,
|
dnn && !cJSON_IsNull(dnn) ? ogs_strdup(dnn->valuestring) : NULL,
|
||||||
snssai ? snssai_local_nonprim : NULL,
|
snssai ? snssai_local_nonprim : NULL,
|
||||||
|
|
|
@ -23,6 +23,7 @@ extern "C" {
|
||||||
typedef struct OpenAPI_iptv_config_data_s OpenAPI_iptv_config_data_t;
|
typedef struct OpenAPI_iptv_config_data_s OpenAPI_iptv_config_data_t;
|
||||||
typedef struct OpenAPI_iptv_config_data_s {
|
typedef struct OpenAPI_iptv_config_data_s {
|
||||||
char *supi;
|
char *supi;
|
||||||
|
bool is_inter_group_id_null;
|
||||||
OpenAPI_any_type_t *inter_group_id;
|
OpenAPI_any_type_t *inter_group_id;
|
||||||
char *dnn;
|
char *dnn;
|
||||||
struct OpenAPI_snssai_s *snssai;
|
struct OpenAPI_snssai_s *snssai;
|
||||||
|
@ -35,6 +36,7 @@ typedef struct OpenAPI_iptv_config_data_s {
|
||||||
|
|
||||||
OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_create(
|
OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_create(
|
||||||
char *supi,
|
char *supi,
|
||||||
|
bool is_inter_group_id_null,
|
||||||
OpenAPI_any_type_t *inter_group_id,
|
OpenAPI_any_type_t *inter_group_id,
|
||||||
char *dnn,
|
char *dnn,
|
||||||
OpenAPI_snssai_t *snssai,
|
OpenAPI_snssai_t *snssai,
|
||||||
|
|
|
@ -23,8 +23,10 @@ OpenAPI_media_component_t *OpenAPI_media_component_create(
|
||||||
OpenAPI_flow_status_e f_status,
|
OpenAPI_flow_status_e f_status,
|
||||||
char *mar_bw_dl,
|
char *mar_bw_dl,
|
||||||
char *mar_bw_ul,
|
char *mar_bw_ul,
|
||||||
|
bool is_max_packet_loss_rate_dl_null,
|
||||||
bool is_max_packet_loss_rate_dl,
|
bool is_max_packet_loss_rate_dl,
|
||||||
int max_packet_loss_rate_dl,
|
int max_packet_loss_rate_dl,
|
||||||
|
bool is_max_packet_loss_rate_ul_null,
|
||||||
bool is_max_packet_loss_rate_ul,
|
bool is_max_packet_loss_rate_ul,
|
||||||
int max_packet_loss_rate_ul,
|
int max_packet_loss_rate_ul,
|
||||||
char *max_supp_bw_dl,
|
char *max_supp_bw_dl,
|
||||||
|
@ -47,7 +49,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_create(
|
||||||
bool is_sharing_key_ul,
|
bool is_sharing_key_ul,
|
||||||
int sharing_key_ul,
|
int sharing_key_ul,
|
||||||
OpenAPI_tsn_qos_container_t *tsn_qos,
|
OpenAPI_tsn_qos_container_t *tsn_qos,
|
||||||
|
bool is_tscai_input_dl_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
||||||
|
bool is_tscai_input_ul_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
||||||
bool is_tscai_time_dom,
|
bool is_tscai_time_dom,
|
||||||
int tscai_time_dom
|
int tscai_time_dom
|
||||||
|
@ -74,8 +78,10 @@ OpenAPI_media_component_t *OpenAPI_media_component_create(
|
||||||
media_component_local_var->f_status = f_status;
|
media_component_local_var->f_status = f_status;
|
||||||
media_component_local_var->mar_bw_dl = mar_bw_dl;
|
media_component_local_var->mar_bw_dl = mar_bw_dl;
|
||||||
media_component_local_var->mar_bw_ul = mar_bw_ul;
|
media_component_local_var->mar_bw_ul = mar_bw_ul;
|
||||||
|
media_component_local_var->is_max_packet_loss_rate_dl_null = is_max_packet_loss_rate_dl_null;
|
||||||
media_component_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
|
media_component_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
|
||||||
media_component_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
|
media_component_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
|
||||||
|
media_component_local_var->is_max_packet_loss_rate_ul_null = is_max_packet_loss_rate_ul_null;
|
||||||
media_component_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
|
media_component_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
|
||||||
media_component_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
|
media_component_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
|
||||||
media_component_local_var->max_supp_bw_dl = max_supp_bw_dl;
|
media_component_local_var->max_supp_bw_dl = max_supp_bw_dl;
|
||||||
|
@ -98,7 +104,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_create(
|
||||||
media_component_local_var->is_sharing_key_ul = is_sharing_key_ul;
|
media_component_local_var->is_sharing_key_ul = is_sharing_key_ul;
|
||||||
media_component_local_var->sharing_key_ul = sharing_key_ul;
|
media_component_local_var->sharing_key_ul = sharing_key_ul;
|
||||||
media_component_local_var->tsn_qos = tsn_qos;
|
media_component_local_var->tsn_qos = tsn_qos;
|
||||||
|
media_component_local_var->is_tscai_input_dl_null = is_tscai_input_dl_null;
|
||||||
media_component_local_var->tscai_input_dl = tscai_input_dl;
|
media_component_local_var->tscai_input_dl = tscai_input_dl;
|
||||||
|
media_component_local_var->is_tscai_input_ul_null = is_tscai_input_ul_null;
|
||||||
media_component_local_var->tscai_input_ul = tscai_input_ul;
|
media_component_local_var->tscai_input_ul = tscai_input_ul;
|
||||||
media_component_local_var->is_tscai_time_dom = is_tscai_time_dom;
|
media_component_local_var->is_tscai_time_dom = is_tscai_time_dom;
|
||||||
media_component_local_var->tscai_time_dom = tscai_time_dom;
|
media_component_local_var->tscai_time_dom = tscai_time_dom;
|
||||||
|
@ -358,6 +366,11 @@ cJSON *OpenAPI_media_component_convertToJSON(OpenAPI_media_component_t *media_co
|
||||||
ogs_error("OpenAPI_media_component_convertToJSON() failed [max_packet_loss_rate_dl]");
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [max_packet_loss_rate_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component->is_max_packet_loss_rate_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxPacketLossRateDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [max_packet_loss_rate_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component->is_max_packet_loss_rate_ul) {
|
if (media_component->is_max_packet_loss_rate_ul) {
|
||||||
|
@ -365,6 +378,11 @@ cJSON *OpenAPI_media_component_convertToJSON(OpenAPI_media_component_t *media_co
|
||||||
ogs_error("OpenAPI_media_component_convertToJSON() failed [max_packet_loss_rate_ul]");
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [max_packet_loss_rate_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component->is_max_packet_loss_rate_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxPacketLossRateUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [max_packet_loss_rate_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component->max_supp_bw_dl) {
|
if (media_component->max_supp_bw_dl) {
|
||||||
|
@ -531,6 +549,11 @@ cJSON *OpenAPI_media_component_convertToJSON(OpenAPI_media_component_t *media_co
|
||||||
ogs_error("OpenAPI_media_component_convertToJSON() failed [tscai_input_dl]");
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [tscai_input_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component->is_tscai_input_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tscaiInputDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [tscai_input_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component->tscai_input_ul) {
|
if (media_component->tscai_input_ul) {
|
||||||
|
@ -544,6 +567,11 @@ cJSON *OpenAPI_media_component_convertToJSON(OpenAPI_media_component_t *media_co
|
||||||
ogs_error("OpenAPI_media_component_convertToJSON() failed [tscai_input_ul]");
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [tscai_input_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component->is_tscai_input_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tscaiInputUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_convertToJSON() failed [tscai_input_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component->is_tscai_time_dom) {
|
if (media_component->is_tscai_time_dom) {
|
||||||
|
@ -770,19 +798,23 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co
|
||||||
|
|
||||||
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "maxPacketLossRateDl");
|
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "maxPacketLossRateDl");
|
||||||
if (max_packet_loss_rate_dl) {
|
if (max_packet_loss_rate_dl) {
|
||||||
|
if (!cJSON_IsNull(max_packet_loss_rate_dl)) {
|
||||||
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
|
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_parseFromJSON() failed [max_packet_loss_rate_dl]");
|
ogs_error("OpenAPI_media_component_parseFromJSON() failed [max_packet_loss_rate_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "maxPacketLossRateUl");
|
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "maxPacketLossRateUl");
|
||||||
if (max_packet_loss_rate_ul) {
|
if (max_packet_loss_rate_ul) {
|
||||||
|
if (!cJSON_IsNull(max_packet_loss_rate_ul)) {
|
||||||
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
|
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_parseFromJSON() failed [max_packet_loss_rate_ul]");
|
ogs_error("OpenAPI_media_component_parseFromJSON() failed [max_packet_loss_rate_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_supp_bw_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "maxSuppBwDl");
|
max_supp_bw_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "maxSuppBwDl");
|
||||||
if (max_supp_bw_dl) {
|
if (max_supp_bw_dl) {
|
||||||
|
@ -956,21 +988,25 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co
|
||||||
|
|
||||||
tscai_input_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiInputDl");
|
tscai_input_dl = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiInputDl");
|
||||||
if (tscai_input_dl) {
|
if (tscai_input_dl) {
|
||||||
|
if (!cJSON_IsNull(tscai_input_dl)) {
|
||||||
tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl);
|
tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl);
|
||||||
if (!tscai_input_dl_local_nonprim) {
|
if (!tscai_input_dl_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_dl]");
|
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_input_ul = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiInputUl");
|
tscai_input_ul = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiInputUl");
|
||||||
if (tscai_input_ul) {
|
if (tscai_input_ul) {
|
||||||
|
if (!cJSON_IsNull(tscai_input_ul)) {
|
||||||
tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul);
|
tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul);
|
||||||
if (!tscai_input_ul_local_nonprim) {
|
if (!tscai_input_ul_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_ul]");
|
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_time_dom = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiTimeDom");
|
tscai_time_dom = cJSON_GetObjectItemCaseSensitive(media_componentJSON, "tscaiTimeDom");
|
||||||
if (tscai_time_dom) {
|
if (tscai_time_dom) {
|
||||||
|
@ -999,8 +1035,10 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co
|
||||||
f_status ? f_statusVariable : 0,
|
f_status ? f_statusVariable : 0,
|
||||||
mar_bw_dl && !cJSON_IsNull(mar_bw_dl) ? ogs_strdup(mar_bw_dl->valuestring) : NULL,
|
mar_bw_dl && !cJSON_IsNull(mar_bw_dl) ? ogs_strdup(mar_bw_dl->valuestring) : NULL,
|
||||||
mar_bw_ul && !cJSON_IsNull(mar_bw_ul) ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
|
mar_bw_ul && !cJSON_IsNull(mar_bw_ul) ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
|
||||||
|
max_packet_loss_rate_dl && cJSON_IsNull(max_packet_loss_rate_dl) ? true : false,
|
||||||
max_packet_loss_rate_dl ? true : false,
|
max_packet_loss_rate_dl ? true : false,
|
||||||
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
|
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
|
||||||
|
max_packet_loss_rate_ul && cJSON_IsNull(max_packet_loss_rate_ul) ? true : false,
|
||||||
max_packet_loss_rate_ul ? true : false,
|
max_packet_loss_rate_ul ? true : false,
|
||||||
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
|
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
|
||||||
max_supp_bw_dl && !cJSON_IsNull(max_supp_bw_dl) ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL,
|
max_supp_bw_dl && !cJSON_IsNull(max_supp_bw_dl) ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL,
|
||||||
|
@ -1024,7 +1062,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co
|
||||||
sharing_key_ul ? true : false,
|
sharing_key_ul ? true : false,
|
||||||
sharing_key_ul ? sharing_key_ul->valuedouble : 0,
|
sharing_key_ul ? sharing_key_ul->valuedouble : 0,
|
||||||
tsn_qos ? tsn_qos_local_nonprim : NULL,
|
tsn_qos ? tsn_qos_local_nonprim : NULL,
|
||||||
|
tscai_input_dl && cJSON_IsNull(tscai_input_dl) ? true : false,
|
||||||
tscai_input_dl ? tscai_input_dl_local_nonprim : NULL,
|
tscai_input_dl ? tscai_input_dl_local_nonprim : NULL,
|
||||||
|
tscai_input_ul && cJSON_IsNull(tscai_input_ul) ? true : false,
|
||||||
tscai_input_ul ? tscai_input_ul_local_nonprim : NULL,
|
tscai_input_ul ? tscai_input_ul_local_nonprim : NULL,
|
||||||
tscai_time_dom ? true : false,
|
tscai_time_dom ? true : false,
|
||||||
tscai_time_dom ? tscai_time_dom->valuedouble : 0
|
tscai_time_dom ? tscai_time_dom->valuedouble : 0
|
||||||
|
|
|
@ -48,8 +48,10 @@ typedef struct OpenAPI_media_component_s {
|
||||||
OpenAPI_flow_status_e f_status;
|
OpenAPI_flow_status_e f_status;
|
||||||
char *mar_bw_dl;
|
char *mar_bw_dl;
|
||||||
char *mar_bw_ul;
|
char *mar_bw_ul;
|
||||||
|
bool is_max_packet_loss_rate_dl_null;
|
||||||
bool is_max_packet_loss_rate_dl;
|
bool is_max_packet_loss_rate_dl;
|
||||||
int max_packet_loss_rate_dl;
|
int max_packet_loss_rate_dl;
|
||||||
|
bool is_max_packet_loss_rate_ul_null;
|
||||||
bool is_max_packet_loss_rate_ul;
|
bool is_max_packet_loss_rate_ul;
|
||||||
int max_packet_loss_rate_ul;
|
int max_packet_loss_rate_ul;
|
||||||
char *max_supp_bw_dl;
|
char *max_supp_bw_dl;
|
||||||
|
@ -72,7 +74,9 @@ typedef struct OpenAPI_media_component_s {
|
||||||
bool is_sharing_key_ul;
|
bool is_sharing_key_ul;
|
||||||
int sharing_key_ul;
|
int sharing_key_ul;
|
||||||
struct OpenAPI_tsn_qos_container_s *tsn_qos;
|
struct OpenAPI_tsn_qos_container_s *tsn_qos;
|
||||||
|
bool is_tscai_input_dl_null;
|
||||||
struct OpenAPI_tscai_input_container_s *tscai_input_dl;
|
struct OpenAPI_tscai_input_container_s *tscai_input_dl;
|
||||||
|
bool is_tscai_input_ul_null;
|
||||||
struct OpenAPI_tscai_input_container_s *tscai_input_ul;
|
struct OpenAPI_tscai_input_container_s *tscai_input_ul;
|
||||||
bool is_tscai_time_dom;
|
bool is_tscai_time_dom;
|
||||||
int tscai_time_dom;
|
int tscai_time_dom;
|
||||||
|
@ -97,8 +101,10 @@ OpenAPI_media_component_t *OpenAPI_media_component_create(
|
||||||
OpenAPI_flow_status_e f_status,
|
OpenAPI_flow_status_e f_status,
|
||||||
char *mar_bw_dl,
|
char *mar_bw_dl,
|
||||||
char *mar_bw_ul,
|
char *mar_bw_ul,
|
||||||
|
bool is_max_packet_loss_rate_dl_null,
|
||||||
bool is_max_packet_loss_rate_dl,
|
bool is_max_packet_loss_rate_dl,
|
||||||
int max_packet_loss_rate_dl,
|
int max_packet_loss_rate_dl,
|
||||||
|
bool is_max_packet_loss_rate_ul_null,
|
||||||
bool is_max_packet_loss_rate_ul,
|
bool is_max_packet_loss_rate_ul,
|
||||||
int max_packet_loss_rate_ul,
|
int max_packet_loss_rate_ul,
|
||||||
char *max_supp_bw_dl,
|
char *max_supp_bw_dl,
|
||||||
|
@ -121,7 +127,9 @@ OpenAPI_media_component_t *OpenAPI_media_component_create(
|
||||||
bool is_sharing_key_ul,
|
bool is_sharing_key_ul,
|
||||||
int sharing_key_ul,
|
int sharing_key_ul,
|
||||||
OpenAPI_tsn_qos_container_t *tsn_qos,
|
OpenAPI_tsn_qos_container_t *tsn_qos,
|
||||||
|
bool is_tscai_input_dl_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
||||||
|
bool is_tscai_input_ul_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
||||||
bool is_tscai_time_dom,
|
bool is_tscai_time_dom,
|
||||||
int tscai_time_dom
|
int tscai_time_dom
|
||||||
|
|
|
@ -6,48 +6,72 @@
|
||||||
|
|
||||||
OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_create(
|
OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_create(
|
||||||
char *af_app_id,
|
char *af_app_id,
|
||||||
|
bool is_af_rout_req_null,
|
||||||
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
||||||
|
bool is_qos_reference_null,
|
||||||
char *qos_reference,
|
char *qos_reference,
|
||||||
|
bool is_alt_ser_reqs_null,
|
||||||
OpenAPI_list_t *alt_ser_reqs,
|
OpenAPI_list_t *alt_ser_reqs,
|
||||||
|
bool is_alt_ser_reqs_data_null,
|
||||||
OpenAPI_list_t *alt_ser_reqs_data,
|
OpenAPI_list_t *alt_ser_reqs_data,
|
||||||
bool is_dis_ue_notif,
|
bool is_dis_ue_notif,
|
||||||
int dis_ue_notif,
|
int dis_ue_notif,
|
||||||
bool is_cont_ver,
|
bool is_cont_ver,
|
||||||
int cont_ver,
|
int cont_ver,
|
||||||
OpenAPI_list_t *codecs,
|
OpenAPI_list_t *codecs,
|
||||||
|
bool is_des_max_latency_null,
|
||||||
bool is_des_max_latency,
|
bool is_des_max_latency,
|
||||||
float des_max_latency,
|
float des_max_latency,
|
||||||
|
bool is_des_max_loss_null,
|
||||||
bool is_des_max_loss,
|
bool is_des_max_loss,
|
||||||
float des_max_loss,
|
float des_max_loss,
|
||||||
|
bool is_flus_id_null,
|
||||||
char *flus_id,
|
char *flus_id,
|
||||||
OpenAPI_flow_status_e f_status,
|
OpenAPI_flow_status_e f_status,
|
||||||
|
bool is_mar_bw_dl_null,
|
||||||
char *mar_bw_dl,
|
char *mar_bw_dl,
|
||||||
|
bool is_mar_bw_ul_null,
|
||||||
char *mar_bw_ul,
|
char *mar_bw_ul,
|
||||||
|
bool is_max_packet_loss_rate_dl_null,
|
||||||
bool is_max_packet_loss_rate_dl,
|
bool is_max_packet_loss_rate_dl,
|
||||||
int max_packet_loss_rate_dl,
|
int max_packet_loss_rate_dl,
|
||||||
|
bool is_max_packet_loss_rate_ul_null,
|
||||||
bool is_max_packet_loss_rate_ul,
|
bool is_max_packet_loss_rate_ul,
|
||||||
int max_packet_loss_rate_ul,
|
int max_packet_loss_rate_ul,
|
||||||
|
bool is_max_supp_bw_dl_null,
|
||||||
char *max_supp_bw_dl,
|
char *max_supp_bw_dl,
|
||||||
|
bool is_max_supp_bw_ul_null,
|
||||||
char *max_supp_bw_ul,
|
char *max_supp_bw_ul,
|
||||||
int med_comp_n,
|
int med_comp_n,
|
||||||
OpenAPI_list_t* med_sub_comps,
|
OpenAPI_list_t* med_sub_comps,
|
||||||
OpenAPI_media_type_e med_type,
|
OpenAPI_media_type_e med_type,
|
||||||
|
bool is_min_des_bw_dl_null,
|
||||||
char *min_des_bw_dl,
|
char *min_des_bw_dl,
|
||||||
|
bool is_min_des_bw_ul_null,
|
||||||
char *min_des_bw_ul,
|
char *min_des_bw_ul,
|
||||||
|
bool is_mir_bw_dl_null,
|
||||||
char *mir_bw_dl,
|
char *mir_bw_dl,
|
||||||
|
bool is_mir_bw_ul_null,
|
||||||
char *mir_bw_ul,
|
char *mir_bw_ul,
|
||||||
OpenAPI_preemption_capability_rm_t *preempt_cap,
|
OpenAPI_preemption_capability_rm_t *preempt_cap,
|
||||||
OpenAPI_preemption_vulnerability_rm_t *preempt_vuln,
|
OpenAPI_preemption_vulnerability_rm_t *preempt_vuln,
|
||||||
OpenAPI_priority_sharing_indicator_e prio_sharing_ind,
|
OpenAPI_priority_sharing_indicator_e prio_sharing_ind,
|
||||||
OpenAPI_reserv_priority_e res_prio,
|
OpenAPI_reserv_priority_e res_prio,
|
||||||
|
bool is_rr_bw_null,
|
||||||
char *rr_bw,
|
char *rr_bw,
|
||||||
|
bool is_rs_bw_null,
|
||||||
char *rs_bw,
|
char *rs_bw,
|
||||||
|
bool is_sharing_key_dl_null,
|
||||||
bool is_sharing_key_dl,
|
bool is_sharing_key_dl,
|
||||||
int sharing_key_dl,
|
int sharing_key_dl,
|
||||||
|
bool is_sharing_key_ul_null,
|
||||||
bool is_sharing_key_ul,
|
bool is_sharing_key_ul,
|
||||||
int sharing_key_ul,
|
int sharing_key_ul,
|
||||||
|
bool is_tsn_qos_null,
|
||||||
OpenAPI_tsn_qos_container_rm_t *tsn_qos,
|
OpenAPI_tsn_qos_container_rm_t *tsn_qos,
|
||||||
|
bool is_tscai_input_dl_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
||||||
|
bool is_tscai_input_ul_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
||||||
bool is_tscai_time_dom,
|
bool is_tscai_time_dom,
|
||||||
int tscai_time_dom
|
int tscai_time_dom
|
||||||
|
@ -57,48 +81,72 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_create(
|
||||||
ogs_assert(media_component_rm_local_var);
|
ogs_assert(media_component_rm_local_var);
|
||||||
|
|
||||||
media_component_rm_local_var->af_app_id = af_app_id;
|
media_component_rm_local_var->af_app_id = af_app_id;
|
||||||
|
media_component_rm_local_var->is_af_rout_req_null = is_af_rout_req_null;
|
||||||
media_component_rm_local_var->af_rout_req = af_rout_req;
|
media_component_rm_local_var->af_rout_req = af_rout_req;
|
||||||
|
media_component_rm_local_var->is_qos_reference_null = is_qos_reference_null;
|
||||||
media_component_rm_local_var->qos_reference = qos_reference;
|
media_component_rm_local_var->qos_reference = qos_reference;
|
||||||
|
media_component_rm_local_var->is_alt_ser_reqs_null = is_alt_ser_reqs_null;
|
||||||
media_component_rm_local_var->alt_ser_reqs = alt_ser_reqs;
|
media_component_rm_local_var->alt_ser_reqs = alt_ser_reqs;
|
||||||
|
media_component_rm_local_var->is_alt_ser_reqs_data_null = is_alt_ser_reqs_data_null;
|
||||||
media_component_rm_local_var->alt_ser_reqs_data = alt_ser_reqs_data;
|
media_component_rm_local_var->alt_ser_reqs_data = alt_ser_reqs_data;
|
||||||
media_component_rm_local_var->is_dis_ue_notif = is_dis_ue_notif;
|
media_component_rm_local_var->is_dis_ue_notif = is_dis_ue_notif;
|
||||||
media_component_rm_local_var->dis_ue_notif = dis_ue_notif;
|
media_component_rm_local_var->dis_ue_notif = dis_ue_notif;
|
||||||
media_component_rm_local_var->is_cont_ver = is_cont_ver;
|
media_component_rm_local_var->is_cont_ver = is_cont_ver;
|
||||||
media_component_rm_local_var->cont_ver = cont_ver;
|
media_component_rm_local_var->cont_ver = cont_ver;
|
||||||
media_component_rm_local_var->codecs = codecs;
|
media_component_rm_local_var->codecs = codecs;
|
||||||
|
media_component_rm_local_var->is_des_max_latency_null = is_des_max_latency_null;
|
||||||
media_component_rm_local_var->is_des_max_latency = is_des_max_latency;
|
media_component_rm_local_var->is_des_max_latency = is_des_max_latency;
|
||||||
media_component_rm_local_var->des_max_latency = des_max_latency;
|
media_component_rm_local_var->des_max_latency = des_max_latency;
|
||||||
|
media_component_rm_local_var->is_des_max_loss_null = is_des_max_loss_null;
|
||||||
media_component_rm_local_var->is_des_max_loss = is_des_max_loss;
|
media_component_rm_local_var->is_des_max_loss = is_des_max_loss;
|
||||||
media_component_rm_local_var->des_max_loss = des_max_loss;
|
media_component_rm_local_var->des_max_loss = des_max_loss;
|
||||||
|
media_component_rm_local_var->is_flus_id_null = is_flus_id_null;
|
||||||
media_component_rm_local_var->flus_id = flus_id;
|
media_component_rm_local_var->flus_id = flus_id;
|
||||||
media_component_rm_local_var->f_status = f_status;
|
media_component_rm_local_var->f_status = f_status;
|
||||||
|
media_component_rm_local_var->is_mar_bw_dl_null = is_mar_bw_dl_null;
|
||||||
media_component_rm_local_var->mar_bw_dl = mar_bw_dl;
|
media_component_rm_local_var->mar_bw_dl = mar_bw_dl;
|
||||||
|
media_component_rm_local_var->is_mar_bw_ul_null = is_mar_bw_ul_null;
|
||||||
media_component_rm_local_var->mar_bw_ul = mar_bw_ul;
|
media_component_rm_local_var->mar_bw_ul = mar_bw_ul;
|
||||||
|
media_component_rm_local_var->is_max_packet_loss_rate_dl_null = is_max_packet_loss_rate_dl_null;
|
||||||
media_component_rm_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
|
media_component_rm_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
|
||||||
media_component_rm_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
|
media_component_rm_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
|
||||||
|
media_component_rm_local_var->is_max_packet_loss_rate_ul_null = is_max_packet_loss_rate_ul_null;
|
||||||
media_component_rm_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
|
media_component_rm_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
|
||||||
media_component_rm_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
|
media_component_rm_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
|
||||||
|
media_component_rm_local_var->is_max_supp_bw_dl_null = is_max_supp_bw_dl_null;
|
||||||
media_component_rm_local_var->max_supp_bw_dl = max_supp_bw_dl;
|
media_component_rm_local_var->max_supp_bw_dl = max_supp_bw_dl;
|
||||||
|
media_component_rm_local_var->is_max_supp_bw_ul_null = is_max_supp_bw_ul_null;
|
||||||
media_component_rm_local_var->max_supp_bw_ul = max_supp_bw_ul;
|
media_component_rm_local_var->max_supp_bw_ul = max_supp_bw_ul;
|
||||||
media_component_rm_local_var->med_comp_n = med_comp_n;
|
media_component_rm_local_var->med_comp_n = med_comp_n;
|
||||||
media_component_rm_local_var->med_sub_comps = med_sub_comps;
|
media_component_rm_local_var->med_sub_comps = med_sub_comps;
|
||||||
media_component_rm_local_var->med_type = med_type;
|
media_component_rm_local_var->med_type = med_type;
|
||||||
|
media_component_rm_local_var->is_min_des_bw_dl_null = is_min_des_bw_dl_null;
|
||||||
media_component_rm_local_var->min_des_bw_dl = min_des_bw_dl;
|
media_component_rm_local_var->min_des_bw_dl = min_des_bw_dl;
|
||||||
|
media_component_rm_local_var->is_min_des_bw_ul_null = is_min_des_bw_ul_null;
|
||||||
media_component_rm_local_var->min_des_bw_ul = min_des_bw_ul;
|
media_component_rm_local_var->min_des_bw_ul = min_des_bw_ul;
|
||||||
|
media_component_rm_local_var->is_mir_bw_dl_null = is_mir_bw_dl_null;
|
||||||
media_component_rm_local_var->mir_bw_dl = mir_bw_dl;
|
media_component_rm_local_var->mir_bw_dl = mir_bw_dl;
|
||||||
|
media_component_rm_local_var->is_mir_bw_ul_null = is_mir_bw_ul_null;
|
||||||
media_component_rm_local_var->mir_bw_ul = mir_bw_ul;
|
media_component_rm_local_var->mir_bw_ul = mir_bw_ul;
|
||||||
media_component_rm_local_var->preempt_cap = preempt_cap;
|
media_component_rm_local_var->preempt_cap = preempt_cap;
|
||||||
media_component_rm_local_var->preempt_vuln = preempt_vuln;
|
media_component_rm_local_var->preempt_vuln = preempt_vuln;
|
||||||
media_component_rm_local_var->prio_sharing_ind = prio_sharing_ind;
|
media_component_rm_local_var->prio_sharing_ind = prio_sharing_ind;
|
||||||
media_component_rm_local_var->res_prio = res_prio;
|
media_component_rm_local_var->res_prio = res_prio;
|
||||||
|
media_component_rm_local_var->is_rr_bw_null = is_rr_bw_null;
|
||||||
media_component_rm_local_var->rr_bw = rr_bw;
|
media_component_rm_local_var->rr_bw = rr_bw;
|
||||||
|
media_component_rm_local_var->is_rs_bw_null = is_rs_bw_null;
|
||||||
media_component_rm_local_var->rs_bw = rs_bw;
|
media_component_rm_local_var->rs_bw = rs_bw;
|
||||||
|
media_component_rm_local_var->is_sharing_key_dl_null = is_sharing_key_dl_null;
|
||||||
media_component_rm_local_var->is_sharing_key_dl = is_sharing_key_dl;
|
media_component_rm_local_var->is_sharing_key_dl = is_sharing_key_dl;
|
||||||
media_component_rm_local_var->sharing_key_dl = sharing_key_dl;
|
media_component_rm_local_var->sharing_key_dl = sharing_key_dl;
|
||||||
|
media_component_rm_local_var->is_sharing_key_ul_null = is_sharing_key_ul_null;
|
||||||
media_component_rm_local_var->is_sharing_key_ul = is_sharing_key_ul;
|
media_component_rm_local_var->is_sharing_key_ul = is_sharing_key_ul;
|
||||||
media_component_rm_local_var->sharing_key_ul = sharing_key_ul;
|
media_component_rm_local_var->sharing_key_ul = sharing_key_ul;
|
||||||
|
media_component_rm_local_var->is_tsn_qos_null = is_tsn_qos_null;
|
||||||
media_component_rm_local_var->tsn_qos = tsn_qos;
|
media_component_rm_local_var->tsn_qos = tsn_qos;
|
||||||
|
media_component_rm_local_var->is_tscai_input_dl_null = is_tscai_input_dl_null;
|
||||||
media_component_rm_local_var->tscai_input_dl = tscai_input_dl;
|
media_component_rm_local_var->tscai_input_dl = tscai_input_dl;
|
||||||
|
media_component_rm_local_var->is_tscai_input_ul_null = is_tscai_input_ul_null;
|
||||||
media_component_rm_local_var->tscai_input_ul = tscai_input_ul;
|
media_component_rm_local_var->tscai_input_ul = tscai_input_ul;
|
||||||
media_component_rm_local_var->is_tscai_time_dom = is_tscai_time_dom;
|
media_component_rm_local_var->is_tscai_time_dom = is_tscai_time_dom;
|
||||||
media_component_rm_local_var->tscai_time_dom = tscai_time_dom;
|
media_component_rm_local_var->tscai_time_dom = tscai_time_dom;
|
||||||
|
@ -252,6 +300,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [af_rout_req]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [af_rout_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_af_rout_req_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "afRoutReq") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [af_rout_req]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->qos_reference) {
|
if (media_component_rm->qos_reference) {
|
||||||
|
@ -259,6 +312,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [qos_reference]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [qos_reference]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_qos_reference_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "qosReference") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [qos_reference]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->alt_ser_reqs) {
|
if (media_component_rm->alt_ser_reqs) {
|
||||||
|
@ -273,6 +331,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_alt_ser_reqs_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "altSerReqs") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [alt_ser_reqs]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->alt_ser_reqs_data) {
|
if (media_component_rm->alt_ser_reqs_data) {
|
||||||
|
@ -289,6 +352,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(alt_ser_reqs_dataList, itemLocal);
|
cJSON_AddItemToArray(alt_ser_reqs_dataList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_alt_ser_reqs_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "altSerReqsData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [alt_ser_reqs_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_dis_ue_notif) {
|
if (media_component_rm->is_dis_ue_notif) {
|
||||||
|
@ -324,6 +392,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [des_max_latency]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [des_max_latency]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_des_max_latency_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "desMaxLatency") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [des_max_latency]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_des_max_loss) {
|
if (media_component_rm->is_des_max_loss) {
|
||||||
|
@ -331,6 +404,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [des_max_loss]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [des_max_loss]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_des_max_loss_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "desMaxLoss") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [des_max_loss]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->flus_id) {
|
if (media_component_rm->flus_id) {
|
||||||
|
@ -338,6 +416,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [flus_id]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [flus_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_flus_id_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "flusId") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [flus_id]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->f_status != OpenAPI_flow_status_NULL) {
|
if (media_component_rm->f_status != OpenAPI_flow_status_NULL) {
|
||||||
|
@ -352,6 +435,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mar_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mar_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_mar_bw_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "marBwDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mar_bw_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->mar_bw_ul) {
|
if (media_component_rm->mar_bw_ul) {
|
||||||
|
@ -359,6 +447,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mar_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mar_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_mar_bw_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "marBwUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mar_bw_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_max_packet_loss_rate_dl) {
|
if (media_component_rm->is_max_packet_loss_rate_dl) {
|
||||||
|
@ -366,6 +459,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_packet_loss_rate_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_packet_loss_rate_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_max_packet_loss_rate_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxPacketLossRateDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_packet_loss_rate_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_max_packet_loss_rate_ul) {
|
if (media_component_rm->is_max_packet_loss_rate_ul) {
|
||||||
|
@ -373,6 +471,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_packet_loss_rate_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_packet_loss_rate_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_max_packet_loss_rate_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxPacketLossRateUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_packet_loss_rate_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->max_supp_bw_dl) {
|
if (media_component_rm->max_supp_bw_dl) {
|
||||||
|
@ -380,6 +483,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_supp_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_supp_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_max_supp_bw_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxSuppBwDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_supp_bw_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->max_supp_bw_ul) {
|
if (media_component_rm->max_supp_bw_ul) {
|
||||||
|
@ -387,6 +495,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_supp_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_supp_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_max_supp_bw_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxSuppBwUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [max_supp_bw_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cJSON_AddNumberToObject(item, "medCompN", media_component_rm->med_comp_n) == NULL) {
|
if (cJSON_AddNumberToObject(item, "medCompN", media_component_rm->med_comp_n) == NULL) {
|
||||||
|
@ -436,6 +549,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [min_des_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [min_des_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_min_des_bw_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "minDesBwDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [min_des_bw_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->min_des_bw_ul) {
|
if (media_component_rm->min_des_bw_ul) {
|
||||||
|
@ -443,6 +561,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [min_des_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [min_des_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_min_des_bw_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "minDesBwUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [min_des_bw_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->mir_bw_dl) {
|
if (media_component_rm->mir_bw_dl) {
|
||||||
|
@ -450,6 +573,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mir_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mir_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_mir_bw_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "mirBwDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mir_bw_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->mir_bw_ul) {
|
if (media_component_rm->mir_bw_ul) {
|
||||||
|
@ -457,6 +585,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mir_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mir_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_mir_bw_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "mirBwUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [mir_bw_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->preempt_cap) {
|
if (media_component_rm->preempt_cap) {
|
||||||
|
@ -504,6 +637,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [rr_bw]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [rr_bw]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_rr_bw_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "rrBw") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [rr_bw]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->rs_bw) {
|
if (media_component_rm->rs_bw) {
|
||||||
|
@ -511,6 +649,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [rs_bw]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [rs_bw]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_rs_bw_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "rsBw") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [rs_bw]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_sharing_key_dl) {
|
if (media_component_rm->is_sharing_key_dl) {
|
||||||
|
@ -518,6 +661,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [sharing_key_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [sharing_key_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_sharing_key_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "sharingKeyDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [sharing_key_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_sharing_key_ul) {
|
if (media_component_rm->is_sharing_key_ul) {
|
||||||
|
@ -525,6 +673,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [sharing_key_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [sharing_key_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_sharing_key_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "sharingKeyUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [sharing_key_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->tsn_qos) {
|
if (media_component_rm->tsn_qos) {
|
||||||
|
@ -538,6 +691,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tsn_qos]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tsn_qos]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_tsn_qos_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tsnQos") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tsn_qos]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->tscai_input_dl) {
|
if (media_component_rm->tscai_input_dl) {
|
||||||
|
@ -551,6 +709,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tscai_input_dl]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tscai_input_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_tscai_input_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tscaiInputDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tscai_input_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->tscai_input_ul) {
|
if (media_component_rm->tscai_input_ul) {
|
||||||
|
@ -564,6 +727,11 @@ cJSON *OpenAPI_media_component_rm_convertToJSON(OpenAPI_media_component_rm_t *me
|
||||||
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tscai_input_ul]");
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tscai_input_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_component_rm->is_tscai_input_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tscaiInputUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_component_rm_convertToJSON() failed [tscai_input_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_component_rm->is_tscai_time_dom) {
|
if (media_component_rm->is_tscai_time_dom) {
|
||||||
|
@ -642,23 +810,28 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
|
|
||||||
af_rout_req = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "afRoutReq");
|
af_rout_req = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "afRoutReq");
|
||||||
if (af_rout_req) {
|
if (af_rout_req) {
|
||||||
|
if (!cJSON_IsNull(af_rout_req)) {
|
||||||
af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_rm_parseFromJSON(af_rout_req);
|
af_rout_req_local_nonprim = OpenAPI_af_routing_requirement_rm_parseFromJSON(af_rout_req);
|
||||||
if (!af_rout_req_local_nonprim) {
|
if (!af_rout_req_local_nonprim) {
|
||||||
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON failed [af_rout_req]");
|
ogs_error("OpenAPI_af_routing_requirement_rm_parseFromJSON failed [af_rout_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
qos_reference = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "qosReference");
|
qos_reference = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "qosReference");
|
||||||
if (qos_reference) {
|
if (qos_reference) {
|
||||||
|
if (!cJSON_IsNull(qos_reference)) {
|
||||||
if (!cJSON_IsString(qos_reference) && !cJSON_IsNull(qos_reference)) {
|
if (!cJSON_IsString(qos_reference) && !cJSON_IsNull(qos_reference)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [qos_reference]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [qos_reference]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
alt_ser_reqs = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "altSerReqs");
|
alt_ser_reqs = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "altSerReqs");
|
||||||
if (alt_ser_reqs) {
|
if (alt_ser_reqs) {
|
||||||
|
if (!cJSON_IsNull(alt_ser_reqs)) {
|
||||||
cJSON *alt_ser_reqs_local = NULL;
|
cJSON *alt_ser_reqs_local = NULL;
|
||||||
if (!cJSON_IsArray(alt_ser_reqs)) {
|
if (!cJSON_IsArray(alt_ser_reqs)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [alt_ser_reqs]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [alt_ser_reqs]");
|
||||||
|
@ -677,9 +850,11 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
OpenAPI_list_add(alt_ser_reqsList, ogs_strdup(alt_ser_reqs_local->valuestring));
|
OpenAPI_list_add(alt_ser_reqsList, ogs_strdup(alt_ser_reqs_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
alt_ser_reqs_data = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "altSerReqsData");
|
alt_ser_reqs_data = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "altSerReqsData");
|
||||||
if (alt_ser_reqs_data) {
|
if (alt_ser_reqs_data) {
|
||||||
|
if (!cJSON_IsNull(alt_ser_reqs_data)) {
|
||||||
cJSON *alt_ser_reqs_data_local = NULL;
|
cJSON *alt_ser_reqs_data_local = NULL;
|
||||||
if (!cJSON_IsArray(alt_ser_reqs_data)) {
|
if (!cJSON_IsArray(alt_ser_reqs_data)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [alt_ser_reqs_data]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [alt_ser_reqs_data]");
|
||||||
|
@ -701,6 +876,7 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
OpenAPI_list_add(alt_ser_reqs_dataList, alt_ser_reqs_dataItem);
|
OpenAPI_list_add(alt_ser_reqs_dataList, alt_ser_reqs_dataItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dis_ue_notif = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "disUeNotif");
|
dis_ue_notif = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "disUeNotif");
|
||||||
if (dis_ue_notif) {
|
if (dis_ue_notif) {
|
||||||
|
@ -741,27 +917,33 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
|
|
||||||
des_max_latency = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "desMaxLatency");
|
des_max_latency = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "desMaxLatency");
|
||||||
if (des_max_latency) {
|
if (des_max_latency) {
|
||||||
|
if (!cJSON_IsNull(des_max_latency)) {
|
||||||
if (!cJSON_IsNumber(des_max_latency)) {
|
if (!cJSON_IsNumber(des_max_latency)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [des_max_latency]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [des_max_latency]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
des_max_loss = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "desMaxLoss");
|
des_max_loss = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "desMaxLoss");
|
||||||
if (des_max_loss) {
|
if (des_max_loss) {
|
||||||
|
if (!cJSON_IsNull(des_max_loss)) {
|
||||||
if (!cJSON_IsNumber(des_max_loss)) {
|
if (!cJSON_IsNumber(des_max_loss)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [des_max_loss]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [des_max_loss]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
flus_id = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "flusId");
|
flus_id = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "flusId");
|
||||||
if (flus_id) {
|
if (flus_id) {
|
||||||
|
if (!cJSON_IsNull(flus_id)) {
|
||||||
if (!cJSON_IsString(flus_id) && !cJSON_IsNull(flus_id)) {
|
if (!cJSON_IsString(flus_id) && !cJSON_IsNull(flus_id)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [flus_id]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [flus_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
f_status = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "fStatus");
|
f_status = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "fStatus");
|
||||||
if (f_status) {
|
if (f_status) {
|
||||||
|
@ -774,51 +956,63 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
|
|
||||||
mar_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "marBwDl");
|
mar_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "marBwDl");
|
||||||
if (mar_bw_dl) {
|
if (mar_bw_dl) {
|
||||||
|
if (!cJSON_IsNull(mar_bw_dl)) {
|
||||||
if (!cJSON_IsString(mar_bw_dl) && !cJSON_IsNull(mar_bw_dl)) {
|
if (!cJSON_IsString(mar_bw_dl) && !cJSON_IsNull(mar_bw_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mar_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mar_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mar_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "marBwUl");
|
mar_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "marBwUl");
|
||||||
if (mar_bw_ul) {
|
if (mar_bw_ul) {
|
||||||
|
if (!cJSON_IsNull(mar_bw_ul)) {
|
||||||
if (!cJSON_IsString(mar_bw_ul) && !cJSON_IsNull(mar_bw_ul)) {
|
if (!cJSON_IsString(mar_bw_ul) && !cJSON_IsNull(mar_bw_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mar_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mar_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxPacketLossRateDl");
|
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxPacketLossRateDl");
|
||||||
if (max_packet_loss_rate_dl) {
|
if (max_packet_loss_rate_dl) {
|
||||||
|
if (!cJSON_IsNull(max_packet_loss_rate_dl)) {
|
||||||
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
|
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_packet_loss_rate_dl]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_packet_loss_rate_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxPacketLossRateUl");
|
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxPacketLossRateUl");
|
||||||
if (max_packet_loss_rate_ul) {
|
if (max_packet_loss_rate_ul) {
|
||||||
|
if (!cJSON_IsNull(max_packet_loss_rate_ul)) {
|
||||||
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
|
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_packet_loss_rate_ul]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_packet_loss_rate_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_supp_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxSuppBwDl");
|
max_supp_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxSuppBwDl");
|
||||||
if (max_supp_bw_dl) {
|
if (max_supp_bw_dl) {
|
||||||
|
if (!cJSON_IsNull(max_supp_bw_dl)) {
|
||||||
if (!cJSON_IsString(max_supp_bw_dl) && !cJSON_IsNull(max_supp_bw_dl)) {
|
if (!cJSON_IsString(max_supp_bw_dl) && !cJSON_IsNull(max_supp_bw_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_supp_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_supp_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_supp_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxSuppBwUl");
|
max_supp_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "maxSuppBwUl");
|
||||||
if (max_supp_bw_ul) {
|
if (max_supp_bw_ul) {
|
||||||
|
if (!cJSON_IsNull(max_supp_bw_ul)) {
|
||||||
if (!cJSON_IsString(max_supp_bw_ul) && !cJSON_IsNull(max_supp_bw_ul)) {
|
if (!cJSON_IsString(max_supp_bw_ul) && !cJSON_IsNull(max_supp_bw_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_supp_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [max_supp_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
med_comp_n = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "medCompN");
|
med_comp_n = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "medCompN");
|
||||||
if (!med_comp_n) {
|
if (!med_comp_n) {
|
||||||
|
@ -867,35 +1061,43 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
|
|
||||||
min_des_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "minDesBwDl");
|
min_des_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "minDesBwDl");
|
||||||
if (min_des_bw_dl) {
|
if (min_des_bw_dl) {
|
||||||
|
if (!cJSON_IsNull(min_des_bw_dl)) {
|
||||||
if (!cJSON_IsString(min_des_bw_dl) && !cJSON_IsNull(min_des_bw_dl)) {
|
if (!cJSON_IsString(min_des_bw_dl) && !cJSON_IsNull(min_des_bw_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [min_des_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [min_des_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
min_des_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "minDesBwUl");
|
min_des_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "minDesBwUl");
|
||||||
if (min_des_bw_ul) {
|
if (min_des_bw_ul) {
|
||||||
|
if (!cJSON_IsNull(min_des_bw_ul)) {
|
||||||
if (!cJSON_IsString(min_des_bw_ul) && !cJSON_IsNull(min_des_bw_ul)) {
|
if (!cJSON_IsString(min_des_bw_ul) && !cJSON_IsNull(min_des_bw_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [min_des_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [min_des_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mir_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "mirBwDl");
|
mir_bw_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "mirBwDl");
|
||||||
if (mir_bw_dl) {
|
if (mir_bw_dl) {
|
||||||
|
if (!cJSON_IsNull(mir_bw_dl)) {
|
||||||
if (!cJSON_IsString(mir_bw_dl) && !cJSON_IsNull(mir_bw_dl)) {
|
if (!cJSON_IsString(mir_bw_dl) && !cJSON_IsNull(mir_bw_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mir_bw_dl]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mir_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mir_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "mirBwUl");
|
mir_bw_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "mirBwUl");
|
||||||
if (mir_bw_ul) {
|
if (mir_bw_ul) {
|
||||||
|
if (!cJSON_IsNull(mir_bw_ul)) {
|
||||||
if (!cJSON_IsString(mir_bw_ul) && !cJSON_IsNull(mir_bw_ul)) {
|
if (!cJSON_IsString(mir_bw_ul) && !cJSON_IsNull(mir_bw_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mir_bw_ul]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [mir_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
preempt_cap = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "preemptCap");
|
preempt_cap = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "preemptCap");
|
||||||
if (preempt_cap) {
|
if (preempt_cap) {
|
||||||
|
@ -935,62 +1137,76 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
|
|
||||||
rr_bw = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "rrBw");
|
rr_bw = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "rrBw");
|
||||||
if (rr_bw) {
|
if (rr_bw) {
|
||||||
|
if (!cJSON_IsNull(rr_bw)) {
|
||||||
if (!cJSON_IsString(rr_bw) && !cJSON_IsNull(rr_bw)) {
|
if (!cJSON_IsString(rr_bw) && !cJSON_IsNull(rr_bw)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [rr_bw]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [rr_bw]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rs_bw = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "rsBw");
|
rs_bw = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "rsBw");
|
||||||
if (rs_bw) {
|
if (rs_bw) {
|
||||||
|
if (!cJSON_IsNull(rs_bw)) {
|
||||||
if (!cJSON_IsString(rs_bw) && !cJSON_IsNull(rs_bw)) {
|
if (!cJSON_IsString(rs_bw) && !cJSON_IsNull(rs_bw)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [rs_bw]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [rs_bw]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sharing_key_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "sharingKeyDl");
|
sharing_key_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "sharingKeyDl");
|
||||||
if (sharing_key_dl) {
|
if (sharing_key_dl) {
|
||||||
|
if (!cJSON_IsNull(sharing_key_dl)) {
|
||||||
if (!cJSON_IsNumber(sharing_key_dl)) {
|
if (!cJSON_IsNumber(sharing_key_dl)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [sharing_key_dl]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [sharing_key_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sharing_key_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "sharingKeyUl");
|
sharing_key_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "sharingKeyUl");
|
||||||
if (sharing_key_ul) {
|
if (sharing_key_ul) {
|
||||||
|
if (!cJSON_IsNull(sharing_key_ul)) {
|
||||||
if (!cJSON_IsNumber(sharing_key_ul)) {
|
if (!cJSON_IsNumber(sharing_key_ul)) {
|
||||||
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [sharing_key_ul]");
|
ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [sharing_key_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tsn_qos = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tsnQos");
|
tsn_qos = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tsnQos");
|
||||||
if (tsn_qos) {
|
if (tsn_qos) {
|
||||||
|
if (!cJSON_IsNull(tsn_qos)) {
|
||||||
tsn_qos_local_nonprim = OpenAPI_tsn_qos_container_rm_parseFromJSON(tsn_qos);
|
tsn_qos_local_nonprim = OpenAPI_tsn_qos_container_rm_parseFromJSON(tsn_qos);
|
||||||
if (!tsn_qos_local_nonprim) {
|
if (!tsn_qos_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tsn_qos_container_rm_parseFromJSON failed [tsn_qos]");
|
ogs_error("OpenAPI_tsn_qos_container_rm_parseFromJSON failed [tsn_qos]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_input_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiInputDl");
|
tscai_input_dl = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiInputDl");
|
||||||
if (tscai_input_dl) {
|
if (tscai_input_dl) {
|
||||||
|
if (!cJSON_IsNull(tscai_input_dl)) {
|
||||||
tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl);
|
tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl);
|
||||||
if (!tscai_input_dl_local_nonprim) {
|
if (!tscai_input_dl_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_dl]");
|
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_input_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiInputUl");
|
tscai_input_ul = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiInputUl");
|
||||||
if (tscai_input_ul) {
|
if (tscai_input_ul) {
|
||||||
|
if (!cJSON_IsNull(tscai_input_ul)) {
|
||||||
tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul);
|
tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul);
|
||||||
if (!tscai_input_ul_local_nonprim) {
|
if (!tscai_input_ul_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_ul]");
|
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_time_dom = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiTimeDom");
|
tscai_time_dom = cJSON_GetObjectItemCaseSensitive(media_component_rmJSON, "tscaiTimeDom");
|
||||||
if (tscai_time_dom) {
|
if (tscai_time_dom) {
|
||||||
|
@ -1002,49 +1218,73 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me
|
||||||
|
|
||||||
media_component_rm_local_var = OpenAPI_media_component_rm_create (
|
media_component_rm_local_var = OpenAPI_media_component_rm_create (
|
||||||
af_app_id && !cJSON_IsNull(af_app_id) ? ogs_strdup(af_app_id->valuestring) : NULL,
|
af_app_id && !cJSON_IsNull(af_app_id) ? ogs_strdup(af_app_id->valuestring) : NULL,
|
||||||
|
af_rout_req && cJSON_IsNull(af_rout_req) ? true : false,
|
||||||
af_rout_req ? af_rout_req_local_nonprim : NULL,
|
af_rout_req ? af_rout_req_local_nonprim : NULL,
|
||||||
|
qos_reference && cJSON_IsNull(qos_reference) ? true : false,
|
||||||
qos_reference && !cJSON_IsNull(qos_reference) ? ogs_strdup(qos_reference->valuestring) : NULL,
|
qos_reference && !cJSON_IsNull(qos_reference) ? ogs_strdup(qos_reference->valuestring) : NULL,
|
||||||
|
alt_ser_reqs && cJSON_IsNull(alt_ser_reqs) ? true : false,
|
||||||
alt_ser_reqs ? alt_ser_reqsList : NULL,
|
alt_ser_reqs ? alt_ser_reqsList : NULL,
|
||||||
|
alt_ser_reqs_data && cJSON_IsNull(alt_ser_reqs_data) ? true : false,
|
||||||
alt_ser_reqs_data ? alt_ser_reqs_dataList : NULL,
|
alt_ser_reqs_data ? alt_ser_reqs_dataList : NULL,
|
||||||
dis_ue_notif ? true : false,
|
dis_ue_notif ? true : false,
|
||||||
dis_ue_notif ? dis_ue_notif->valueint : 0,
|
dis_ue_notif ? dis_ue_notif->valueint : 0,
|
||||||
cont_ver ? true : false,
|
cont_ver ? true : false,
|
||||||
cont_ver ? cont_ver->valuedouble : 0,
|
cont_ver ? cont_ver->valuedouble : 0,
|
||||||
codecs ? codecsList : NULL,
|
codecs ? codecsList : NULL,
|
||||||
|
des_max_latency && cJSON_IsNull(des_max_latency) ? true : false,
|
||||||
des_max_latency ? true : false,
|
des_max_latency ? true : false,
|
||||||
des_max_latency ? des_max_latency->valuedouble : 0,
|
des_max_latency ? des_max_latency->valuedouble : 0,
|
||||||
|
des_max_loss && cJSON_IsNull(des_max_loss) ? true : false,
|
||||||
des_max_loss ? true : false,
|
des_max_loss ? true : false,
|
||||||
des_max_loss ? des_max_loss->valuedouble : 0,
|
des_max_loss ? des_max_loss->valuedouble : 0,
|
||||||
|
flus_id && cJSON_IsNull(flus_id) ? true : false,
|
||||||
flus_id && !cJSON_IsNull(flus_id) ? ogs_strdup(flus_id->valuestring) : NULL,
|
flus_id && !cJSON_IsNull(flus_id) ? ogs_strdup(flus_id->valuestring) : NULL,
|
||||||
f_status ? f_statusVariable : 0,
|
f_status ? f_statusVariable : 0,
|
||||||
|
mar_bw_dl && cJSON_IsNull(mar_bw_dl) ? true : false,
|
||||||
mar_bw_dl && !cJSON_IsNull(mar_bw_dl) ? ogs_strdup(mar_bw_dl->valuestring) : NULL,
|
mar_bw_dl && !cJSON_IsNull(mar_bw_dl) ? ogs_strdup(mar_bw_dl->valuestring) : NULL,
|
||||||
|
mar_bw_ul && cJSON_IsNull(mar_bw_ul) ? true : false,
|
||||||
mar_bw_ul && !cJSON_IsNull(mar_bw_ul) ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
|
mar_bw_ul && !cJSON_IsNull(mar_bw_ul) ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
|
||||||
|
max_packet_loss_rate_dl && cJSON_IsNull(max_packet_loss_rate_dl) ? true : false,
|
||||||
max_packet_loss_rate_dl ? true : false,
|
max_packet_loss_rate_dl ? true : false,
|
||||||
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
|
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
|
||||||
|
max_packet_loss_rate_ul && cJSON_IsNull(max_packet_loss_rate_ul) ? true : false,
|
||||||
max_packet_loss_rate_ul ? true : false,
|
max_packet_loss_rate_ul ? true : false,
|
||||||
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
|
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
|
||||||
|
max_supp_bw_dl && cJSON_IsNull(max_supp_bw_dl) ? true : false,
|
||||||
max_supp_bw_dl && !cJSON_IsNull(max_supp_bw_dl) ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL,
|
max_supp_bw_dl && !cJSON_IsNull(max_supp_bw_dl) ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL,
|
||||||
|
max_supp_bw_ul && cJSON_IsNull(max_supp_bw_ul) ? true : false,
|
||||||
max_supp_bw_ul && !cJSON_IsNull(max_supp_bw_ul) ? ogs_strdup(max_supp_bw_ul->valuestring) : NULL,
|
max_supp_bw_ul && !cJSON_IsNull(max_supp_bw_ul) ? ogs_strdup(max_supp_bw_ul->valuestring) : NULL,
|
||||||
|
|
||||||
med_comp_n->valuedouble,
|
med_comp_n->valuedouble,
|
||||||
med_sub_comps ? med_sub_compsList : NULL,
|
med_sub_comps ? med_sub_compsList : NULL,
|
||||||
med_type ? med_typeVariable : 0,
|
med_type ? med_typeVariable : 0,
|
||||||
|
min_des_bw_dl && cJSON_IsNull(min_des_bw_dl) ? true : false,
|
||||||
min_des_bw_dl && !cJSON_IsNull(min_des_bw_dl) ? ogs_strdup(min_des_bw_dl->valuestring) : NULL,
|
min_des_bw_dl && !cJSON_IsNull(min_des_bw_dl) ? ogs_strdup(min_des_bw_dl->valuestring) : NULL,
|
||||||
|
min_des_bw_ul && cJSON_IsNull(min_des_bw_ul) ? true : false,
|
||||||
min_des_bw_ul && !cJSON_IsNull(min_des_bw_ul) ? ogs_strdup(min_des_bw_ul->valuestring) : NULL,
|
min_des_bw_ul && !cJSON_IsNull(min_des_bw_ul) ? ogs_strdup(min_des_bw_ul->valuestring) : NULL,
|
||||||
|
mir_bw_dl && cJSON_IsNull(mir_bw_dl) ? true : false,
|
||||||
mir_bw_dl && !cJSON_IsNull(mir_bw_dl) ? ogs_strdup(mir_bw_dl->valuestring) : NULL,
|
mir_bw_dl && !cJSON_IsNull(mir_bw_dl) ? ogs_strdup(mir_bw_dl->valuestring) : NULL,
|
||||||
|
mir_bw_ul && cJSON_IsNull(mir_bw_ul) ? true : false,
|
||||||
mir_bw_ul && !cJSON_IsNull(mir_bw_ul) ? ogs_strdup(mir_bw_ul->valuestring) : NULL,
|
mir_bw_ul && !cJSON_IsNull(mir_bw_ul) ? ogs_strdup(mir_bw_ul->valuestring) : NULL,
|
||||||
preempt_cap ? preempt_cap_local_nonprim : NULL,
|
preempt_cap ? preempt_cap_local_nonprim : NULL,
|
||||||
preempt_vuln ? preempt_vuln_local_nonprim : NULL,
|
preempt_vuln ? preempt_vuln_local_nonprim : NULL,
|
||||||
prio_sharing_ind ? prio_sharing_indVariable : 0,
|
prio_sharing_ind ? prio_sharing_indVariable : 0,
|
||||||
res_prio ? res_prioVariable : 0,
|
res_prio ? res_prioVariable : 0,
|
||||||
|
rr_bw && cJSON_IsNull(rr_bw) ? true : false,
|
||||||
rr_bw && !cJSON_IsNull(rr_bw) ? ogs_strdup(rr_bw->valuestring) : NULL,
|
rr_bw && !cJSON_IsNull(rr_bw) ? ogs_strdup(rr_bw->valuestring) : NULL,
|
||||||
|
rs_bw && cJSON_IsNull(rs_bw) ? true : false,
|
||||||
rs_bw && !cJSON_IsNull(rs_bw) ? ogs_strdup(rs_bw->valuestring) : NULL,
|
rs_bw && !cJSON_IsNull(rs_bw) ? ogs_strdup(rs_bw->valuestring) : NULL,
|
||||||
|
sharing_key_dl && cJSON_IsNull(sharing_key_dl) ? true : false,
|
||||||
sharing_key_dl ? true : false,
|
sharing_key_dl ? true : false,
|
||||||
sharing_key_dl ? sharing_key_dl->valuedouble : 0,
|
sharing_key_dl ? sharing_key_dl->valuedouble : 0,
|
||||||
|
sharing_key_ul && cJSON_IsNull(sharing_key_ul) ? true : false,
|
||||||
sharing_key_ul ? true : false,
|
sharing_key_ul ? true : false,
|
||||||
sharing_key_ul ? sharing_key_ul->valuedouble : 0,
|
sharing_key_ul ? sharing_key_ul->valuedouble : 0,
|
||||||
|
tsn_qos && cJSON_IsNull(tsn_qos) ? true : false,
|
||||||
tsn_qos ? tsn_qos_local_nonprim : NULL,
|
tsn_qos ? tsn_qos_local_nonprim : NULL,
|
||||||
|
tscai_input_dl && cJSON_IsNull(tscai_input_dl) ? true : false,
|
||||||
tscai_input_dl ? tscai_input_dl_local_nonprim : NULL,
|
tscai_input_dl ? tscai_input_dl_local_nonprim : NULL,
|
||||||
|
tscai_input_ul && cJSON_IsNull(tscai_input_ul) ? true : false,
|
||||||
tscai_input_ul ? tscai_input_ul_local_nonprim : NULL,
|
tscai_input_ul ? tscai_input_ul_local_nonprim : NULL,
|
||||||
tscai_time_dom ? true : false,
|
tscai_time_dom ? true : false,
|
||||||
tscai_time_dom ? tscai_time_dom->valuedouble : 0
|
tscai_time_dom ? tscai_time_dom->valuedouble : 0
|
||||||
|
|
|
@ -31,48 +31,72 @@ extern "C" {
|
||||||
typedef struct OpenAPI_media_component_rm_s OpenAPI_media_component_rm_t;
|
typedef struct OpenAPI_media_component_rm_s OpenAPI_media_component_rm_t;
|
||||||
typedef struct OpenAPI_media_component_rm_s {
|
typedef struct OpenAPI_media_component_rm_s {
|
||||||
char *af_app_id;
|
char *af_app_id;
|
||||||
|
bool is_af_rout_req_null;
|
||||||
struct OpenAPI_af_routing_requirement_rm_s *af_rout_req;
|
struct OpenAPI_af_routing_requirement_rm_s *af_rout_req;
|
||||||
|
bool is_qos_reference_null;
|
||||||
char *qos_reference;
|
char *qos_reference;
|
||||||
|
bool is_alt_ser_reqs_null;
|
||||||
OpenAPI_list_t *alt_ser_reqs;
|
OpenAPI_list_t *alt_ser_reqs;
|
||||||
|
bool is_alt_ser_reqs_data_null;
|
||||||
OpenAPI_list_t *alt_ser_reqs_data;
|
OpenAPI_list_t *alt_ser_reqs_data;
|
||||||
bool is_dis_ue_notif;
|
bool is_dis_ue_notif;
|
||||||
int dis_ue_notif;
|
int dis_ue_notif;
|
||||||
bool is_cont_ver;
|
bool is_cont_ver;
|
||||||
int cont_ver;
|
int cont_ver;
|
||||||
OpenAPI_list_t *codecs;
|
OpenAPI_list_t *codecs;
|
||||||
|
bool is_des_max_latency_null;
|
||||||
bool is_des_max_latency;
|
bool is_des_max_latency;
|
||||||
float des_max_latency;
|
float des_max_latency;
|
||||||
|
bool is_des_max_loss_null;
|
||||||
bool is_des_max_loss;
|
bool is_des_max_loss;
|
||||||
float des_max_loss;
|
float des_max_loss;
|
||||||
|
bool is_flus_id_null;
|
||||||
char *flus_id;
|
char *flus_id;
|
||||||
OpenAPI_flow_status_e f_status;
|
OpenAPI_flow_status_e f_status;
|
||||||
|
bool is_mar_bw_dl_null;
|
||||||
char *mar_bw_dl;
|
char *mar_bw_dl;
|
||||||
|
bool is_mar_bw_ul_null;
|
||||||
char *mar_bw_ul;
|
char *mar_bw_ul;
|
||||||
|
bool is_max_packet_loss_rate_dl_null;
|
||||||
bool is_max_packet_loss_rate_dl;
|
bool is_max_packet_loss_rate_dl;
|
||||||
int max_packet_loss_rate_dl;
|
int max_packet_loss_rate_dl;
|
||||||
|
bool is_max_packet_loss_rate_ul_null;
|
||||||
bool is_max_packet_loss_rate_ul;
|
bool is_max_packet_loss_rate_ul;
|
||||||
int max_packet_loss_rate_ul;
|
int max_packet_loss_rate_ul;
|
||||||
|
bool is_max_supp_bw_dl_null;
|
||||||
char *max_supp_bw_dl;
|
char *max_supp_bw_dl;
|
||||||
|
bool is_max_supp_bw_ul_null;
|
||||||
char *max_supp_bw_ul;
|
char *max_supp_bw_ul;
|
||||||
int med_comp_n;
|
int med_comp_n;
|
||||||
OpenAPI_list_t* med_sub_comps;
|
OpenAPI_list_t* med_sub_comps;
|
||||||
OpenAPI_media_type_e med_type;
|
OpenAPI_media_type_e med_type;
|
||||||
|
bool is_min_des_bw_dl_null;
|
||||||
char *min_des_bw_dl;
|
char *min_des_bw_dl;
|
||||||
|
bool is_min_des_bw_ul_null;
|
||||||
char *min_des_bw_ul;
|
char *min_des_bw_ul;
|
||||||
|
bool is_mir_bw_dl_null;
|
||||||
char *mir_bw_dl;
|
char *mir_bw_dl;
|
||||||
|
bool is_mir_bw_ul_null;
|
||||||
char *mir_bw_ul;
|
char *mir_bw_ul;
|
||||||
struct OpenAPI_preemption_capability_rm_s *preempt_cap;
|
struct OpenAPI_preemption_capability_rm_s *preempt_cap;
|
||||||
struct OpenAPI_preemption_vulnerability_rm_s *preempt_vuln;
|
struct OpenAPI_preemption_vulnerability_rm_s *preempt_vuln;
|
||||||
OpenAPI_priority_sharing_indicator_e prio_sharing_ind;
|
OpenAPI_priority_sharing_indicator_e prio_sharing_ind;
|
||||||
OpenAPI_reserv_priority_e res_prio;
|
OpenAPI_reserv_priority_e res_prio;
|
||||||
|
bool is_rr_bw_null;
|
||||||
char *rr_bw;
|
char *rr_bw;
|
||||||
|
bool is_rs_bw_null;
|
||||||
char *rs_bw;
|
char *rs_bw;
|
||||||
|
bool is_sharing_key_dl_null;
|
||||||
bool is_sharing_key_dl;
|
bool is_sharing_key_dl;
|
||||||
int sharing_key_dl;
|
int sharing_key_dl;
|
||||||
|
bool is_sharing_key_ul_null;
|
||||||
bool is_sharing_key_ul;
|
bool is_sharing_key_ul;
|
||||||
int sharing_key_ul;
|
int sharing_key_ul;
|
||||||
|
bool is_tsn_qos_null;
|
||||||
struct OpenAPI_tsn_qos_container_rm_s *tsn_qos;
|
struct OpenAPI_tsn_qos_container_rm_s *tsn_qos;
|
||||||
|
bool is_tscai_input_dl_null;
|
||||||
struct OpenAPI_tscai_input_container_s *tscai_input_dl;
|
struct OpenAPI_tscai_input_container_s *tscai_input_dl;
|
||||||
|
bool is_tscai_input_ul_null;
|
||||||
struct OpenAPI_tscai_input_container_s *tscai_input_ul;
|
struct OpenAPI_tscai_input_container_s *tscai_input_ul;
|
||||||
bool is_tscai_time_dom;
|
bool is_tscai_time_dom;
|
||||||
int tscai_time_dom;
|
int tscai_time_dom;
|
||||||
|
@ -80,48 +104,72 @@ typedef struct OpenAPI_media_component_rm_s {
|
||||||
|
|
||||||
OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_create(
|
OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_create(
|
||||||
char *af_app_id,
|
char *af_app_id,
|
||||||
|
bool is_af_rout_req_null,
|
||||||
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
OpenAPI_af_routing_requirement_rm_t *af_rout_req,
|
||||||
|
bool is_qos_reference_null,
|
||||||
char *qos_reference,
|
char *qos_reference,
|
||||||
|
bool is_alt_ser_reqs_null,
|
||||||
OpenAPI_list_t *alt_ser_reqs,
|
OpenAPI_list_t *alt_ser_reqs,
|
||||||
|
bool is_alt_ser_reqs_data_null,
|
||||||
OpenAPI_list_t *alt_ser_reqs_data,
|
OpenAPI_list_t *alt_ser_reqs_data,
|
||||||
bool is_dis_ue_notif,
|
bool is_dis_ue_notif,
|
||||||
int dis_ue_notif,
|
int dis_ue_notif,
|
||||||
bool is_cont_ver,
|
bool is_cont_ver,
|
||||||
int cont_ver,
|
int cont_ver,
|
||||||
OpenAPI_list_t *codecs,
|
OpenAPI_list_t *codecs,
|
||||||
|
bool is_des_max_latency_null,
|
||||||
bool is_des_max_latency,
|
bool is_des_max_latency,
|
||||||
float des_max_latency,
|
float des_max_latency,
|
||||||
|
bool is_des_max_loss_null,
|
||||||
bool is_des_max_loss,
|
bool is_des_max_loss,
|
||||||
float des_max_loss,
|
float des_max_loss,
|
||||||
|
bool is_flus_id_null,
|
||||||
char *flus_id,
|
char *flus_id,
|
||||||
OpenAPI_flow_status_e f_status,
|
OpenAPI_flow_status_e f_status,
|
||||||
|
bool is_mar_bw_dl_null,
|
||||||
char *mar_bw_dl,
|
char *mar_bw_dl,
|
||||||
|
bool is_mar_bw_ul_null,
|
||||||
char *mar_bw_ul,
|
char *mar_bw_ul,
|
||||||
|
bool is_max_packet_loss_rate_dl_null,
|
||||||
bool is_max_packet_loss_rate_dl,
|
bool is_max_packet_loss_rate_dl,
|
||||||
int max_packet_loss_rate_dl,
|
int max_packet_loss_rate_dl,
|
||||||
|
bool is_max_packet_loss_rate_ul_null,
|
||||||
bool is_max_packet_loss_rate_ul,
|
bool is_max_packet_loss_rate_ul,
|
||||||
int max_packet_loss_rate_ul,
|
int max_packet_loss_rate_ul,
|
||||||
|
bool is_max_supp_bw_dl_null,
|
||||||
char *max_supp_bw_dl,
|
char *max_supp_bw_dl,
|
||||||
|
bool is_max_supp_bw_ul_null,
|
||||||
char *max_supp_bw_ul,
|
char *max_supp_bw_ul,
|
||||||
int med_comp_n,
|
int med_comp_n,
|
||||||
OpenAPI_list_t* med_sub_comps,
|
OpenAPI_list_t* med_sub_comps,
|
||||||
OpenAPI_media_type_e med_type,
|
OpenAPI_media_type_e med_type,
|
||||||
|
bool is_min_des_bw_dl_null,
|
||||||
char *min_des_bw_dl,
|
char *min_des_bw_dl,
|
||||||
|
bool is_min_des_bw_ul_null,
|
||||||
char *min_des_bw_ul,
|
char *min_des_bw_ul,
|
||||||
|
bool is_mir_bw_dl_null,
|
||||||
char *mir_bw_dl,
|
char *mir_bw_dl,
|
||||||
|
bool is_mir_bw_ul_null,
|
||||||
char *mir_bw_ul,
|
char *mir_bw_ul,
|
||||||
OpenAPI_preemption_capability_rm_t *preempt_cap,
|
OpenAPI_preemption_capability_rm_t *preempt_cap,
|
||||||
OpenAPI_preemption_vulnerability_rm_t *preempt_vuln,
|
OpenAPI_preemption_vulnerability_rm_t *preempt_vuln,
|
||||||
OpenAPI_priority_sharing_indicator_e prio_sharing_ind,
|
OpenAPI_priority_sharing_indicator_e prio_sharing_ind,
|
||||||
OpenAPI_reserv_priority_e res_prio,
|
OpenAPI_reserv_priority_e res_prio,
|
||||||
|
bool is_rr_bw_null,
|
||||||
char *rr_bw,
|
char *rr_bw,
|
||||||
|
bool is_rs_bw_null,
|
||||||
char *rs_bw,
|
char *rs_bw,
|
||||||
|
bool is_sharing_key_dl_null,
|
||||||
bool is_sharing_key_dl,
|
bool is_sharing_key_dl,
|
||||||
int sharing_key_dl,
|
int sharing_key_dl,
|
||||||
|
bool is_sharing_key_ul_null,
|
||||||
bool is_sharing_key_ul,
|
bool is_sharing_key_ul,
|
||||||
int sharing_key_ul,
|
int sharing_key_ul,
|
||||||
|
bool is_tsn_qos_null,
|
||||||
OpenAPI_tsn_qos_container_rm_t *tsn_qos,
|
OpenAPI_tsn_qos_container_rm_t *tsn_qos,
|
||||||
|
bool is_tscai_input_dl_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
||||||
|
bool is_tscai_input_ul_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
||||||
bool is_tscai_time_dom,
|
bool is_tscai_time_dom,
|
||||||
int tscai_time_dom
|
int tscai_time_dom
|
||||||
|
|
|
@ -6,12 +6,17 @@
|
||||||
|
|
||||||
OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_create(
|
OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_create(
|
||||||
OpenAPI_af_sig_protocol_e af_sig_protocol,
|
OpenAPI_af_sig_protocol_e af_sig_protocol,
|
||||||
|
bool is_ethf_descs_null,
|
||||||
OpenAPI_list_t *ethf_descs,
|
OpenAPI_list_t *ethf_descs,
|
||||||
int f_num,
|
int f_num,
|
||||||
|
bool is_f_descs_null,
|
||||||
OpenAPI_list_t *f_descs,
|
OpenAPI_list_t *f_descs,
|
||||||
OpenAPI_flow_status_e f_status,
|
OpenAPI_flow_status_e f_status,
|
||||||
|
bool is_mar_bw_dl_null,
|
||||||
char *mar_bw_dl,
|
char *mar_bw_dl,
|
||||||
|
bool is_mar_bw_ul_null,
|
||||||
char *mar_bw_ul,
|
char *mar_bw_ul,
|
||||||
|
bool is_tos_tr_cl_null,
|
||||||
char *tos_tr_cl,
|
char *tos_tr_cl,
|
||||||
OpenAPI_flow_usage_e flow_usage
|
OpenAPI_flow_usage_e flow_usage
|
||||||
)
|
)
|
||||||
|
@ -20,12 +25,17 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_create(
|
||||||
ogs_assert(media_sub_component_rm_local_var);
|
ogs_assert(media_sub_component_rm_local_var);
|
||||||
|
|
||||||
media_sub_component_rm_local_var->af_sig_protocol = af_sig_protocol;
|
media_sub_component_rm_local_var->af_sig_protocol = af_sig_protocol;
|
||||||
|
media_sub_component_rm_local_var->is_ethf_descs_null = is_ethf_descs_null;
|
||||||
media_sub_component_rm_local_var->ethf_descs = ethf_descs;
|
media_sub_component_rm_local_var->ethf_descs = ethf_descs;
|
||||||
media_sub_component_rm_local_var->f_num = f_num;
|
media_sub_component_rm_local_var->f_num = f_num;
|
||||||
|
media_sub_component_rm_local_var->is_f_descs_null = is_f_descs_null;
|
||||||
media_sub_component_rm_local_var->f_descs = f_descs;
|
media_sub_component_rm_local_var->f_descs = f_descs;
|
||||||
media_sub_component_rm_local_var->f_status = f_status;
|
media_sub_component_rm_local_var->f_status = f_status;
|
||||||
|
media_sub_component_rm_local_var->is_mar_bw_dl_null = is_mar_bw_dl_null;
|
||||||
media_sub_component_rm_local_var->mar_bw_dl = mar_bw_dl;
|
media_sub_component_rm_local_var->mar_bw_dl = mar_bw_dl;
|
||||||
|
media_sub_component_rm_local_var->is_mar_bw_ul_null = is_mar_bw_ul_null;
|
||||||
media_sub_component_rm_local_var->mar_bw_ul = mar_bw_ul;
|
media_sub_component_rm_local_var->mar_bw_ul = mar_bw_ul;
|
||||||
|
media_sub_component_rm_local_var->is_tos_tr_cl_null = is_tos_tr_cl_null;
|
||||||
media_sub_component_rm_local_var->tos_tr_cl = tos_tr_cl;
|
media_sub_component_rm_local_var->tos_tr_cl = tos_tr_cl;
|
||||||
media_sub_component_rm_local_var->flow_usage = flow_usage;
|
media_sub_component_rm_local_var->flow_usage = flow_usage;
|
||||||
|
|
||||||
|
@ -100,6 +110,11 @@ cJSON *OpenAPI_media_sub_component_rm_convertToJSON(OpenAPI_media_sub_component_
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(ethf_descsList, itemLocal);
|
cJSON_AddItemToArray(ethf_descsList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (media_sub_component_rm->is_ethf_descs_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ethfDescs") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [ethf_descs]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cJSON_AddNumberToObject(item, "fNum", media_sub_component_rm->f_num) == NULL) {
|
if (cJSON_AddNumberToObject(item, "fNum", media_sub_component_rm->f_num) == NULL) {
|
||||||
|
@ -119,6 +134,11 @@ cJSON *OpenAPI_media_sub_component_rm_convertToJSON(OpenAPI_media_sub_component_
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (media_sub_component_rm->is_f_descs_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "fDescs") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [f_descs]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_sub_component_rm->f_status != OpenAPI_flow_status_NULL) {
|
if (media_sub_component_rm->f_status != OpenAPI_flow_status_NULL) {
|
||||||
|
@ -133,6 +153,11 @@ cJSON *OpenAPI_media_sub_component_rm_convertToJSON(OpenAPI_media_sub_component_
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [mar_bw_dl]");
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [mar_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_sub_component_rm->is_mar_bw_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "marBwDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [mar_bw_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_sub_component_rm->mar_bw_ul) {
|
if (media_sub_component_rm->mar_bw_ul) {
|
||||||
|
@ -140,6 +165,11 @@ cJSON *OpenAPI_media_sub_component_rm_convertToJSON(OpenAPI_media_sub_component_
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [mar_bw_ul]");
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [mar_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_sub_component_rm->is_mar_bw_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "marBwUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [mar_bw_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_sub_component_rm->tos_tr_cl) {
|
if (media_sub_component_rm->tos_tr_cl) {
|
||||||
|
@ -147,6 +177,11 @@ cJSON *OpenAPI_media_sub_component_rm_convertToJSON(OpenAPI_media_sub_component_
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [tos_tr_cl]");
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [tos_tr_cl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (media_sub_component_rm->is_tos_tr_cl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tosTrCl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_media_sub_component_rm_convertToJSON() failed [tos_tr_cl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (media_sub_component_rm->flow_usage != OpenAPI_flow_usage_NULL) {
|
if (media_sub_component_rm->flow_usage != OpenAPI_flow_usage_NULL) {
|
||||||
|
@ -189,6 +224,7 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c
|
||||||
|
|
||||||
ethf_descs = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "ethfDescs");
|
ethf_descs = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "ethfDescs");
|
||||||
if (ethf_descs) {
|
if (ethf_descs) {
|
||||||
|
if (!cJSON_IsNull(ethf_descs)) {
|
||||||
cJSON *ethf_descs_local = NULL;
|
cJSON *ethf_descs_local = NULL;
|
||||||
if (!cJSON_IsArray(ethf_descs)) {
|
if (!cJSON_IsArray(ethf_descs)) {
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [ethf_descs]");
|
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [ethf_descs]");
|
||||||
|
@ -210,6 +246,7 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c
|
||||||
OpenAPI_list_add(ethf_descsList, ethf_descsItem);
|
OpenAPI_list_add(ethf_descsList, ethf_descsItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
f_num = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "fNum");
|
f_num = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "fNum");
|
||||||
if (!f_num) {
|
if (!f_num) {
|
||||||
|
@ -223,6 +260,7 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c
|
||||||
|
|
||||||
f_descs = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "fDescs");
|
f_descs = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "fDescs");
|
||||||
if (f_descs) {
|
if (f_descs) {
|
||||||
|
if (!cJSON_IsNull(f_descs)) {
|
||||||
cJSON *f_descs_local = NULL;
|
cJSON *f_descs_local = NULL;
|
||||||
if (!cJSON_IsArray(f_descs)) {
|
if (!cJSON_IsArray(f_descs)) {
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [f_descs]");
|
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [f_descs]");
|
||||||
|
@ -241,6 +279,7 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c
|
||||||
OpenAPI_list_add(f_descsList, ogs_strdup(f_descs_local->valuestring));
|
OpenAPI_list_add(f_descsList, ogs_strdup(f_descs_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
f_status = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "fStatus");
|
f_status = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "fStatus");
|
||||||
if (f_status) {
|
if (f_status) {
|
||||||
|
@ -253,27 +292,33 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c
|
||||||
|
|
||||||
mar_bw_dl = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "marBwDl");
|
mar_bw_dl = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "marBwDl");
|
||||||
if (mar_bw_dl) {
|
if (mar_bw_dl) {
|
||||||
|
if (!cJSON_IsNull(mar_bw_dl)) {
|
||||||
if (!cJSON_IsString(mar_bw_dl) && !cJSON_IsNull(mar_bw_dl)) {
|
if (!cJSON_IsString(mar_bw_dl) && !cJSON_IsNull(mar_bw_dl)) {
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [mar_bw_dl]");
|
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [mar_bw_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mar_bw_ul = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "marBwUl");
|
mar_bw_ul = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "marBwUl");
|
||||||
if (mar_bw_ul) {
|
if (mar_bw_ul) {
|
||||||
|
if (!cJSON_IsNull(mar_bw_ul)) {
|
||||||
if (!cJSON_IsString(mar_bw_ul) && !cJSON_IsNull(mar_bw_ul)) {
|
if (!cJSON_IsString(mar_bw_ul) && !cJSON_IsNull(mar_bw_ul)) {
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [mar_bw_ul]");
|
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [mar_bw_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tos_tr_cl = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "tosTrCl");
|
tos_tr_cl = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "tosTrCl");
|
||||||
if (tos_tr_cl) {
|
if (tos_tr_cl) {
|
||||||
|
if (!cJSON_IsNull(tos_tr_cl)) {
|
||||||
if (!cJSON_IsString(tos_tr_cl) && !cJSON_IsNull(tos_tr_cl)) {
|
if (!cJSON_IsString(tos_tr_cl) && !cJSON_IsNull(tos_tr_cl)) {
|
||||||
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [tos_tr_cl]");
|
ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [tos_tr_cl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
flow_usage = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "flowUsage");
|
flow_usage = cJSON_GetObjectItemCaseSensitive(media_sub_component_rmJSON, "flowUsage");
|
||||||
if (flow_usage) {
|
if (flow_usage) {
|
||||||
|
@ -286,13 +331,18 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c
|
||||||
|
|
||||||
media_sub_component_rm_local_var = OpenAPI_media_sub_component_rm_create (
|
media_sub_component_rm_local_var = OpenAPI_media_sub_component_rm_create (
|
||||||
af_sig_protocol ? af_sig_protocolVariable : 0,
|
af_sig_protocol ? af_sig_protocolVariable : 0,
|
||||||
|
ethf_descs && cJSON_IsNull(ethf_descs) ? true : false,
|
||||||
ethf_descs ? ethf_descsList : NULL,
|
ethf_descs ? ethf_descsList : NULL,
|
||||||
|
|
||||||
f_num->valuedouble,
|
f_num->valuedouble,
|
||||||
|
f_descs && cJSON_IsNull(f_descs) ? true : false,
|
||||||
f_descs ? f_descsList : NULL,
|
f_descs ? f_descsList : NULL,
|
||||||
f_status ? f_statusVariable : 0,
|
f_status ? f_statusVariable : 0,
|
||||||
|
mar_bw_dl && cJSON_IsNull(mar_bw_dl) ? true : false,
|
||||||
mar_bw_dl && !cJSON_IsNull(mar_bw_dl) ? ogs_strdup(mar_bw_dl->valuestring) : NULL,
|
mar_bw_dl && !cJSON_IsNull(mar_bw_dl) ? ogs_strdup(mar_bw_dl->valuestring) : NULL,
|
||||||
|
mar_bw_ul && cJSON_IsNull(mar_bw_ul) ? true : false,
|
||||||
mar_bw_ul && !cJSON_IsNull(mar_bw_ul) ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
|
mar_bw_ul && !cJSON_IsNull(mar_bw_ul) ? ogs_strdup(mar_bw_ul->valuestring) : NULL,
|
||||||
|
tos_tr_cl && cJSON_IsNull(tos_tr_cl) ? true : false,
|
||||||
tos_tr_cl && !cJSON_IsNull(tos_tr_cl) ? ogs_strdup(tos_tr_cl->valuestring) : NULL,
|
tos_tr_cl && !cJSON_IsNull(tos_tr_cl) ? ogs_strdup(tos_tr_cl->valuestring) : NULL,
|
||||||
flow_usage ? flow_usageVariable : 0
|
flow_usage ? flow_usageVariable : 0
|
||||||
);
|
);
|
||||||
|
|
|
@ -24,24 +24,34 @@ extern "C" {
|
||||||
typedef struct OpenAPI_media_sub_component_rm_s OpenAPI_media_sub_component_rm_t;
|
typedef struct OpenAPI_media_sub_component_rm_s OpenAPI_media_sub_component_rm_t;
|
||||||
typedef struct OpenAPI_media_sub_component_rm_s {
|
typedef struct OpenAPI_media_sub_component_rm_s {
|
||||||
OpenAPI_af_sig_protocol_e af_sig_protocol;
|
OpenAPI_af_sig_protocol_e af_sig_protocol;
|
||||||
|
bool is_ethf_descs_null;
|
||||||
OpenAPI_list_t *ethf_descs;
|
OpenAPI_list_t *ethf_descs;
|
||||||
int f_num;
|
int f_num;
|
||||||
|
bool is_f_descs_null;
|
||||||
OpenAPI_list_t *f_descs;
|
OpenAPI_list_t *f_descs;
|
||||||
OpenAPI_flow_status_e f_status;
|
OpenAPI_flow_status_e f_status;
|
||||||
|
bool is_mar_bw_dl_null;
|
||||||
char *mar_bw_dl;
|
char *mar_bw_dl;
|
||||||
|
bool is_mar_bw_ul_null;
|
||||||
char *mar_bw_ul;
|
char *mar_bw_ul;
|
||||||
|
bool is_tos_tr_cl_null;
|
||||||
char *tos_tr_cl;
|
char *tos_tr_cl;
|
||||||
OpenAPI_flow_usage_e flow_usage;
|
OpenAPI_flow_usage_e flow_usage;
|
||||||
} OpenAPI_media_sub_component_rm_t;
|
} OpenAPI_media_sub_component_rm_t;
|
||||||
|
|
||||||
OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_create(
|
OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_create(
|
||||||
OpenAPI_af_sig_protocol_e af_sig_protocol,
|
OpenAPI_af_sig_protocol_e af_sig_protocol,
|
||||||
|
bool is_ethf_descs_null,
|
||||||
OpenAPI_list_t *ethf_descs,
|
OpenAPI_list_t *ethf_descs,
|
||||||
int f_num,
|
int f_num,
|
||||||
|
bool is_f_descs_null,
|
||||||
OpenAPI_list_t *f_descs,
|
OpenAPI_list_t *f_descs,
|
||||||
OpenAPI_flow_status_e f_status,
|
OpenAPI_flow_status_e f_status,
|
||||||
|
bool is_mar_bw_dl_null,
|
||||||
char *mar_bw_dl,
|
char *mar_bw_dl,
|
||||||
|
bool is_mar_bw_ul_null,
|
||||||
char *mar_bw_ul,
|
char *mar_bw_ul,
|
||||||
|
bool is_tos_tr_cl_null,
|
||||||
char *tos_tr_cl,
|
char *tos_tr_cl,
|
||||||
OpenAPI_flow_usage_e flow_usage
|
OpenAPI_flow_usage_e flow_usage
|
||||||
);
|
);
|
||||||
|
|
|
@ -8,6 +8,7 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_create(
|
||||||
OpenAPI_patch_operation_e op,
|
OpenAPI_patch_operation_e op,
|
||||||
char *path,
|
char *path,
|
||||||
char *from,
|
char *from,
|
||||||
|
bool is_value_null,
|
||||||
OpenAPI_any_type_t *value
|
OpenAPI_any_type_t *value
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -17,6 +18,7 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_create(
|
||||||
patch_item_local_var->op = op;
|
patch_item_local_var->op = op;
|
||||||
patch_item_local_var->path = path;
|
patch_item_local_var->path = path;
|
||||||
patch_item_local_var->from = from;
|
patch_item_local_var->from = from;
|
||||||
|
patch_item_local_var->is_value_null = is_value_null;
|
||||||
patch_item_local_var->value = value;
|
patch_item_local_var->value = value;
|
||||||
|
|
||||||
return patch_item_local_var;
|
return patch_item_local_var;
|
||||||
|
@ -91,6 +93,11 @@ cJSON *OpenAPI_patch_item_convertToJSON(OpenAPI_patch_item_t *patch_item)
|
||||||
ogs_error("OpenAPI_patch_item_convertToJSON() failed [value]");
|
ogs_error("OpenAPI_patch_item_convertToJSON() failed [value]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (patch_item->is_value_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "value") == NULL) {
|
||||||
|
ogs_error("OpenAPI_patch_item_convertToJSON() failed [value]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -138,13 +145,16 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON)
|
||||||
|
|
||||||
value = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "value");
|
value = cJSON_GetObjectItemCaseSensitive(patch_itemJSON, "value");
|
||||||
if (value) {
|
if (value) {
|
||||||
|
if (!cJSON_IsNull(value)) {
|
||||||
value_local_object = OpenAPI_any_type_parseFromJSON(value);
|
value_local_object = OpenAPI_any_type_parseFromJSON(value);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
patch_item_local_var = OpenAPI_patch_item_create (
|
patch_item_local_var = OpenAPI_patch_item_create (
|
||||||
opVariable,
|
opVariable,
|
||||||
ogs_strdup(path->valuestring),
|
ogs_strdup(path->valuestring),
|
||||||
from && !cJSON_IsNull(from) ? ogs_strdup(from->valuestring) : NULL,
|
from && !cJSON_IsNull(from) ? ogs_strdup(from->valuestring) : NULL,
|
||||||
|
value && cJSON_IsNull(value) ? true : false,
|
||||||
value ? value_local_object : NULL
|
value ? value_local_object : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ typedef struct OpenAPI_patch_item_s {
|
||||||
OpenAPI_patch_operation_e op;
|
OpenAPI_patch_operation_e op;
|
||||||
char *path;
|
char *path;
|
||||||
char *from;
|
char *from;
|
||||||
|
bool is_value_null;
|
||||||
OpenAPI_any_type_t *value;
|
OpenAPI_any_type_t *value;
|
||||||
} OpenAPI_patch_item_t;
|
} OpenAPI_patch_item_t;
|
||||||
|
|
||||||
|
@ -31,6 +32,7 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_create(
|
||||||
OpenAPI_patch_operation_e op,
|
OpenAPI_patch_operation_e op,
|
||||||
char *path,
|
char *path,
|
||||||
char *from,
|
char *from,
|
||||||
|
bool is_value_null,
|
||||||
OpenAPI_any_type_t *value
|
OpenAPI_any_type_t *value
|
||||||
);
|
);
|
||||||
void OpenAPI_patch_item_free(OpenAPI_patch_item_t *patch_item);
|
void OpenAPI_patch_item_free(OpenAPI_patch_item_t *patch_item);
|
||||||
|
|
|
@ -21,20 +21,31 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_create(
|
||||||
OpenAPI_list_t *ref_qos_data,
|
OpenAPI_list_t *ref_qos_data,
|
||||||
OpenAPI_list_t *ref_alt_qos_params,
|
OpenAPI_list_t *ref_alt_qos_params,
|
||||||
OpenAPI_list_t *ref_tc_data,
|
OpenAPI_list_t *ref_tc_data,
|
||||||
|
bool is_ref_chg_data_null,
|
||||||
OpenAPI_list_t *ref_chg_data,
|
OpenAPI_list_t *ref_chg_data,
|
||||||
|
bool is_ref_chg_n3g_data_null,
|
||||||
OpenAPI_list_t *ref_chg_n3g_data,
|
OpenAPI_list_t *ref_chg_n3g_data,
|
||||||
|
bool is_ref_um_data_null,
|
||||||
OpenAPI_list_t *ref_um_data,
|
OpenAPI_list_t *ref_um_data,
|
||||||
|
bool is_ref_um_n3g_data_null,
|
||||||
OpenAPI_list_t *ref_um_n3g_data,
|
OpenAPI_list_t *ref_um_n3g_data,
|
||||||
|
bool is_ref_cond_data_null,
|
||||||
char *ref_cond_data,
|
char *ref_cond_data,
|
||||||
|
bool is_ref_qos_mon_null,
|
||||||
OpenAPI_list_t *ref_qos_mon,
|
OpenAPI_list_t *ref_qos_mon,
|
||||||
|
bool is_addr_preser_ind_null,
|
||||||
bool is_addr_preser_ind,
|
bool is_addr_preser_ind,
|
||||||
int addr_preser_ind,
|
int addr_preser_ind,
|
||||||
|
bool is_tscai_input_dl_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
||||||
|
bool is_tscai_input_ul_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
||||||
bool is_tscai_time_dom,
|
bool is_tscai_time_dom,
|
||||||
int tscai_time_dom,
|
int tscai_time_dom,
|
||||||
OpenAPI_downlink_data_notification_control_t *dd_notif_ctrl,
|
OpenAPI_downlink_data_notification_control_t *dd_notif_ctrl,
|
||||||
|
bool is_dd_notif_ctrl2_null,
|
||||||
OpenAPI_downlink_data_notification_control_rm_t *dd_notif_ctrl2,
|
OpenAPI_downlink_data_notification_control_rm_t *dd_notif_ctrl2,
|
||||||
|
bool is_dis_ue_notif_null,
|
||||||
bool is_dis_ue_notif,
|
bool is_dis_ue_notif,
|
||||||
int dis_ue_notif,
|
int dis_ue_notif,
|
||||||
bool is_pack_filt_all_prec,
|
bool is_pack_filt_all_prec,
|
||||||
|
@ -60,20 +71,31 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_create(
|
||||||
pcc_rule_local_var->ref_qos_data = ref_qos_data;
|
pcc_rule_local_var->ref_qos_data = ref_qos_data;
|
||||||
pcc_rule_local_var->ref_alt_qos_params = ref_alt_qos_params;
|
pcc_rule_local_var->ref_alt_qos_params = ref_alt_qos_params;
|
||||||
pcc_rule_local_var->ref_tc_data = ref_tc_data;
|
pcc_rule_local_var->ref_tc_data = ref_tc_data;
|
||||||
|
pcc_rule_local_var->is_ref_chg_data_null = is_ref_chg_data_null;
|
||||||
pcc_rule_local_var->ref_chg_data = ref_chg_data;
|
pcc_rule_local_var->ref_chg_data = ref_chg_data;
|
||||||
|
pcc_rule_local_var->is_ref_chg_n3g_data_null = is_ref_chg_n3g_data_null;
|
||||||
pcc_rule_local_var->ref_chg_n3g_data = ref_chg_n3g_data;
|
pcc_rule_local_var->ref_chg_n3g_data = ref_chg_n3g_data;
|
||||||
|
pcc_rule_local_var->is_ref_um_data_null = is_ref_um_data_null;
|
||||||
pcc_rule_local_var->ref_um_data = ref_um_data;
|
pcc_rule_local_var->ref_um_data = ref_um_data;
|
||||||
|
pcc_rule_local_var->is_ref_um_n3g_data_null = is_ref_um_n3g_data_null;
|
||||||
pcc_rule_local_var->ref_um_n3g_data = ref_um_n3g_data;
|
pcc_rule_local_var->ref_um_n3g_data = ref_um_n3g_data;
|
||||||
|
pcc_rule_local_var->is_ref_cond_data_null = is_ref_cond_data_null;
|
||||||
pcc_rule_local_var->ref_cond_data = ref_cond_data;
|
pcc_rule_local_var->ref_cond_data = ref_cond_data;
|
||||||
|
pcc_rule_local_var->is_ref_qos_mon_null = is_ref_qos_mon_null;
|
||||||
pcc_rule_local_var->ref_qos_mon = ref_qos_mon;
|
pcc_rule_local_var->ref_qos_mon = ref_qos_mon;
|
||||||
|
pcc_rule_local_var->is_addr_preser_ind_null = is_addr_preser_ind_null;
|
||||||
pcc_rule_local_var->is_addr_preser_ind = is_addr_preser_ind;
|
pcc_rule_local_var->is_addr_preser_ind = is_addr_preser_ind;
|
||||||
pcc_rule_local_var->addr_preser_ind = addr_preser_ind;
|
pcc_rule_local_var->addr_preser_ind = addr_preser_ind;
|
||||||
|
pcc_rule_local_var->is_tscai_input_dl_null = is_tscai_input_dl_null;
|
||||||
pcc_rule_local_var->tscai_input_dl = tscai_input_dl;
|
pcc_rule_local_var->tscai_input_dl = tscai_input_dl;
|
||||||
|
pcc_rule_local_var->is_tscai_input_ul_null = is_tscai_input_ul_null;
|
||||||
pcc_rule_local_var->tscai_input_ul = tscai_input_ul;
|
pcc_rule_local_var->tscai_input_ul = tscai_input_ul;
|
||||||
pcc_rule_local_var->is_tscai_time_dom = is_tscai_time_dom;
|
pcc_rule_local_var->is_tscai_time_dom = is_tscai_time_dom;
|
||||||
pcc_rule_local_var->tscai_time_dom = tscai_time_dom;
|
pcc_rule_local_var->tscai_time_dom = tscai_time_dom;
|
||||||
pcc_rule_local_var->dd_notif_ctrl = dd_notif_ctrl;
|
pcc_rule_local_var->dd_notif_ctrl = dd_notif_ctrl;
|
||||||
|
pcc_rule_local_var->is_dd_notif_ctrl2_null = is_dd_notif_ctrl2_null;
|
||||||
pcc_rule_local_var->dd_notif_ctrl2 = dd_notif_ctrl2;
|
pcc_rule_local_var->dd_notif_ctrl2 = dd_notif_ctrl2;
|
||||||
|
pcc_rule_local_var->is_dis_ue_notif_null = is_dis_ue_notif_null;
|
||||||
pcc_rule_local_var->is_dis_ue_notif = is_dis_ue_notif;
|
pcc_rule_local_var->is_dis_ue_notif = is_dis_ue_notif;
|
||||||
pcc_rule_local_var->dis_ue_notif = dis_ue_notif;
|
pcc_rule_local_var->dis_ue_notif = dis_ue_notif;
|
||||||
pcc_rule_local_var->is_pack_filt_all_prec = is_pack_filt_all_prec;
|
pcc_rule_local_var->is_pack_filt_all_prec = is_pack_filt_all_prec;
|
||||||
|
@ -326,6 +348,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_ref_chg_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "refChgData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_chg_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->ref_chg_n3g_data) {
|
if (pcc_rule->ref_chg_n3g_data) {
|
||||||
|
@ -340,6 +367,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_ref_chg_n3g_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "refChgN3gData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_chg_n3g_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->ref_um_data) {
|
if (pcc_rule->ref_um_data) {
|
||||||
|
@ -354,6 +386,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_ref_um_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "refUmData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_um_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->ref_um_n3g_data) {
|
if (pcc_rule->ref_um_n3g_data) {
|
||||||
|
@ -368,6 +405,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_ref_um_n3g_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "refUmN3gData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_um_n3g_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->ref_cond_data) {
|
if (pcc_rule->ref_cond_data) {
|
||||||
|
@ -375,6 +417,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_cond_data]");
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_cond_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_ref_cond_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "refCondData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_cond_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->ref_qos_mon) {
|
if (pcc_rule->ref_qos_mon) {
|
||||||
|
@ -389,6 +436,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_ref_qos_mon_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "refQosMon") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [ref_qos_mon]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->is_addr_preser_ind) {
|
if (pcc_rule->is_addr_preser_ind) {
|
||||||
|
@ -396,6 +448,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [addr_preser_ind]");
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [addr_preser_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_addr_preser_ind_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "addrPreserInd") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [addr_preser_ind]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->tscai_input_dl) {
|
if (pcc_rule->tscai_input_dl) {
|
||||||
|
@ -409,6 +466,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [tscai_input_dl]");
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [tscai_input_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_tscai_input_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tscaiInputDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [tscai_input_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->tscai_input_ul) {
|
if (pcc_rule->tscai_input_ul) {
|
||||||
|
@ -422,6 +484,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [tscai_input_ul]");
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [tscai_input_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_tscai_input_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "tscaiInputUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [tscai_input_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->is_tscai_time_dom) {
|
if (pcc_rule->is_tscai_time_dom) {
|
||||||
|
@ -455,6 +522,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [dd_notif_ctrl2]");
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [dd_notif_ctrl2]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_dd_notif_ctrl2_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ddNotifCtrl2") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [dd_notif_ctrl2]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->is_dis_ue_notif) {
|
if (pcc_rule->is_dis_ue_notif) {
|
||||||
|
@ -462,6 +534,11 @@ cJSON *OpenAPI_pcc_rule_convertToJSON(OpenAPI_pcc_rule_t *pcc_rule)
|
||||||
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [dis_ue_notif]");
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [dis_ue_notif]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcc_rule->is_dis_ue_notif_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "disUeNotif") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcc_rule_convertToJSON() failed [dis_ue_notif]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcc_rule->is_pack_filt_all_prec) {
|
if (pcc_rule->is_pack_filt_all_prec) {
|
||||||
|
@ -675,6 +752,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
|
|
||||||
ref_chg_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refChgData");
|
ref_chg_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refChgData");
|
||||||
if (ref_chg_data) {
|
if (ref_chg_data) {
|
||||||
|
if (!cJSON_IsNull(ref_chg_data)) {
|
||||||
cJSON *ref_chg_data_local = NULL;
|
cJSON *ref_chg_data_local = NULL;
|
||||||
if (!cJSON_IsArray(ref_chg_data)) {
|
if (!cJSON_IsArray(ref_chg_data)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_data]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_data]");
|
||||||
|
@ -693,9 +771,11 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
OpenAPI_list_add(ref_chg_dataList, ogs_strdup(ref_chg_data_local->valuestring));
|
OpenAPI_list_add(ref_chg_dataList, ogs_strdup(ref_chg_data_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ref_chg_n3g_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refChgN3gData");
|
ref_chg_n3g_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refChgN3gData");
|
||||||
if (ref_chg_n3g_data) {
|
if (ref_chg_n3g_data) {
|
||||||
|
if (!cJSON_IsNull(ref_chg_n3g_data)) {
|
||||||
cJSON *ref_chg_n3g_data_local = NULL;
|
cJSON *ref_chg_n3g_data_local = NULL;
|
||||||
if (!cJSON_IsArray(ref_chg_n3g_data)) {
|
if (!cJSON_IsArray(ref_chg_n3g_data)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_n3g_data]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_n3g_data]");
|
||||||
|
@ -714,9 +794,11 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
OpenAPI_list_add(ref_chg_n3g_dataList, ogs_strdup(ref_chg_n3g_data_local->valuestring));
|
OpenAPI_list_add(ref_chg_n3g_dataList, ogs_strdup(ref_chg_n3g_data_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ref_um_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refUmData");
|
ref_um_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refUmData");
|
||||||
if (ref_um_data) {
|
if (ref_um_data) {
|
||||||
|
if (!cJSON_IsNull(ref_um_data)) {
|
||||||
cJSON *ref_um_data_local = NULL;
|
cJSON *ref_um_data_local = NULL;
|
||||||
if (!cJSON_IsArray(ref_um_data)) {
|
if (!cJSON_IsArray(ref_um_data)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_data]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_data]");
|
||||||
|
@ -735,9 +817,11 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
OpenAPI_list_add(ref_um_dataList, ogs_strdup(ref_um_data_local->valuestring));
|
OpenAPI_list_add(ref_um_dataList, ogs_strdup(ref_um_data_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ref_um_n3g_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refUmN3gData");
|
ref_um_n3g_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refUmN3gData");
|
||||||
if (ref_um_n3g_data) {
|
if (ref_um_n3g_data) {
|
||||||
|
if (!cJSON_IsNull(ref_um_n3g_data)) {
|
||||||
cJSON *ref_um_n3g_data_local = NULL;
|
cJSON *ref_um_n3g_data_local = NULL;
|
||||||
if (!cJSON_IsArray(ref_um_n3g_data)) {
|
if (!cJSON_IsArray(ref_um_n3g_data)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_n3g_data]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_n3g_data]");
|
||||||
|
@ -756,17 +840,21 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
OpenAPI_list_add(ref_um_n3g_dataList, ogs_strdup(ref_um_n3g_data_local->valuestring));
|
OpenAPI_list_add(ref_um_n3g_dataList, ogs_strdup(ref_um_n3g_data_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ref_cond_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refCondData");
|
ref_cond_data = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refCondData");
|
||||||
if (ref_cond_data) {
|
if (ref_cond_data) {
|
||||||
|
if (!cJSON_IsNull(ref_cond_data)) {
|
||||||
if (!cJSON_IsString(ref_cond_data) && !cJSON_IsNull(ref_cond_data)) {
|
if (!cJSON_IsString(ref_cond_data) && !cJSON_IsNull(ref_cond_data)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_cond_data]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_cond_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ref_qos_mon = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refQosMon");
|
ref_qos_mon = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "refQosMon");
|
||||||
if (ref_qos_mon) {
|
if (ref_qos_mon) {
|
||||||
|
if (!cJSON_IsNull(ref_qos_mon)) {
|
||||||
cJSON *ref_qos_mon_local = NULL;
|
cJSON *ref_qos_mon_local = NULL;
|
||||||
if (!cJSON_IsArray(ref_qos_mon)) {
|
if (!cJSON_IsArray(ref_qos_mon)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_qos_mon]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_qos_mon]");
|
||||||
|
@ -785,32 +873,39 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
OpenAPI_list_add(ref_qos_monList, ogs_strdup(ref_qos_mon_local->valuestring));
|
OpenAPI_list_add(ref_qos_monList, ogs_strdup(ref_qos_mon_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
addr_preser_ind = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "addrPreserInd");
|
addr_preser_ind = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "addrPreserInd");
|
||||||
if (addr_preser_ind) {
|
if (addr_preser_ind) {
|
||||||
|
if (!cJSON_IsNull(addr_preser_ind)) {
|
||||||
if (!cJSON_IsBool(addr_preser_ind)) {
|
if (!cJSON_IsBool(addr_preser_ind)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [addr_preser_ind]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [addr_preser_ind]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_input_dl = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiInputDl");
|
tscai_input_dl = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiInputDl");
|
||||||
if (tscai_input_dl) {
|
if (tscai_input_dl) {
|
||||||
|
if (!cJSON_IsNull(tscai_input_dl)) {
|
||||||
tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl);
|
tscai_input_dl_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_dl);
|
||||||
if (!tscai_input_dl_local_nonprim) {
|
if (!tscai_input_dl_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_dl]");
|
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_input_ul = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiInputUl");
|
tscai_input_ul = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiInputUl");
|
||||||
if (tscai_input_ul) {
|
if (tscai_input_ul) {
|
||||||
|
if (!cJSON_IsNull(tscai_input_ul)) {
|
||||||
tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul);
|
tscai_input_ul_local_nonprim = OpenAPI_tscai_input_container_parseFromJSON(tscai_input_ul);
|
||||||
if (!tscai_input_ul_local_nonprim) {
|
if (!tscai_input_ul_local_nonprim) {
|
||||||
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_ul]");
|
ogs_error("OpenAPI_tscai_input_container_parseFromJSON failed [tscai_input_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tscai_time_dom = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiTimeDom");
|
tscai_time_dom = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "tscaiTimeDom");
|
||||||
if (tscai_time_dom) {
|
if (tscai_time_dom) {
|
||||||
|
@ -831,20 +926,24 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
|
|
||||||
dd_notif_ctrl2 = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "ddNotifCtrl2");
|
dd_notif_ctrl2 = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "ddNotifCtrl2");
|
||||||
if (dd_notif_ctrl2) {
|
if (dd_notif_ctrl2) {
|
||||||
|
if (!cJSON_IsNull(dd_notif_ctrl2)) {
|
||||||
dd_notif_ctrl2_local_nonprim = OpenAPI_downlink_data_notification_control_rm_parseFromJSON(dd_notif_ctrl2);
|
dd_notif_ctrl2_local_nonprim = OpenAPI_downlink_data_notification_control_rm_parseFromJSON(dd_notif_ctrl2);
|
||||||
if (!dd_notif_ctrl2_local_nonprim) {
|
if (!dd_notif_ctrl2_local_nonprim) {
|
||||||
ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON failed [dd_notif_ctrl2]");
|
ogs_error("OpenAPI_downlink_data_notification_control_rm_parseFromJSON failed [dd_notif_ctrl2]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dis_ue_notif = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "disUeNotif");
|
dis_ue_notif = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "disUeNotif");
|
||||||
if (dis_ue_notif) {
|
if (dis_ue_notif) {
|
||||||
|
if (!cJSON_IsNull(dis_ue_notif)) {
|
||||||
if (!cJSON_IsBool(dis_ue_notif)) {
|
if (!cJSON_IsBool(dis_ue_notif)) {
|
||||||
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [dis_ue_notif]");
|
ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [dis_ue_notif]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pack_filt_all_prec = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "packFiltAllPrec");
|
pack_filt_all_prec = cJSON_GetObjectItemCaseSensitive(pcc_ruleJSON, "packFiltAllPrec");
|
||||||
if (pack_filt_all_prec) {
|
if (pack_filt_all_prec) {
|
||||||
|
@ -871,20 +970,31 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON)
|
||||||
ref_qos_data ? ref_qos_dataList : NULL,
|
ref_qos_data ? ref_qos_dataList : NULL,
|
||||||
ref_alt_qos_params ? ref_alt_qos_paramsList : NULL,
|
ref_alt_qos_params ? ref_alt_qos_paramsList : NULL,
|
||||||
ref_tc_data ? ref_tc_dataList : NULL,
|
ref_tc_data ? ref_tc_dataList : NULL,
|
||||||
|
ref_chg_data && cJSON_IsNull(ref_chg_data) ? true : false,
|
||||||
ref_chg_data ? ref_chg_dataList : NULL,
|
ref_chg_data ? ref_chg_dataList : NULL,
|
||||||
|
ref_chg_n3g_data && cJSON_IsNull(ref_chg_n3g_data) ? true : false,
|
||||||
ref_chg_n3g_data ? ref_chg_n3g_dataList : NULL,
|
ref_chg_n3g_data ? ref_chg_n3g_dataList : NULL,
|
||||||
|
ref_um_data && cJSON_IsNull(ref_um_data) ? true : false,
|
||||||
ref_um_data ? ref_um_dataList : NULL,
|
ref_um_data ? ref_um_dataList : NULL,
|
||||||
|
ref_um_n3g_data && cJSON_IsNull(ref_um_n3g_data) ? true : false,
|
||||||
ref_um_n3g_data ? ref_um_n3g_dataList : NULL,
|
ref_um_n3g_data ? ref_um_n3g_dataList : NULL,
|
||||||
|
ref_cond_data && cJSON_IsNull(ref_cond_data) ? true : false,
|
||||||
ref_cond_data && !cJSON_IsNull(ref_cond_data) ? ogs_strdup(ref_cond_data->valuestring) : NULL,
|
ref_cond_data && !cJSON_IsNull(ref_cond_data) ? ogs_strdup(ref_cond_data->valuestring) : NULL,
|
||||||
|
ref_qos_mon && cJSON_IsNull(ref_qos_mon) ? true : false,
|
||||||
ref_qos_mon ? ref_qos_monList : NULL,
|
ref_qos_mon ? ref_qos_monList : NULL,
|
||||||
|
addr_preser_ind && cJSON_IsNull(addr_preser_ind) ? true : false,
|
||||||
addr_preser_ind ? true : false,
|
addr_preser_ind ? true : false,
|
||||||
addr_preser_ind ? addr_preser_ind->valueint : 0,
|
addr_preser_ind ? addr_preser_ind->valueint : 0,
|
||||||
|
tscai_input_dl && cJSON_IsNull(tscai_input_dl) ? true : false,
|
||||||
tscai_input_dl ? tscai_input_dl_local_nonprim : NULL,
|
tscai_input_dl ? tscai_input_dl_local_nonprim : NULL,
|
||||||
|
tscai_input_ul && cJSON_IsNull(tscai_input_ul) ? true : false,
|
||||||
tscai_input_ul ? tscai_input_ul_local_nonprim : NULL,
|
tscai_input_ul ? tscai_input_ul_local_nonprim : NULL,
|
||||||
tscai_time_dom ? true : false,
|
tscai_time_dom ? true : false,
|
||||||
tscai_time_dom ? tscai_time_dom->valuedouble : 0,
|
tscai_time_dom ? tscai_time_dom->valuedouble : 0,
|
||||||
dd_notif_ctrl ? dd_notif_ctrl_local_nonprim : NULL,
|
dd_notif_ctrl ? dd_notif_ctrl_local_nonprim : NULL,
|
||||||
|
dd_notif_ctrl2 && cJSON_IsNull(dd_notif_ctrl2) ? true : false,
|
||||||
dd_notif_ctrl2 ? dd_notif_ctrl2_local_nonprim : NULL,
|
dd_notif_ctrl2 ? dd_notif_ctrl2_local_nonprim : NULL,
|
||||||
|
dis_ue_notif && cJSON_IsNull(dis_ue_notif) ? true : false,
|
||||||
dis_ue_notif ? true : false,
|
dis_ue_notif ? true : false,
|
||||||
dis_ue_notif ? dis_ue_notif->valueint : 0,
|
dis_ue_notif ? dis_ue_notif->valueint : 0,
|
||||||
pack_filt_all_prec ? true : false,
|
pack_filt_all_prec ? true : false,
|
||||||
|
|
|
@ -40,20 +40,31 @@ typedef struct OpenAPI_pcc_rule_s {
|
||||||
OpenAPI_list_t *ref_qos_data;
|
OpenAPI_list_t *ref_qos_data;
|
||||||
OpenAPI_list_t *ref_alt_qos_params;
|
OpenAPI_list_t *ref_alt_qos_params;
|
||||||
OpenAPI_list_t *ref_tc_data;
|
OpenAPI_list_t *ref_tc_data;
|
||||||
|
bool is_ref_chg_data_null;
|
||||||
OpenAPI_list_t *ref_chg_data;
|
OpenAPI_list_t *ref_chg_data;
|
||||||
|
bool is_ref_chg_n3g_data_null;
|
||||||
OpenAPI_list_t *ref_chg_n3g_data;
|
OpenAPI_list_t *ref_chg_n3g_data;
|
||||||
|
bool is_ref_um_data_null;
|
||||||
OpenAPI_list_t *ref_um_data;
|
OpenAPI_list_t *ref_um_data;
|
||||||
|
bool is_ref_um_n3g_data_null;
|
||||||
OpenAPI_list_t *ref_um_n3g_data;
|
OpenAPI_list_t *ref_um_n3g_data;
|
||||||
|
bool is_ref_cond_data_null;
|
||||||
char *ref_cond_data;
|
char *ref_cond_data;
|
||||||
|
bool is_ref_qos_mon_null;
|
||||||
OpenAPI_list_t *ref_qos_mon;
|
OpenAPI_list_t *ref_qos_mon;
|
||||||
|
bool is_addr_preser_ind_null;
|
||||||
bool is_addr_preser_ind;
|
bool is_addr_preser_ind;
|
||||||
int addr_preser_ind;
|
int addr_preser_ind;
|
||||||
|
bool is_tscai_input_dl_null;
|
||||||
struct OpenAPI_tscai_input_container_s *tscai_input_dl;
|
struct OpenAPI_tscai_input_container_s *tscai_input_dl;
|
||||||
|
bool is_tscai_input_ul_null;
|
||||||
struct OpenAPI_tscai_input_container_s *tscai_input_ul;
|
struct OpenAPI_tscai_input_container_s *tscai_input_ul;
|
||||||
bool is_tscai_time_dom;
|
bool is_tscai_time_dom;
|
||||||
int tscai_time_dom;
|
int tscai_time_dom;
|
||||||
struct OpenAPI_downlink_data_notification_control_s *dd_notif_ctrl;
|
struct OpenAPI_downlink_data_notification_control_s *dd_notif_ctrl;
|
||||||
|
bool is_dd_notif_ctrl2_null;
|
||||||
struct OpenAPI_downlink_data_notification_control_rm_s *dd_notif_ctrl2;
|
struct OpenAPI_downlink_data_notification_control_rm_s *dd_notif_ctrl2;
|
||||||
|
bool is_dis_ue_notif_null;
|
||||||
bool is_dis_ue_notif;
|
bool is_dis_ue_notif;
|
||||||
int dis_ue_notif;
|
int dis_ue_notif;
|
||||||
bool is_pack_filt_all_prec;
|
bool is_pack_filt_all_prec;
|
||||||
|
@ -77,20 +88,31 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_create(
|
||||||
OpenAPI_list_t *ref_qos_data,
|
OpenAPI_list_t *ref_qos_data,
|
||||||
OpenAPI_list_t *ref_alt_qos_params,
|
OpenAPI_list_t *ref_alt_qos_params,
|
||||||
OpenAPI_list_t *ref_tc_data,
|
OpenAPI_list_t *ref_tc_data,
|
||||||
|
bool is_ref_chg_data_null,
|
||||||
OpenAPI_list_t *ref_chg_data,
|
OpenAPI_list_t *ref_chg_data,
|
||||||
|
bool is_ref_chg_n3g_data_null,
|
||||||
OpenAPI_list_t *ref_chg_n3g_data,
|
OpenAPI_list_t *ref_chg_n3g_data,
|
||||||
|
bool is_ref_um_data_null,
|
||||||
OpenAPI_list_t *ref_um_data,
|
OpenAPI_list_t *ref_um_data,
|
||||||
|
bool is_ref_um_n3g_data_null,
|
||||||
OpenAPI_list_t *ref_um_n3g_data,
|
OpenAPI_list_t *ref_um_n3g_data,
|
||||||
|
bool is_ref_cond_data_null,
|
||||||
char *ref_cond_data,
|
char *ref_cond_data,
|
||||||
|
bool is_ref_qos_mon_null,
|
||||||
OpenAPI_list_t *ref_qos_mon,
|
OpenAPI_list_t *ref_qos_mon,
|
||||||
|
bool is_addr_preser_ind_null,
|
||||||
bool is_addr_preser_ind,
|
bool is_addr_preser_ind,
|
||||||
int addr_preser_ind,
|
int addr_preser_ind,
|
||||||
|
bool is_tscai_input_dl_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
OpenAPI_tscai_input_container_t *tscai_input_dl,
|
||||||
|
bool is_tscai_input_ul_null,
|
||||||
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
OpenAPI_tscai_input_container_t *tscai_input_ul,
|
||||||
bool is_tscai_time_dom,
|
bool is_tscai_time_dom,
|
||||||
int tscai_time_dom,
|
int tscai_time_dom,
|
||||||
OpenAPI_downlink_data_notification_control_t *dd_notif_ctrl,
|
OpenAPI_downlink_data_notification_control_t *dd_notif_ctrl,
|
||||||
|
bool is_dd_notif_ctrl2_null,
|
||||||
OpenAPI_downlink_data_notification_control_rm_t *dd_notif_ctrl2,
|
OpenAPI_downlink_data_notification_control_rm_t *dd_notif_ctrl2,
|
||||||
|
bool is_dis_ue_notif_null,
|
||||||
bool is_dis_ue_notif,
|
bool is_dis_ue_notif,
|
||||||
int dis_ue_notif,
|
int dis_ue_notif,
|
||||||
bool is_pack_filt_all_prec,
|
bool is_pack_filt_all_prec,
|
||||||
|
|
|
@ -5,11 +5,17 @@
|
||||||
#include "pcf_binding_patch.h"
|
#include "pcf_binding_patch.h"
|
||||||
|
|
||||||
OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_create(
|
OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_create(
|
||||||
|
bool is_ipv4_addr_null,
|
||||||
char *ipv4_addr,
|
char *ipv4_addr,
|
||||||
|
bool is_ip_domain_null,
|
||||||
char *ip_domain,
|
char *ip_domain,
|
||||||
|
bool is_ipv6_prefix_null,
|
||||||
char *ipv6_prefix,
|
char *ipv6_prefix,
|
||||||
|
bool is_add_ipv6_prefixes_null,
|
||||||
OpenAPI_list_t *add_ipv6_prefixes,
|
OpenAPI_list_t *add_ipv6_prefixes,
|
||||||
|
bool is_mac_addr48_null,
|
||||||
char *mac_addr48,
|
char *mac_addr48,
|
||||||
|
bool is_add_mac_addrs_null,
|
||||||
OpenAPI_list_t *add_mac_addrs,
|
OpenAPI_list_t *add_mac_addrs,
|
||||||
char *pcf_id,
|
char *pcf_id,
|
||||||
char *pcf_fqdn,
|
char *pcf_fqdn,
|
||||||
|
@ -21,11 +27,17 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_create(
|
||||||
OpenAPI_pcf_binding_patch_t *pcf_binding_patch_local_var = ogs_malloc(sizeof(OpenAPI_pcf_binding_patch_t));
|
OpenAPI_pcf_binding_patch_t *pcf_binding_patch_local_var = ogs_malloc(sizeof(OpenAPI_pcf_binding_patch_t));
|
||||||
ogs_assert(pcf_binding_patch_local_var);
|
ogs_assert(pcf_binding_patch_local_var);
|
||||||
|
|
||||||
|
pcf_binding_patch_local_var->is_ipv4_addr_null = is_ipv4_addr_null;
|
||||||
pcf_binding_patch_local_var->ipv4_addr = ipv4_addr;
|
pcf_binding_patch_local_var->ipv4_addr = ipv4_addr;
|
||||||
|
pcf_binding_patch_local_var->is_ip_domain_null = is_ip_domain_null;
|
||||||
pcf_binding_patch_local_var->ip_domain = ip_domain;
|
pcf_binding_patch_local_var->ip_domain = ip_domain;
|
||||||
|
pcf_binding_patch_local_var->is_ipv6_prefix_null = is_ipv6_prefix_null;
|
||||||
pcf_binding_patch_local_var->ipv6_prefix = ipv6_prefix;
|
pcf_binding_patch_local_var->ipv6_prefix = ipv6_prefix;
|
||||||
|
pcf_binding_patch_local_var->is_add_ipv6_prefixes_null = is_add_ipv6_prefixes_null;
|
||||||
pcf_binding_patch_local_var->add_ipv6_prefixes = add_ipv6_prefixes;
|
pcf_binding_patch_local_var->add_ipv6_prefixes = add_ipv6_prefixes;
|
||||||
|
pcf_binding_patch_local_var->is_mac_addr48_null = is_mac_addr48_null;
|
||||||
pcf_binding_patch_local_var->mac_addr48 = mac_addr48;
|
pcf_binding_patch_local_var->mac_addr48 = mac_addr48;
|
||||||
|
pcf_binding_patch_local_var->is_add_mac_addrs_null = is_add_mac_addrs_null;
|
||||||
pcf_binding_patch_local_var->add_mac_addrs = add_mac_addrs;
|
pcf_binding_patch_local_var->add_mac_addrs = add_mac_addrs;
|
||||||
pcf_binding_patch_local_var->pcf_id = pcf_id;
|
pcf_binding_patch_local_var->pcf_id = pcf_id;
|
||||||
pcf_binding_patch_local_var->pcf_fqdn = pcf_fqdn;
|
pcf_binding_patch_local_var->pcf_fqdn = pcf_fqdn;
|
||||||
|
@ -115,6 +127,11 @@ cJSON *OpenAPI_pcf_binding_patch_convertToJSON(OpenAPI_pcf_binding_patch_t *pcf_
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ipv4_addr]");
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ipv4_addr]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcf_binding_patch->is_ipv4_addr_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ipv4Addr") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ipv4_addr]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_binding_patch->ip_domain) {
|
if (pcf_binding_patch->ip_domain) {
|
||||||
|
@ -122,6 +139,11 @@ cJSON *OpenAPI_pcf_binding_patch_convertToJSON(OpenAPI_pcf_binding_patch_t *pcf_
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ip_domain]");
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ip_domain]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcf_binding_patch->is_ip_domain_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ipDomain") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ip_domain]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_binding_patch->ipv6_prefix) {
|
if (pcf_binding_patch->ipv6_prefix) {
|
||||||
|
@ -129,6 +151,11 @@ cJSON *OpenAPI_pcf_binding_patch_convertToJSON(OpenAPI_pcf_binding_patch_t *pcf_
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ipv6_prefix]");
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ipv6_prefix]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcf_binding_patch->is_ipv6_prefix_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ipv6Prefix") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [ipv6_prefix]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_binding_patch->add_ipv6_prefixes) {
|
if (pcf_binding_patch->add_ipv6_prefixes) {
|
||||||
|
@ -143,6 +170,11 @@ cJSON *OpenAPI_pcf_binding_patch_convertToJSON(OpenAPI_pcf_binding_patch_t *pcf_
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcf_binding_patch->is_add_ipv6_prefixes_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "addIpv6Prefixes") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [add_ipv6_prefixes]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_binding_patch->mac_addr48) {
|
if (pcf_binding_patch->mac_addr48) {
|
||||||
|
@ -150,6 +182,11 @@ cJSON *OpenAPI_pcf_binding_patch_convertToJSON(OpenAPI_pcf_binding_patch_t *pcf_
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [mac_addr48]");
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [mac_addr48]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcf_binding_patch->is_mac_addr48_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "macAddr48") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [mac_addr48]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_binding_patch->add_mac_addrs) {
|
if (pcf_binding_patch->add_mac_addrs) {
|
||||||
|
@ -164,6 +201,11 @@ cJSON *OpenAPI_pcf_binding_patch_convertToJSON(OpenAPI_pcf_binding_patch_t *pcf_
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (pcf_binding_patch->is_add_mac_addrs_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "addMacAddrs") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_binding_patch_convertToJSON() failed [add_mac_addrs]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_binding_patch->pcf_id) {
|
if (pcf_binding_patch->pcf_id) {
|
||||||
|
@ -234,30 +276,37 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_
|
||||||
cJSON *pcf_diam_realm = NULL;
|
cJSON *pcf_diam_realm = NULL;
|
||||||
ipv4_addr = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "ipv4Addr");
|
ipv4_addr = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "ipv4Addr");
|
||||||
if (ipv4_addr) {
|
if (ipv4_addr) {
|
||||||
|
if (!cJSON_IsNull(ipv4_addr)) {
|
||||||
if (!cJSON_IsString(ipv4_addr) && !cJSON_IsNull(ipv4_addr)) {
|
if (!cJSON_IsString(ipv4_addr) && !cJSON_IsNull(ipv4_addr)) {
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [ipv4_addr]");
|
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [ipv4_addr]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ip_domain = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "ipDomain");
|
ip_domain = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "ipDomain");
|
||||||
if (ip_domain) {
|
if (ip_domain) {
|
||||||
|
if (!cJSON_IsNull(ip_domain)) {
|
||||||
if (!cJSON_IsString(ip_domain) && !cJSON_IsNull(ip_domain)) {
|
if (!cJSON_IsString(ip_domain) && !cJSON_IsNull(ip_domain)) {
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [ip_domain]");
|
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [ip_domain]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ipv6_prefix = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "ipv6Prefix");
|
ipv6_prefix = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "ipv6Prefix");
|
||||||
if (ipv6_prefix) {
|
if (ipv6_prefix) {
|
||||||
|
if (!cJSON_IsNull(ipv6_prefix)) {
|
||||||
if (!cJSON_IsString(ipv6_prefix) && !cJSON_IsNull(ipv6_prefix)) {
|
if (!cJSON_IsString(ipv6_prefix) && !cJSON_IsNull(ipv6_prefix)) {
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [ipv6_prefix]");
|
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [ipv6_prefix]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
add_ipv6_prefixes = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "addIpv6Prefixes");
|
add_ipv6_prefixes = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "addIpv6Prefixes");
|
||||||
if (add_ipv6_prefixes) {
|
if (add_ipv6_prefixes) {
|
||||||
|
if (!cJSON_IsNull(add_ipv6_prefixes)) {
|
||||||
cJSON *add_ipv6_prefixes_local = NULL;
|
cJSON *add_ipv6_prefixes_local = NULL;
|
||||||
if (!cJSON_IsArray(add_ipv6_prefixes)) {
|
if (!cJSON_IsArray(add_ipv6_prefixes)) {
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_ipv6_prefixes]");
|
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_ipv6_prefixes]");
|
||||||
|
@ -276,17 +325,21 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_
|
||||||
OpenAPI_list_add(add_ipv6_prefixesList, ogs_strdup(add_ipv6_prefixes_local->valuestring));
|
OpenAPI_list_add(add_ipv6_prefixesList, ogs_strdup(add_ipv6_prefixes_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mac_addr48 = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "macAddr48");
|
mac_addr48 = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "macAddr48");
|
||||||
if (mac_addr48) {
|
if (mac_addr48) {
|
||||||
|
if (!cJSON_IsNull(mac_addr48)) {
|
||||||
if (!cJSON_IsString(mac_addr48) && !cJSON_IsNull(mac_addr48)) {
|
if (!cJSON_IsString(mac_addr48) && !cJSON_IsNull(mac_addr48)) {
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [mac_addr48]");
|
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [mac_addr48]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
add_mac_addrs = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "addMacAddrs");
|
add_mac_addrs = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "addMacAddrs");
|
||||||
if (add_mac_addrs) {
|
if (add_mac_addrs) {
|
||||||
|
if (!cJSON_IsNull(add_mac_addrs)) {
|
||||||
cJSON *add_mac_addrs_local = NULL;
|
cJSON *add_mac_addrs_local = NULL;
|
||||||
if (!cJSON_IsArray(add_mac_addrs)) {
|
if (!cJSON_IsArray(add_mac_addrs)) {
|
||||||
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_mac_addrs]");
|
ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_mac_addrs]");
|
||||||
|
@ -305,6 +358,7 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_
|
||||||
OpenAPI_list_add(add_mac_addrsList, ogs_strdup(add_mac_addrs_local->valuestring));
|
OpenAPI_list_add(add_mac_addrsList, ogs_strdup(add_mac_addrs_local->valuestring));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pcf_id = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "pcfId");
|
pcf_id = cJSON_GetObjectItemCaseSensitive(pcf_binding_patchJSON, "pcfId");
|
||||||
if (pcf_id) {
|
if (pcf_id) {
|
||||||
|
@ -363,11 +417,17 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_
|
||||||
}
|
}
|
||||||
|
|
||||||
pcf_binding_patch_local_var = OpenAPI_pcf_binding_patch_create (
|
pcf_binding_patch_local_var = OpenAPI_pcf_binding_patch_create (
|
||||||
|
ipv4_addr && cJSON_IsNull(ipv4_addr) ? true : false,
|
||||||
ipv4_addr && !cJSON_IsNull(ipv4_addr) ? ogs_strdup(ipv4_addr->valuestring) : NULL,
|
ipv4_addr && !cJSON_IsNull(ipv4_addr) ? ogs_strdup(ipv4_addr->valuestring) : NULL,
|
||||||
|
ip_domain && cJSON_IsNull(ip_domain) ? true : false,
|
||||||
ip_domain && !cJSON_IsNull(ip_domain) ? ogs_strdup(ip_domain->valuestring) : NULL,
|
ip_domain && !cJSON_IsNull(ip_domain) ? ogs_strdup(ip_domain->valuestring) : NULL,
|
||||||
|
ipv6_prefix && cJSON_IsNull(ipv6_prefix) ? true : false,
|
||||||
ipv6_prefix && !cJSON_IsNull(ipv6_prefix) ? ogs_strdup(ipv6_prefix->valuestring) : NULL,
|
ipv6_prefix && !cJSON_IsNull(ipv6_prefix) ? ogs_strdup(ipv6_prefix->valuestring) : NULL,
|
||||||
|
add_ipv6_prefixes && cJSON_IsNull(add_ipv6_prefixes) ? true : false,
|
||||||
add_ipv6_prefixes ? add_ipv6_prefixesList : NULL,
|
add_ipv6_prefixes ? add_ipv6_prefixesList : NULL,
|
||||||
|
mac_addr48 && cJSON_IsNull(mac_addr48) ? true : false,
|
||||||
mac_addr48 && !cJSON_IsNull(mac_addr48) ? ogs_strdup(mac_addr48->valuestring) : NULL,
|
mac_addr48 && !cJSON_IsNull(mac_addr48) ? ogs_strdup(mac_addr48->valuestring) : NULL,
|
||||||
|
add_mac_addrs && cJSON_IsNull(add_mac_addrs) ? true : false,
|
||||||
add_mac_addrs ? add_mac_addrsList : NULL,
|
add_mac_addrs ? add_mac_addrsList : NULL,
|
||||||
pcf_id && !cJSON_IsNull(pcf_id) ? ogs_strdup(pcf_id->valuestring) : NULL,
|
pcf_id && !cJSON_IsNull(pcf_id) ? ogs_strdup(pcf_id->valuestring) : NULL,
|
||||||
pcf_fqdn && !cJSON_IsNull(pcf_fqdn) ? ogs_strdup(pcf_fqdn->valuestring) : NULL,
|
pcf_fqdn && !cJSON_IsNull(pcf_fqdn) ? ogs_strdup(pcf_fqdn->valuestring) : NULL,
|
||||||
|
|
|
@ -20,11 +20,17 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_pcf_binding_patch_s OpenAPI_pcf_binding_patch_t;
|
typedef struct OpenAPI_pcf_binding_patch_s OpenAPI_pcf_binding_patch_t;
|
||||||
typedef struct OpenAPI_pcf_binding_patch_s {
|
typedef struct OpenAPI_pcf_binding_patch_s {
|
||||||
|
bool is_ipv4_addr_null;
|
||||||
char *ipv4_addr;
|
char *ipv4_addr;
|
||||||
|
bool is_ip_domain_null;
|
||||||
char *ip_domain;
|
char *ip_domain;
|
||||||
|
bool is_ipv6_prefix_null;
|
||||||
char *ipv6_prefix;
|
char *ipv6_prefix;
|
||||||
|
bool is_add_ipv6_prefixes_null;
|
||||||
OpenAPI_list_t *add_ipv6_prefixes;
|
OpenAPI_list_t *add_ipv6_prefixes;
|
||||||
|
bool is_mac_addr48_null;
|
||||||
char *mac_addr48;
|
char *mac_addr48;
|
||||||
|
bool is_add_mac_addrs_null;
|
||||||
OpenAPI_list_t *add_mac_addrs;
|
OpenAPI_list_t *add_mac_addrs;
|
||||||
char *pcf_id;
|
char *pcf_id;
|
||||||
char *pcf_fqdn;
|
char *pcf_fqdn;
|
||||||
|
@ -34,11 +40,17 @@ typedef struct OpenAPI_pcf_binding_patch_s {
|
||||||
} OpenAPI_pcf_binding_patch_t;
|
} OpenAPI_pcf_binding_patch_t;
|
||||||
|
|
||||||
OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_create(
|
OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_create(
|
||||||
|
bool is_ipv4_addr_null,
|
||||||
char *ipv4_addr,
|
char *ipv4_addr,
|
||||||
|
bool is_ip_domain_null,
|
||||||
char *ip_domain,
|
char *ip_domain,
|
||||||
|
bool is_ipv6_prefix_null,
|
||||||
char *ipv6_prefix,
|
char *ipv6_prefix,
|
||||||
|
bool is_add_ipv6_prefixes_null,
|
||||||
OpenAPI_list_t *add_ipv6_prefixes,
|
OpenAPI_list_t *add_ipv6_prefixes,
|
||||||
|
bool is_mac_addr48_null,
|
||||||
char *mac_addr48,
|
char *mac_addr48,
|
||||||
|
bool is_add_mac_addrs_null,
|
||||||
OpenAPI_list_t *add_mac_addrs,
|
OpenAPI_list_t *add_mac_addrs,
|
||||||
char *pcf_id,
|
char *pcf_id,
|
||||||
char *pcf_fqdn,
|
char *pcf_fqdn,
|
||||||
|
|
|
@ -9,6 +9,7 @@ OpenAPI_pcf_for_pdu_session_info_t *OpenAPI_pcf_for_pdu_session_info_create(
|
||||||
OpenAPI_snssai_t *snssai,
|
OpenAPI_snssai_t *snssai,
|
||||||
char *pcf_fqdn,
|
char *pcf_fqdn,
|
||||||
OpenAPI_list_t *pcf_ip_end_points,
|
OpenAPI_list_t *pcf_ip_end_points,
|
||||||
|
bool is_ipv4_addr_null,
|
||||||
char *ipv4_addr,
|
char *ipv4_addr,
|
||||||
char *ip_domain,
|
char *ip_domain,
|
||||||
OpenAPI_list_t *ipv6_prefixes,
|
OpenAPI_list_t *ipv6_prefixes,
|
||||||
|
@ -25,6 +26,7 @@ OpenAPI_pcf_for_pdu_session_info_t *OpenAPI_pcf_for_pdu_session_info_create(
|
||||||
pcf_for_pdu_session_info_local_var->snssai = snssai;
|
pcf_for_pdu_session_info_local_var->snssai = snssai;
|
||||||
pcf_for_pdu_session_info_local_var->pcf_fqdn = pcf_fqdn;
|
pcf_for_pdu_session_info_local_var->pcf_fqdn = pcf_fqdn;
|
||||||
pcf_for_pdu_session_info_local_var->pcf_ip_end_points = pcf_ip_end_points;
|
pcf_for_pdu_session_info_local_var->pcf_ip_end_points = pcf_ip_end_points;
|
||||||
|
pcf_for_pdu_session_info_local_var->is_ipv4_addr_null = is_ipv4_addr_null;
|
||||||
pcf_for_pdu_session_info_local_var->ipv4_addr = ipv4_addr;
|
pcf_for_pdu_session_info_local_var->ipv4_addr = ipv4_addr;
|
||||||
pcf_for_pdu_session_info_local_var->ip_domain = ip_domain;
|
pcf_for_pdu_session_info_local_var->ip_domain = ip_domain;
|
||||||
pcf_for_pdu_session_info_local_var->ipv6_prefixes = ipv6_prefixes;
|
pcf_for_pdu_session_info_local_var->ipv6_prefixes = ipv6_prefixes;
|
||||||
|
@ -158,6 +160,11 @@ cJSON *OpenAPI_pcf_for_pdu_session_info_convertToJSON(OpenAPI_pcf_for_pdu_sessio
|
||||||
ogs_error("OpenAPI_pcf_for_pdu_session_info_convertToJSON() failed [ipv4_addr]");
|
ogs_error("OpenAPI_pcf_for_pdu_session_info_convertToJSON() failed [ipv4_addr]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pcf_for_pdu_session_info->is_ipv4_addr_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ipv4Addr") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pcf_for_pdu_session_info_convertToJSON() failed [ipv4_addr]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pcf_for_pdu_session_info->ip_domain) {
|
if (pcf_for_pdu_session_info->ip_domain) {
|
||||||
|
@ -295,11 +302,13 @@ OpenAPI_pcf_for_pdu_session_info_t *OpenAPI_pcf_for_pdu_session_info_parseFromJS
|
||||||
|
|
||||||
ipv4_addr = cJSON_GetObjectItemCaseSensitive(pcf_for_pdu_session_infoJSON, "ipv4Addr");
|
ipv4_addr = cJSON_GetObjectItemCaseSensitive(pcf_for_pdu_session_infoJSON, "ipv4Addr");
|
||||||
if (ipv4_addr) {
|
if (ipv4_addr) {
|
||||||
|
if (!cJSON_IsNull(ipv4_addr)) {
|
||||||
if (!cJSON_IsString(ipv4_addr) && !cJSON_IsNull(ipv4_addr)) {
|
if (!cJSON_IsString(ipv4_addr) && !cJSON_IsNull(ipv4_addr)) {
|
||||||
ogs_error("OpenAPI_pcf_for_pdu_session_info_parseFromJSON() failed [ipv4_addr]");
|
ogs_error("OpenAPI_pcf_for_pdu_session_info_parseFromJSON() failed [ipv4_addr]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ip_domain = cJSON_GetObjectItemCaseSensitive(pcf_for_pdu_session_infoJSON, "ipDomain");
|
ip_domain = cJSON_GetObjectItemCaseSensitive(pcf_for_pdu_session_infoJSON, "ipDomain");
|
||||||
if (ip_domain) {
|
if (ip_domain) {
|
||||||
|
@ -381,6 +390,7 @@ OpenAPI_pcf_for_pdu_session_info_t *OpenAPI_pcf_for_pdu_session_info_parseFromJS
|
||||||
snssai_local_nonprim,
|
snssai_local_nonprim,
|
||||||
pcf_fqdn && !cJSON_IsNull(pcf_fqdn) ? ogs_strdup(pcf_fqdn->valuestring) : NULL,
|
pcf_fqdn && !cJSON_IsNull(pcf_fqdn) ? ogs_strdup(pcf_fqdn->valuestring) : NULL,
|
||||||
pcf_ip_end_points ? pcf_ip_end_pointsList : NULL,
|
pcf_ip_end_points ? pcf_ip_end_pointsList : NULL,
|
||||||
|
ipv4_addr && cJSON_IsNull(ipv4_addr) ? true : false,
|
||||||
ipv4_addr && !cJSON_IsNull(ipv4_addr) ? ogs_strdup(ipv4_addr->valuestring) : NULL,
|
ipv4_addr && !cJSON_IsNull(ipv4_addr) ? ogs_strdup(ipv4_addr->valuestring) : NULL,
|
||||||
ip_domain && !cJSON_IsNull(ip_domain) ? ogs_strdup(ip_domain->valuestring) : NULL,
|
ip_domain && !cJSON_IsNull(ip_domain) ? ogs_strdup(ip_domain->valuestring) : NULL,
|
||||||
ipv6_prefixes ? ipv6_prefixesList : NULL,
|
ipv6_prefixes ? ipv6_prefixesList : NULL,
|
||||||
|
|
|
@ -26,6 +26,7 @@ typedef struct OpenAPI_pcf_for_pdu_session_info_s {
|
||||||
struct OpenAPI_snssai_s *snssai;
|
struct OpenAPI_snssai_s *snssai;
|
||||||
char *pcf_fqdn;
|
char *pcf_fqdn;
|
||||||
OpenAPI_list_t *pcf_ip_end_points;
|
OpenAPI_list_t *pcf_ip_end_points;
|
||||||
|
bool is_ipv4_addr_null;
|
||||||
char *ipv4_addr;
|
char *ipv4_addr;
|
||||||
char *ip_domain;
|
char *ip_domain;
|
||||||
OpenAPI_list_t *ipv6_prefixes;
|
OpenAPI_list_t *ipv6_prefixes;
|
||||||
|
@ -40,6 +41,7 @@ OpenAPI_pcf_for_pdu_session_info_t *OpenAPI_pcf_for_pdu_session_info_create(
|
||||||
OpenAPI_snssai_t *snssai,
|
OpenAPI_snssai_t *snssai,
|
||||||
char *pcf_fqdn,
|
char *pcf_fqdn,
|
||||||
OpenAPI_list_t *pcf_ip_end_points,
|
OpenAPI_list_t *pcf_ip_end_points,
|
||||||
|
bool is_ipv4_addr_null,
|
||||||
char *ipv4_addr,
|
char *ipv4_addr,
|
||||||
char *ip_domain,
|
char *ip_domain,
|
||||||
OpenAPI_list_t *ipv6_prefixes,
|
OpenAPI_list_t *ipv6_prefixes,
|
||||||
|
|
|
@ -87,6 +87,7 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_create(
|
||||||
char *old_pdu_session_ref,
|
char *old_pdu_session_ref,
|
||||||
bool is_sm_policy_notify_ind,
|
bool is_sm_policy_notify_ind,
|
||||||
int sm_policy_notify_ind,
|
int sm_policy_notify_ind,
|
||||||
|
bool is_pcf_ue_callback_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
||||||
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
||||||
bool is_upip_supported,
|
bool is_upip_supported,
|
||||||
|
@ -181,6 +182,7 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_create(
|
||||||
pdu_session_create_data_local_var->old_pdu_session_ref = old_pdu_session_ref;
|
pdu_session_create_data_local_var->old_pdu_session_ref = old_pdu_session_ref;
|
||||||
pdu_session_create_data_local_var->is_sm_policy_notify_ind = is_sm_policy_notify_ind;
|
pdu_session_create_data_local_var->is_sm_policy_notify_ind = is_sm_policy_notify_ind;
|
||||||
pdu_session_create_data_local_var->sm_policy_notify_ind = sm_policy_notify_ind;
|
pdu_session_create_data_local_var->sm_policy_notify_ind = sm_policy_notify_ind;
|
||||||
|
pdu_session_create_data_local_var->is_pcf_ue_callback_info_null = is_pcf_ue_callback_info_null;
|
||||||
pdu_session_create_data_local_var->pcf_ue_callback_info = pcf_ue_callback_info;
|
pdu_session_create_data_local_var->pcf_ue_callback_info = pcf_ue_callback_info;
|
||||||
pdu_session_create_data_local_var->satellite_backhaul_cat = satellite_backhaul_cat;
|
pdu_session_create_data_local_var->satellite_backhaul_cat = satellite_backhaul_cat;
|
||||||
pdu_session_create_data_local_var->is_upip_supported = is_upip_supported;
|
pdu_session_create_data_local_var->is_upip_supported = is_upip_supported;
|
||||||
|
@ -1049,6 +1051,11 @@ cJSON *OpenAPI_pdu_session_create_data_convertToJSON(OpenAPI_pdu_session_create_
|
||||||
ogs_error("OpenAPI_pdu_session_create_data_convertToJSON() failed [pcf_ue_callback_info]");
|
ogs_error("OpenAPI_pdu_session_create_data_convertToJSON() failed [pcf_ue_callback_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pdu_session_create_data->is_pcf_ue_callback_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "pcfUeCallbackInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pdu_session_create_data_convertToJSON() failed [pcf_ue_callback_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pdu_session_create_data->satellite_backhaul_cat != OpenAPI_satellite_backhaul_category_NULL) {
|
if (pdu_session_create_data->satellite_backhaul_cat != OpenAPI_satellite_backhaul_category_NULL) {
|
||||||
|
@ -1829,12 +1836,14 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON
|
||||||
|
|
||||||
pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "pcfUeCallbackInfo");
|
pcf_ue_callback_info = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "pcfUeCallbackInfo");
|
||||||
if (pcf_ue_callback_info) {
|
if (pcf_ue_callback_info) {
|
||||||
|
if (!cJSON_IsNull(pcf_ue_callback_info)) {
|
||||||
pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info);
|
pcf_ue_callback_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_callback_info);
|
||||||
if (!pcf_ue_callback_info_local_nonprim) {
|
if (!pcf_ue_callback_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_callback_info]");
|
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_callback_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "satelliteBackhaulCat");
|
satellite_backhaul_cat = cJSON_GetObjectItemCaseSensitive(pdu_session_create_dataJSON, "satelliteBackhaulCat");
|
||||||
if (satellite_backhaul_cat) {
|
if (satellite_backhaul_cat) {
|
||||||
|
@ -1953,6 +1962,7 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON
|
||||||
old_pdu_session_ref && !cJSON_IsNull(old_pdu_session_ref) ? ogs_strdup(old_pdu_session_ref->valuestring) : NULL,
|
old_pdu_session_ref && !cJSON_IsNull(old_pdu_session_ref) ? ogs_strdup(old_pdu_session_ref->valuestring) : NULL,
|
||||||
sm_policy_notify_ind ? true : false,
|
sm_policy_notify_ind ? true : false,
|
||||||
sm_policy_notify_ind ? sm_policy_notify_ind->valueint : 0,
|
sm_policy_notify_ind ? sm_policy_notify_ind->valueint : 0,
|
||||||
|
pcf_ue_callback_info && cJSON_IsNull(pcf_ue_callback_info) ? true : false,
|
||||||
pcf_ue_callback_info ? pcf_ue_callback_info_local_nonprim : NULL,
|
pcf_ue_callback_info ? pcf_ue_callback_info_local_nonprim : NULL,
|
||||||
satellite_backhaul_cat ? satellite_backhaul_catVariable : 0,
|
satellite_backhaul_cat ? satellite_backhaul_catVariable : 0,
|
||||||
upip_supported ? true : false,
|
upip_supported ? true : false,
|
||||||
|
|
|
@ -124,6 +124,7 @@ typedef struct OpenAPI_pdu_session_create_data_s {
|
||||||
char *old_pdu_session_ref;
|
char *old_pdu_session_ref;
|
||||||
bool is_sm_policy_notify_ind;
|
bool is_sm_policy_notify_ind;
|
||||||
int sm_policy_notify_ind;
|
int sm_policy_notify_ind;
|
||||||
|
bool is_pcf_ue_callback_info_null;
|
||||||
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_callback_info;
|
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_callback_info;
|
||||||
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat;
|
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat;
|
||||||
bool is_upip_supported;
|
bool is_upip_supported;
|
||||||
|
@ -216,6 +217,7 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_create(
|
||||||
char *old_pdu_session_ref,
|
char *old_pdu_session_ref,
|
||||||
bool is_sm_policy_notify_ind,
|
bool is_sm_policy_notify_ind,
|
||||||
int sm_policy_notify_ind,
|
int sm_policy_notify_ind,
|
||||||
|
bool is_pcf_ue_callback_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_callback_info,
|
||||||
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
OpenAPI_satellite_backhaul_category_e satellite_backhaul_cat,
|
||||||
bool is_upip_supported,
|
bool is_upip_supported,
|
||||||
|
|
|
@ -13,13 +13,17 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_create(
|
||||||
int rfsp,
|
int rfsp,
|
||||||
bool is_target_rfsp,
|
bool is_target_rfsp,
|
||||||
int target_rfsp,
|
int target_rfsp,
|
||||||
|
bool is_smf_sel_info_null,
|
||||||
OpenAPI_smf_selection_data_t *smf_sel_info,
|
OpenAPI_smf_selection_data_t *smf_sel_info,
|
||||||
OpenAPI_ambr_t *ue_ambr,
|
OpenAPI_ambr_t *ue_ambr,
|
||||||
OpenAPI_list_t *ue_slice_mbrs,
|
OpenAPI_list_t *ue_slice_mbrs,
|
||||||
OpenAPI_list_t* pras,
|
OpenAPI_list_t* pras,
|
||||||
char *supp_feat,
|
char *supp_feat,
|
||||||
|
bool is_pcf_ue_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
||||||
|
bool is_match_pdus_null,
|
||||||
OpenAPI_list_t *match_pdus,
|
OpenAPI_list_t *match_pdus,
|
||||||
|
bool is_as_time_dis_param_null,
|
||||||
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -34,13 +38,17 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_create(
|
||||||
policy_association_local_var->rfsp = rfsp;
|
policy_association_local_var->rfsp = rfsp;
|
||||||
policy_association_local_var->is_target_rfsp = is_target_rfsp;
|
policy_association_local_var->is_target_rfsp = is_target_rfsp;
|
||||||
policy_association_local_var->target_rfsp = target_rfsp;
|
policy_association_local_var->target_rfsp = target_rfsp;
|
||||||
|
policy_association_local_var->is_smf_sel_info_null = is_smf_sel_info_null;
|
||||||
policy_association_local_var->smf_sel_info = smf_sel_info;
|
policy_association_local_var->smf_sel_info = smf_sel_info;
|
||||||
policy_association_local_var->ue_ambr = ue_ambr;
|
policy_association_local_var->ue_ambr = ue_ambr;
|
||||||
policy_association_local_var->ue_slice_mbrs = ue_slice_mbrs;
|
policy_association_local_var->ue_slice_mbrs = ue_slice_mbrs;
|
||||||
policy_association_local_var->pras = pras;
|
policy_association_local_var->pras = pras;
|
||||||
policy_association_local_var->supp_feat = supp_feat;
|
policy_association_local_var->supp_feat = supp_feat;
|
||||||
|
policy_association_local_var->is_pcf_ue_info_null = is_pcf_ue_info_null;
|
||||||
policy_association_local_var->pcf_ue_info = pcf_ue_info;
|
policy_association_local_var->pcf_ue_info = pcf_ue_info;
|
||||||
|
policy_association_local_var->is_match_pdus_null = is_match_pdus_null;
|
||||||
policy_association_local_var->match_pdus = match_pdus;
|
policy_association_local_var->match_pdus = match_pdus;
|
||||||
|
policy_association_local_var->is_as_time_dis_param_null = is_as_time_dis_param_null;
|
||||||
policy_association_local_var->as_time_dis_param = as_time_dis_param;
|
policy_association_local_var->as_time_dis_param = as_time_dis_param;
|
||||||
|
|
||||||
return policy_association_local_var;
|
return policy_association_local_var;
|
||||||
|
@ -205,6 +213,11 @@ cJSON *OpenAPI_policy_association_convertToJSON(OpenAPI_policy_association_t *po
|
||||||
ogs_error("OpenAPI_policy_association_convertToJSON() failed [smf_sel_info]");
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [smf_sel_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_association->is_smf_sel_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "smfSelInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [smf_sel_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_association->ue_ambr) {
|
if (policy_association->ue_ambr) {
|
||||||
|
@ -286,6 +299,11 @@ cJSON *OpenAPI_policy_association_convertToJSON(OpenAPI_policy_association_t *po
|
||||||
ogs_error("OpenAPI_policy_association_convertToJSON() failed [pcf_ue_info]");
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [pcf_ue_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_association->is_pcf_ue_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "pcfUeInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [pcf_ue_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_association->match_pdus) {
|
if (policy_association->match_pdus) {
|
||||||
|
@ -302,6 +320,11 @@ cJSON *OpenAPI_policy_association_convertToJSON(OpenAPI_policy_association_t *po
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(match_pdusList, itemLocal);
|
cJSON_AddItemToArray(match_pdusList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (policy_association->is_match_pdus_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "matchPdus") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [match_pdus]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_association->as_time_dis_param) {
|
if (policy_association->as_time_dis_param) {
|
||||||
|
@ -315,6 +338,11 @@ cJSON *OpenAPI_policy_association_convertToJSON(OpenAPI_policy_association_t *po
|
||||||
ogs_error("OpenAPI_policy_association_convertToJSON() failed [as_time_dis_param]");
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [as_time_dis_param]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_association->is_as_time_dis_param_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "asTimeDisParam") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_convertToJSON() failed [as_time_dis_param]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -420,12 +448,14 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po
|
||||||
|
|
||||||
smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "smfSelInfo");
|
smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "smfSelInfo");
|
||||||
if (smf_sel_info) {
|
if (smf_sel_info) {
|
||||||
|
if (!cJSON_IsNull(smf_sel_info)) {
|
||||||
smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info);
|
smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info);
|
||||||
if (!smf_sel_info_local_nonprim) {
|
if (!smf_sel_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed [smf_sel_info]");
|
ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed [smf_sel_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "ueAmbr");
|
ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "ueAmbr");
|
||||||
if (ue_ambr) {
|
if (ue_ambr) {
|
||||||
|
@ -498,15 +528,18 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po
|
||||||
|
|
||||||
pcf_ue_info = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "pcfUeInfo");
|
pcf_ue_info = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "pcfUeInfo");
|
||||||
if (pcf_ue_info) {
|
if (pcf_ue_info) {
|
||||||
|
if (!cJSON_IsNull(pcf_ue_info)) {
|
||||||
pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info);
|
pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info);
|
||||||
if (!pcf_ue_info_local_nonprim) {
|
if (!pcf_ue_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_info]");
|
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
match_pdus = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "matchPdus");
|
match_pdus = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "matchPdus");
|
||||||
if (match_pdus) {
|
if (match_pdus) {
|
||||||
|
if (!cJSON_IsNull(match_pdus)) {
|
||||||
cJSON *match_pdus_local = NULL;
|
cJSON *match_pdus_local = NULL;
|
||||||
if (!cJSON_IsArray(match_pdus)) {
|
if (!cJSON_IsArray(match_pdus)) {
|
||||||
ogs_error("OpenAPI_policy_association_parseFromJSON() failed [match_pdus]");
|
ogs_error("OpenAPI_policy_association_parseFromJSON() failed [match_pdus]");
|
||||||
|
@ -528,15 +561,18 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po
|
||||||
OpenAPI_list_add(match_pdusList, match_pdusItem);
|
OpenAPI_list_add(match_pdusList, match_pdusItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
as_time_dis_param = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "asTimeDisParam");
|
as_time_dis_param = cJSON_GetObjectItemCaseSensitive(policy_associationJSON, "asTimeDisParam");
|
||||||
if (as_time_dis_param) {
|
if (as_time_dis_param) {
|
||||||
|
if (!cJSON_IsNull(as_time_dis_param)) {
|
||||||
as_time_dis_param_local_nonprim = OpenAPI_as_time_distribution_param_parseFromJSON(as_time_dis_param);
|
as_time_dis_param_local_nonprim = OpenAPI_as_time_distribution_param_parseFromJSON(as_time_dis_param);
|
||||||
if (!as_time_dis_param_local_nonprim) {
|
if (!as_time_dis_param_local_nonprim) {
|
||||||
ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON failed [as_time_dis_param]");
|
ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON failed [as_time_dis_param]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
policy_association_local_var = OpenAPI_policy_association_create (
|
policy_association_local_var = OpenAPI_policy_association_create (
|
||||||
request ? request_local_nonprim : NULL,
|
request ? request_local_nonprim : NULL,
|
||||||
|
@ -547,13 +583,17 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po
|
||||||
rfsp ? rfsp->valuedouble : 0,
|
rfsp ? rfsp->valuedouble : 0,
|
||||||
target_rfsp ? true : false,
|
target_rfsp ? true : false,
|
||||||
target_rfsp ? target_rfsp->valuedouble : 0,
|
target_rfsp ? target_rfsp->valuedouble : 0,
|
||||||
|
smf_sel_info && cJSON_IsNull(smf_sel_info) ? true : false,
|
||||||
smf_sel_info ? smf_sel_info_local_nonprim : NULL,
|
smf_sel_info ? smf_sel_info_local_nonprim : NULL,
|
||||||
ue_ambr ? ue_ambr_local_nonprim : NULL,
|
ue_ambr ? ue_ambr_local_nonprim : NULL,
|
||||||
ue_slice_mbrs ? ue_slice_mbrsList : NULL,
|
ue_slice_mbrs ? ue_slice_mbrsList : NULL,
|
||||||
pras ? prasList : NULL,
|
pras ? prasList : NULL,
|
||||||
ogs_strdup(supp_feat->valuestring),
|
ogs_strdup(supp_feat->valuestring),
|
||||||
|
pcf_ue_info && cJSON_IsNull(pcf_ue_info) ? true : false,
|
||||||
pcf_ue_info ? pcf_ue_info_local_nonprim : NULL,
|
pcf_ue_info ? pcf_ue_info_local_nonprim : NULL,
|
||||||
|
match_pdus && cJSON_IsNull(match_pdus) ? true : false,
|
||||||
match_pdus ? match_pdusList : NULL,
|
match_pdus ? match_pdusList : NULL,
|
||||||
|
as_time_dis_param && cJSON_IsNull(as_time_dis_param) ? true : false,
|
||||||
as_time_dis_param ? as_time_dis_param_local_nonprim : NULL
|
as_time_dis_param ? as_time_dis_param_local_nonprim : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -38,13 +38,17 @@ typedef struct OpenAPI_policy_association_s {
|
||||||
int rfsp;
|
int rfsp;
|
||||||
bool is_target_rfsp;
|
bool is_target_rfsp;
|
||||||
int target_rfsp;
|
int target_rfsp;
|
||||||
|
bool is_smf_sel_info_null;
|
||||||
struct OpenAPI_smf_selection_data_s *smf_sel_info;
|
struct OpenAPI_smf_selection_data_s *smf_sel_info;
|
||||||
struct OpenAPI_ambr_s *ue_ambr;
|
struct OpenAPI_ambr_s *ue_ambr;
|
||||||
OpenAPI_list_t *ue_slice_mbrs;
|
OpenAPI_list_t *ue_slice_mbrs;
|
||||||
OpenAPI_list_t* pras;
|
OpenAPI_list_t* pras;
|
||||||
char *supp_feat;
|
char *supp_feat;
|
||||||
|
bool is_pcf_ue_info_null;
|
||||||
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_info;
|
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_info;
|
||||||
|
bool is_match_pdus_null;
|
||||||
OpenAPI_list_t *match_pdus;
|
OpenAPI_list_t *match_pdus;
|
||||||
|
bool is_as_time_dis_param_null;
|
||||||
struct OpenAPI_as_time_distribution_param_s *as_time_dis_param;
|
struct OpenAPI_as_time_distribution_param_s *as_time_dis_param;
|
||||||
} OpenAPI_policy_association_t;
|
} OpenAPI_policy_association_t;
|
||||||
|
|
||||||
|
@ -57,13 +61,17 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_create(
|
||||||
int rfsp,
|
int rfsp,
|
||||||
bool is_target_rfsp,
|
bool is_target_rfsp,
|
||||||
int target_rfsp,
|
int target_rfsp,
|
||||||
|
bool is_smf_sel_info_null,
|
||||||
OpenAPI_smf_selection_data_t *smf_sel_info,
|
OpenAPI_smf_selection_data_t *smf_sel_info,
|
||||||
OpenAPI_ambr_t *ue_ambr,
|
OpenAPI_ambr_t *ue_ambr,
|
||||||
OpenAPI_list_t *ue_slice_mbrs,
|
OpenAPI_list_t *ue_slice_mbrs,
|
||||||
OpenAPI_list_t* pras,
|
OpenAPI_list_t* pras,
|
||||||
char *supp_feat,
|
char *supp_feat,
|
||||||
|
bool is_pcf_ue_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
||||||
|
bool is_match_pdus_null,
|
||||||
OpenAPI_list_t *match_pdus,
|
OpenAPI_list_t *match_pdus,
|
||||||
|
bool is_as_time_dis_param_null,
|
||||||
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
||||||
);
|
);
|
||||||
void OpenAPI_policy_association_free(OpenAPI_policy_association_t *policy_association);
|
void OpenAPI_policy_association_free(OpenAPI_policy_association_t *policy_association);
|
||||||
|
|
|
@ -32,6 +32,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_create(
|
||||||
OpenAPI_list_t *n3g_allowed_snssais,
|
OpenAPI_list_t *n3g_allowed_snssais,
|
||||||
OpenAPI_guami_t *guami,
|
OpenAPI_guami_t *guami,
|
||||||
char *service_name,
|
char *service_name,
|
||||||
|
bool is_trace_req_null,
|
||||||
OpenAPI_trace_data_t *trace_req,
|
OpenAPI_trace_data_t *trace_req,
|
||||||
OpenAPI_list_t *nwdaf_datas,
|
OpenAPI_list_t *nwdaf_datas,
|
||||||
char *supp_feat
|
char *supp_feat
|
||||||
|
@ -67,6 +68,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_create(
|
||||||
policy_association_request_local_var->n3g_allowed_snssais = n3g_allowed_snssais;
|
policy_association_request_local_var->n3g_allowed_snssais = n3g_allowed_snssais;
|
||||||
policy_association_request_local_var->guami = guami;
|
policy_association_request_local_var->guami = guami;
|
||||||
policy_association_request_local_var->service_name = service_name;
|
policy_association_request_local_var->service_name = service_name;
|
||||||
|
policy_association_request_local_var->is_trace_req_null = is_trace_req_null;
|
||||||
policy_association_request_local_var->trace_req = trace_req;
|
policy_association_request_local_var->trace_req = trace_req;
|
||||||
policy_association_request_local_var->nwdaf_datas = nwdaf_datas;
|
policy_association_request_local_var->nwdaf_datas = nwdaf_datas;
|
||||||
policy_association_request_local_var->supp_feat = supp_feat;
|
policy_association_request_local_var->supp_feat = supp_feat;
|
||||||
|
@ -549,6 +551,11 @@ cJSON *OpenAPI_policy_association_request_convertToJSON(OpenAPI_policy_associati
|
||||||
ogs_error("OpenAPI_policy_association_request_convertToJSON() failed [trace_req]");
|
ogs_error("OpenAPI_policy_association_request_convertToJSON() failed [trace_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_association_request->is_trace_req_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceReq") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_request_convertToJSON() failed [trace_req]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_association_request->nwdaf_datas) {
|
if (policy_association_request->nwdaf_datas) {
|
||||||
|
@ -1022,12 +1029,14 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr
|
||||||
|
|
||||||
trace_req = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "traceReq");
|
trace_req = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "traceReq");
|
||||||
if (trace_req) {
|
if (trace_req) {
|
||||||
|
if (!cJSON_IsNull(trace_req)) {
|
||||||
trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req);
|
trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req);
|
||||||
if (!trace_req_local_nonprim) {
|
if (!trace_req_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_req]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
nwdaf_datas = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "nwdafDatas");
|
nwdaf_datas = cJSON_GetObjectItemCaseSensitive(policy_association_requestJSON, "nwdafDatas");
|
||||||
if (nwdaf_datas) {
|
if (nwdaf_datas) {
|
||||||
|
@ -1091,6 +1100,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr
|
||||||
n3g_allowed_snssais ? n3g_allowed_snssaisList : NULL,
|
n3g_allowed_snssais ? n3g_allowed_snssaisList : NULL,
|
||||||
guami ? guami_local_nonprim : NULL,
|
guami ? guami_local_nonprim : NULL,
|
||||||
service_name && !cJSON_IsNull(service_name) ? ogs_strdup(service_name->valuestring) : NULL,
|
service_name && !cJSON_IsNull(service_name) ? ogs_strdup(service_name->valuestring) : NULL,
|
||||||
|
trace_req && cJSON_IsNull(trace_req) ? true : false,
|
||||||
trace_req ? trace_req_local_nonprim : NULL,
|
trace_req ? trace_req_local_nonprim : NULL,
|
||||||
nwdaf_datas ? nwdaf_datasList : NULL,
|
nwdaf_datas ? nwdaf_datasList : NULL,
|
||||||
ogs_strdup(supp_feat->valuestring)
|
ogs_strdup(supp_feat->valuestring)
|
||||||
|
|
|
@ -59,6 +59,7 @@ typedef struct OpenAPI_policy_association_request_s {
|
||||||
OpenAPI_list_t *n3g_allowed_snssais;
|
OpenAPI_list_t *n3g_allowed_snssais;
|
||||||
struct OpenAPI_guami_s *guami;
|
struct OpenAPI_guami_s *guami;
|
||||||
char *service_name;
|
char *service_name;
|
||||||
|
bool is_trace_req_null;
|
||||||
struct OpenAPI_trace_data_s *trace_req;
|
struct OpenAPI_trace_data_s *trace_req;
|
||||||
OpenAPI_list_t *nwdaf_datas;
|
OpenAPI_list_t *nwdaf_datas;
|
||||||
char *supp_feat;
|
char *supp_feat;
|
||||||
|
@ -92,6 +93,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_create(
|
||||||
OpenAPI_list_t *n3g_allowed_snssais,
|
OpenAPI_list_t *n3g_allowed_snssais,
|
||||||
OpenAPI_guami_t *guami,
|
OpenAPI_guami_t *guami,
|
||||||
char *service_name,
|
char *service_name,
|
||||||
|
bool is_trace_req_null,
|
||||||
OpenAPI_trace_data_t *trace_req,
|
OpenAPI_trace_data_t *trace_req,
|
||||||
OpenAPI_list_t *nwdaf_datas,
|
OpenAPI_list_t *nwdaf_datas,
|
||||||
char *supp_feat
|
char *supp_feat
|
||||||
|
|
|
@ -14,6 +14,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
||||||
bool is_rfsp,
|
bool is_rfsp,
|
||||||
int rfsp,
|
int rfsp,
|
||||||
|
bool is_smf_sel_info_null,
|
||||||
OpenAPI_smf_selection_data_t *smf_sel_info,
|
OpenAPI_smf_selection_data_t *smf_sel_info,
|
||||||
OpenAPI_ambr_t *ue_ambr,
|
OpenAPI_ambr_t *ue_ambr,
|
||||||
OpenAPI_list_t *ue_slice_mbrs,
|
OpenAPI_list_t *ue_slice_mbrs,
|
||||||
|
@ -25,8 +26,10 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
OpenAPI_list_t *access_types,
|
OpenAPI_list_t *access_types,
|
||||||
OpenAPI_list_t *rat_types,
|
OpenAPI_list_t *rat_types,
|
||||||
OpenAPI_list_t *n3g_allowed_snssais,
|
OpenAPI_list_t *n3g_allowed_snssais,
|
||||||
|
bool is_trace_req_null,
|
||||||
OpenAPI_trace_data_t *trace_req,
|
OpenAPI_trace_data_t *trace_req,
|
||||||
OpenAPI_guami_t *guami,
|
OpenAPI_guami_t *guami,
|
||||||
|
bool is_nwdaf_datas_null,
|
||||||
OpenAPI_list_t *nwdaf_datas
|
OpenAPI_list_t *nwdaf_datas
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -42,6 +45,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
policy_association_update_request_local_var->wl_serv_area_res = wl_serv_area_res;
|
policy_association_update_request_local_var->wl_serv_area_res = wl_serv_area_res;
|
||||||
policy_association_update_request_local_var->is_rfsp = is_rfsp;
|
policy_association_update_request_local_var->is_rfsp = is_rfsp;
|
||||||
policy_association_update_request_local_var->rfsp = rfsp;
|
policy_association_update_request_local_var->rfsp = rfsp;
|
||||||
|
policy_association_update_request_local_var->is_smf_sel_info_null = is_smf_sel_info_null;
|
||||||
policy_association_update_request_local_var->smf_sel_info = smf_sel_info;
|
policy_association_update_request_local_var->smf_sel_info = smf_sel_info;
|
||||||
policy_association_update_request_local_var->ue_ambr = ue_ambr;
|
policy_association_update_request_local_var->ue_ambr = ue_ambr;
|
||||||
policy_association_update_request_local_var->ue_slice_mbrs = ue_slice_mbrs;
|
policy_association_update_request_local_var->ue_slice_mbrs = ue_slice_mbrs;
|
||||||
|
@ -53,8 +57,10 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
policy_association_update_request_local_var->access_types = access_types;
|
policy_association_update_request_local_var->access_types = access_types;
|
||||||
policy_association_update_request_local_var->rat_types = rat_types;
|
policy_association_update_request_local_var->rat_types = rat_types;
|
||||||
policy_association_update_request_local_var->n3g_allowed_snssais = n3g_allowed_snssais;
|
policy_association_update_request_local_var->n3g_allowed_snssais = n3g_allowed_snssais;
|
||||||
|
policy_association_update_request_local_var->is_trace_req_null = is_trace_req_null;
|
||||||
policy_association_update_request_local_var->trace_req = trace_req;
|
policy_association_update_request_local_var->trace_req = trace_req;
|
||||||
policy_association_update_request_local_var->guami = guami;
|
policy_association_update_request_local_var->guami = guami;
|
||||||
|
policy_association_update_request_local_var->is_nwdaf_datas_null = is_nwdaf_datas_null;
|
||||||
policy_association_update_request_local_var->nwdaf_datas = nwdaf_datas;
|
policy_association_update_request_local_var->nwdaf_datas = nwdaf_datas;
|
||||||
|
|
||||||
return policy_association_update_request_local_var;
|
return policy_association_update_request_local_var;
|
||||||
|
@ -305,6 +311,11 @@ cJSON *OpenAPI_policy_association_update_request_convertToJSON(OpenAPI_policy_as
|
||||||
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [smf_sel_info]");
|
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [smf_sel_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_association_update_request->is_smf_sel_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "smfSelInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [smf_sel_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_association_update_request->ue_ambr) {
|
if (policy_association_update_request->ue_ambr) {
|
||||||
|
@ -482,6 +493,11 @@ cJSON *OpenAPI_policy_association_update_request_convertToJSON(OpenAPI_policy_as
|
||||||
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [trace_req]");
|
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [trace_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_association_update_request->is_trace_req_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceReq") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [trace_req]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_association_update_request->guami) {
|
if (policy_association_update_request->guami) {
|
||||||
|
@ -511,6 +527,11 @@ cJSON *OpenAPI_policy_association_update_request_convertToJSON(OpenAPI_policy_as
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(nwdaf_datasList, itemLocal);
|
cJSON_AddItemToArray(nwdaf_datasList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (policy_association_update_request->is_nwdaf_datas_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "nwdafDatas") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_association_update_request_convertToJSON() failed [nwdaf_datas]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -687,12 +708,14 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
|
|
||||||
smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "smfSelInfo");
|
smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "smfSelInfo");
|
||||||
if (smf_sel_info) {
|
if (smf_sel_info) {
|
||||||
|
if (!cJSON_IsNull(smf_sel_info)) {
|
||||||
smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info);
|
smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info);
|
||||||
if (!smf_sel_info_local_nonprim) {
|
if (!smf_sel_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed [smf_sel_info]");
|
ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed [smf_sel_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "ueAmbr");
|
ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "ueAmbr");
|
||||||
if (ue_ambr) {
|
if (ue_ambr) {
|
||||||
|
@ -910,12 +933,14 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
|
|
||||||
trace_req = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "traceReq");
|
trace_req = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "traceReq");
|
||||||
if (trace_req) {
|
if (trace_req) {
|
||||||
|
if (!cJSON_IsNull(trace_req)) {
|
||||||
trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req);
|
trace_req_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_req);
|
||||||
if (!trace_req_local_nonprim) {
|
if (!trace_req_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_req]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_req]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
guami = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "guami");
|
guami = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "guami");
|
||||||
if (guami) {
|
if (guami) {
|
||||||
|
@ -928,6 +953,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
|
|
||||||
nwdaf_datas = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "nwdafDatas");
|
nwdaf_datas = cJSON_GetObjectItemCaseSensitive(policy_association_update_requestJSON, "nwdafDatas");
|
||||||
if (nwdaf_datas) {
|
if (nwdaf_datas) {
|
||||||
|
if (!cJSON_IsNull(nwdaf_datas)) {
|
||||||
cJSON *nwdaf_datas_local = NULL;
|
cJSON *nwdaf_datas_local = NULL;
|
||||||
if (!cJSON_IsArray(nwdaf_datas)) {
|
if (!cJSON_IsArray(nwdaf_datas)) {
|
||||||
ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [nwdaf_datas]");
|
ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [nwdaf_datas]");
|
||||||
|
@ -949,6 +975,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
OpenAPI_list_add(nwdaf_datasList, nwdaf_datasItem);
|
OpenAPI_list_add(nwdaf_datasList, nwdaf_datasItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
policy_association_update_request_local_var = OpenAPI_policy_association_update_request_create (
|
policy_association_update_request_local_var = OpenAPI_policy_association_update_request_create (
|
||||||
notification_uri && !cJSON_IsNull(notification_uri) ? ogs_strdup(notification_uri->valuestring) : NULL,
|
notification_uri && !cJSON_IsNull(notification_uri) ? ogs_strdup(notification_uri->valuestring) : NULL,
|
||||||
|
@ -960,6 +987,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
wl_serv_area_res ? wl_serv_area_res_local_nonprim : NULL,
|
wl_serv_area_res ? wl_serv_area_res_local_nonprim : NULL,
|
||||||
rfsp ? true : false,
|
rfsp ? true : false,
|
||||||
rfsp ? rfsp->valuedouble : 0,
|
rfsp ? rfsp->valuedouble : 0,
|
||||||
|
smf_sel_info && cJSON_IsNull(smf_sel_info) ? true : false,
|
||||||
smf_sel_info ? smf_sel_info_local_nonprim : NULL,
|
smf_sel_info ? smf_sel_info_local_nonprim : NULL,
|
||||||
ue_ambr ? ue_ambr_local_nonprim : NULL,
|
ue_ambr ? ue_ambr_local_nonprim : NULL,
|
||||||
ue_slice_mbrs ? ue_slice_mbrsList : NULL,
|
ue_slice_mbrs ? ue_slice_mbrsList : NULL,
|
||||||
|
@ -971,8 +999,10 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
access_types ? access_typesList : NULL,
|
access_types ? access_typesList : NULL,
|
||||||
rat_types ? rat_typesList : NULL,
|
rat_types ? rat_typesList : NULL,
|
||||||
n3g_allowed_snssais ? n3g_allowed_snssaisList : NULL,
|
n3g_allowed_snssais ? n3g_allowed_snssaisList : NULL,
|
||||||
|
trace_req && cJSON_IsNull(trace_req) ? true : false,
|
||||||
trace_req ? trace_req_local_nonprim : NULL,
|
trace_req ? trace_req_local_nonprim : NULL,
|
||||||
guami ? guami_local_nonprim : NULL,
|
guami ? guami_local_nonprim : NULL,
|
||||||
|
nwdaf_datas && cJSON_IsNull(nwdaf_datas) ? true : false,
|
||||||
nwdaf_datas ? nwdaf_datasList : NULL
|
nwdaf_datas ? nwdaf_datasList : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@ typedef struct OpenAPI_policy_association_update_request_s {
|
||||||
struct OpenAPI_wireline_service_area_restriction_s *wl_serv_area_res;
|
struct OpenAPI_wireline_service_area_restriction_s *wl_serv_area_res;
|
||||||
bool is_rfsp;
|
bool is_rfsp;
|
||||||
int rfsp;
|
int rfsp;
|
||||||
|
bool is_smf_sel_info_null;
|
||||||
struct OpenAPI_smf_selection_data_s *smf_sel_info;
|
struct OpenAPI_smf_selection_data_s *smf_sel_info;
|
||||||
struct OpenAPI_ambr_s *ue_ambr;
|
struct OpenAPI_ambr_s *ue_ambr;
|
||||||
OpenAPI_list_t *ue_slice_mbrs;
|
OpenAPI_list_t *ue_slice_mbrs;
|
||||||
|
@ -54,8 +55,10 @@ typedef struct OpenAPI_policy_association_update_request_s {
|
||||||
OpenAPI_list_t *access_types;
|
OpenAPI_list_t *access_types;
|
||||||
OpenAPI_list_t *rat_types;
|
OpenAPI_list_t *rat_types;
|
||||||
OpenAPI_list_t *n3g_allowed_snssais;
|
OpenAPI_list_t *n3g_allowed_snssais;
|
||||||
|
bool is_trace_req_null;
|
||||||
struct OpenAPI_trace_data_s *trace_req;
|
struct OpenAPI_trace_data_s *trace_req;
|
||||||
struct OpenAPI_guami_s *guami;
|
struct OpenAPI_guami_s *guami;
|
||||||
|
bool is_nwdaf_datas_null;
|
||||||
OpenAPI_list_t *nwdaf_datas;
|
OpenAPI_list_t *nwdaf_datas;
|
||||||
} OpenAPI_policy_association_update_request_t;
|
} OpenAPI_policy_association_update_request_t;
|
||||||
|
|
||||||
|
@ -69,6 +72,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
||||||
bool is_rfsp,
|
bool is_rfsp,
|
||||||
int rfsp,
|
int rfsp,
|
||||||
|
bool is_smf_sel_info_null,
|
||||||
OpenAPI_smf_selection_data_t *smf_sel_info,
|
OpenAPI_smf_selection_data_t *smf_sel_info,
|
||||||
OpenAPI_ambr_t *ue_ambr,
|
OpenAPI_ambr_t *ue_ambr,
|
||||||
OpenAPI_list_t *ue_slice_mbrs,
|
OpenAPI_list_t *ue_slice_mbrs,
|
||||||
|
@ -80,8 +84,10 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r
|
||||||
OpenAPI_list_t *access_types,
|
OpenAPI_list_t *access_types,
|
||||||
OpenAPI_list_t *rat_types,
|
OpenAPI_list_t *rat_types,
|
||||||
OpenAPI_list_t *n3g_allowed_snssais,
|
OpenAPI_list_t *n3g_allowed_snssais,
|
||||||
|
bool is_trace_req_null,
|
||||||
OpenAPI_trace_data_t *trace_req,
|
OpenAPI_trace_data_t *trace_req,
|
||||||
OpenAPI_guami_t *guami,
|
OpenAPI_guami_t *guami,
|
||||||
|
bool is_nwdaf_datas_null,
|
||||||
OpenAPI_list_t *nwdaf_datas
|
OpenAPI_list_t *nwdaf_datas
|
||||||
);
|
);
|
||||||
void OpenAPI_policy_association_update_request_free(OpenAPI_policy_association_update_request_t *policy_association_update_request);
|
void OpenAPI_policy_association_update_request_free(OpenAPI_policy_association_update_request_t *policy_association_update_request);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
||||||
char *resource_uri,
|
char *resource_uri,
|
||||||
|
bool is_triggers_null,
|
||||||
OpenAPI_list_t *triggers,
|
OpenAPI_list_t *triggers,
|
||||||
OpenAPI_service_area_restriction_t *serv_area_res,
|
OpenAPI_service_area_restriction_t *serv_area_res,
|
||||||
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
||||||
|
@ -13,12 +14,17 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
||||||
int rfsp,
|
int rfsp,
|
||||||
bool is_target_rfsp,
|
bool is_target_rfsp,
|
||||||
int target_rfsp,
|
int target_rfsp,
|
||||||
|
bool is_smf_sel_info_null,
|
||||||
OpenAPI_smf_selection_data_t *smf_sel_info,
|
OpenAPI_smf_selection_data_t *smf_sel_info,
|
||||||
OpenAPI_ambr_t *ue_ambr,
|
OpenAPI_ambr_t *ue_ambr,
|
||||||
OpenAPI_list_t *ue_slice_mbrs,
|
OpenAPI_list_t *ue_slice_mbrs,
|
||||||
|
bool is_pras_null,
|
||||||
OpenAPI_list_t* pras,
|
OpenAPI_list_t* pras,
|
||||||
|
bool is_pcf_ue_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
||||||
|
bool is_match_pdus_null,
|
||||||
OpenAPI_list_t *match_pdus,
|
OpenAPI_list_t *match_pdus,
|
||||||
|
bool is_as_time_dis_param_null,
|
||||||
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -26,6 +32,7 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
||||||
ogs_assert(policy_update_local_var);
|
ogs_assert(policy_update_local_var);
|
||||||
|
|
||||||
policy_update_local_var->resource_uri = resource_uri;
|
policy_update_local_var->resource_uri = resource_uri;
|
||||||
|
policy_update_local_var->is_triggers_null = is_triggers_null;
|
||||||
policy_update_local_var->triggers = triggers;
|
policy_update_local_var->triggers = triggers;
|
||||||
policy_update_local_var->serv_area_res = serv_area_res;
|
policy_update_local_var->serv_area_res = serv_area_res;
|
||||||
policy_update_local_var->wl_serv_area_res = wl_serv_area_res;
|
policy_update_local_var->wl_serv_area_res = wl_serv_area_res;
|
||||||
|
@ -33,12 +40,17 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
||||||
policy_update_local_var->rfsp = rfsp;
|
policy_update_local_var->rfsp = rfsp;
|
||||||
policy_update_local_var->is_target_rfsp = is_target_rfsp;
|
policy_update_local_var->is_target_rfsp = is_target_rfsp;
|
||||||
policy_update_local_var->target_rfsp = target_rfsp;
|
policy_update_local_var->target_rfsp = target_rfsp;
|
||||||
|
policy_update_local_var->is_smf_sel_info_null = is_smf_sel_info_null;
|
||||||
policy_update_local_var->smf_sel_info = smf_sel_info;
|
policy_update_local_var->smf_sel_info = smf_sel_info;
|
||||||
policy_update_local_var->ue_ambr = ue_ambr;
|
policy_update_local_var->ue_ambr = ue_ambr;
|
||||||
policy_update_local_var->ue_slice_mbrs = ue_slice_mbrs;
|
policy_update_local_var->ue_slice_mbrs = ue_slice_mbrs;
|
||||||
|
policy_update_local_var->is_pras_null = is_pras_null;
|
||||||
policy_update_local_var->pras = pras;
|
policy_update_local_var->pras = pras;
|
||||||
|
policy_update_local_var->is_pcf_ue_info_null = is_pcf_ue_info_null;
|
||||||
policy_update_local_var->pcf_ue_info = pcf_ue_info;
|
policy_update_local_var->pcf_ue_info = pcf_ue_info;
|
||||||
|
policy_update_local_var->is_match_pdus_null = is_match_pdus_null;
|
||||||
policy_update_local_var->match_pdus = match_pdus;
|
policy_update_local_var->match_pdus = match_pdus;
|
||||||
|
policy_update_local_var->is_as_time_dis_param_null = is_as_time_dis_param_null;
|
||||||
policy_update_local_var->as_time_dis_param = as_time_dis_param;
|
policy_update_local_var->as_time_dis_param = as_time_dis_param;
|
||||||
|
|
||||||
return policy_update_local_var;
|
return policy_update_local_var;
|
||||||
|
@ -142,6 +154,11 @@ cJSON *OpenAPI_policy_update_convertToJSON(OpenAPI_policy_update_t *policy_updat
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (policy_update->is_triggers_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "triggers") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [triggers]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_update->serv_area_res) {
|
if (policy_update->serv_area_res) {
|
||||||
|
@ -195,6 +212,11 @@ cJSON *OpenAPI_policy_update_convertToJSON(OpenAPI_policy_update_t *policy_updat
|
||||||
ogs_error("OpenAPI_policy_update_convertToJSON() failed [smf_sel_info]");
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [smf_sel_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_update->is_smf_sel_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "smfSelInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [smf_sel_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_update->ue_ambr) {
|
if (policy_update->ue_ambr) {
|
||||||
|
@ -254,6 +276,11 @@ cJSON *OpenAPI_policy_update_convertToJSON(OpenAPI_policy_update_t *policy_updat
|
||||||
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
|
cJSON_AddItemToObject(localMapObject, localKeyValue->key, itemLocal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (policy_update->is_pras_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "pras") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [pras]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_update->pcf_ue_info) {
|
if (policy_update->pcf_ue_info) {
|
||||||
|
@ -267,6 +294,11 @@ cJSON *OpenAPI_policy_update_convertToJSON(OpenAPI_policy_update_t *policy_updat
|
||||||
ogs_error("OpenAPI_policy_update_convertToJSON() failed [pcf_ue_info]");
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [pcf_ue_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_update->is_pcf_ue_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "pcfUeInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [pcf_ue_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_update->match_pdus) {
|
if (policy_update->match_pdus) {
|
||||||
|
@ -283,6 +315,11 @@ cJSON *OpenAPI_policy_update_convertToJSON(OpenAPI_policy_update_t *policy_updat
|
||||||
}
|
}
|
||||||
cJSON_AddItemToArray(match_pdusList, itemLocal);
|
cJSON_AddItemToArray(match_pdusList, itemLocal);
|
||||||
}
|
}
|
||||||
|
} else if (policy_update->is_match_pdus_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "matchPdus") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [match_pdus]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (policy_update->as_time_dis_param) {
|
if (policy_update->as_time_dis_param) {
|
||||||
|
@ -296,6 +333,11 @@ cJSON *OpenAPI_policy_update_convertToJSON(OpenAPI_policy_update_t *policy_updat
|
||||||
ogs_error("OpenAPI_policy_update_convertToJSON() failed [as_time_dis_param]");
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [as_time_dis_param]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (policy_update->is_as_time_dis_param_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "asTimeDisParam") == NULL) {
|
||||||
|
ogs_error("OpenAPI_policy_update_convertToJSON() failed [as_time_dis_param]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -341,6 +383,7 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
|
|
||||||
triggers = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "triggers");
|
triggers = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "triggers");
|
||||||
if (triggers) {
|
if (triggers) {
|
||||||
|
if (!cJSON_IsNull(triggers)) {
|
||||||
cJSON *triggers_local = NULL;
|
cJSON *triggers_local = NULL;
|
||||||
if (!cJSON_IsArray(triggers)) {
|
if (!cJSON_IsArray(triggers)) {
|
||||||
ogs_error("OpenAPI_policy_update_parseFromJSON() failed [triggers]");
|
ogs_error("OpenAPI_policy_update_parseFromJSON() failed [triggers]");
|
||||||
|
@ -363,6 +406,7 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
OpenAPI_list_add(triggersList, (void *)localEnum);
|
OpenAPI_list_add(triggersList, (void *)localEnum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "servAreaRes");
|
serv_area_res = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "servAreaRes");
|
||||||
if (serv_area_res) {
|
if (serv_area_res) {
|
||||||
|
@ -400,12 +444,14 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
|
|
||||||
smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "smfSelInfo");
|
smf_sel_info = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "smfSelInfo");
|
||||||
if (smf_sel_info) {
|
if (smf_sel_info) {
|
||||||
|
if (!cJSON_IsNull(smf_sel_info)) {
|
||||||
smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info);
|
smf_sel_info_local_nonprim = OpenAPI_smf_selection_data_parseFromJSON(smf_sel_info);
|
||||||
if (!smf_sel_info_local_nonprim) {
|
if (!smf_sel_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed [smf_sel_info]");
|
ogs_error("OpenAPI_smf_selection_data_parseFromJSON failed [smf_sel_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "ueAmbr");
|
ue_ambr = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "ueAmbr");
|
||||||
if (ue_ambr) {
|
if (ue_ambr) {
|
||||||
|
@ -442,6 +488,7 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
|
|
||||||
pras = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "pras");
|
pras = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "pras");
|
||||||
if (pras) {
|
if (pras) {
|
||||||
|
if (!cJSON_IsNull(pras)) {
|
||||||
cJSON *pras_local_map = NULL;
|
cJSON *pras_local_map = NULL;
|
||||||
if (!cJSON_IsObject(pras) && !cJSON_IsNull(pras)) {
|
if (!cJSON_IsObject(pras) && !cJSON_IsNull(pras)) {
|
||||||
ogs_error("OpenAPI_policy_update_parseFromJSON() failed [pras]");
|
ogs_error("OpenAPI_policy_update_parseFromJSON() failed [pras]");
|
||||||
|
@ -465,18 +512,22 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pcf_ue_info = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "pcfUeInfo");
|
pcf_ue_info = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "pcfUeInfo");
|
||||||
if (pcf_ue_info) {
|
if (pcf_ue_info) {
|
||||||
|
if (!cJSON_IsNull(pcf_ue_info)) {
|
||||||
pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info);
|
pcf_ue_info_local_nonprim = OpenAPI_pcf_ue_callback_info_parseFromJSON(pcf_ue_info);
|
||||||
if (!pcf_ue_info_local_nonprim) {
|
if (!pcf_ue_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_info]");
|
ogs_error("OpenAPI_pcf_ue_callback_info_parseFromJSON failed [pcf_ue_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
match_pdus = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "matchPdus");
|
match_pdus = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "matchPdus");
|
||||||
if (match_pdus) {
|
if (match_pdus) {
|
||||||
|
if (!cJSON_IsNull(match_pdus)) {
|
||||||
cJSON *match_pdus_local = NULL;
|
cJSON *match_pdus_local = NULL;
|
||||||
if (!cJSON_IsArray(match_pdus)) {
|
if (!cJSON_IsArray(match_pdus)) {
|
||||||
ogs_error("OpenAPI_policy_update_parseFromJSON() failed [match_pdus]");
|
ogs_error("OpenAPI_policy_update_parseFromJSON() failed [match_pdus]");
|
||||||
|
@ -498,18 +549,22 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
OpenAPI_list_add(match_pdusList, match_pdusItem);
|
OpenAPI_list_add(match_pdusList, match_pdusItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
as_time_dis_param = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "asTimeDisParam");
|
as_time_dis_param = cJSON_GetObjectItemCaseSensitive(policy_updateJSON, "asTimeDisParam");
|
||||||
if (as_time_dis_param) {
|
if (as_time_dis_param) {
|
||||||
|
if (!cJSON_IsNull(as_time_dis_param)) {
|
||||||
as_time_dis_param_local_nonprim = OpenAPI_as_time_distribution_param_parseFromJSON(as_time_dis_param);
|
as_time_dis_param_local_nonprim = OpenAPI_as_time_distribution_param_parseFromJSON(as_time_dis_param);
|
||||||
if (!as_time_dis_param_local_nonprim) {
|
if (!as_time_dis_param_local_nonprim) {
|
||||||
ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON failed [as_time_dis_param]");
|
ogs_error("OpenAPI_as_time_distribution_param_parseFromJSON failed [as_time_dis_param]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
policy_update_local_var = OpenAPI_policy_update_create (
|
policy_update_local_var = OpenAPI_policy_update_create (
|
||||||
ogs_strdup(resource_uri->valuestring),
|
ogs_strdup(resource_uri->valuestring),
|
||||||
|
triggers && cJSON_IsNull(triggers) ? true : false,
|
||||||
triggers ? triggersList : NULL,
|
triggers ? triggersList : NULL,
|
||||||
serv_area_res ? serv_area_res_local_nonprim : NULL,
|
serv_area_res ? serv_area_res_local_nonprim : NULL,
|
||||||
wl_serv_area_res ? wl_serv_area_res_local_nonprim : NULL,
|
wl_serv_area_res ? wl_serv_area_res_local_nonprim : NULL,
|
||||||
|
@ -517,12 +572,17 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat
|
||||||
rfsp ? rfsp->valuedouble : 0,
|
rfsp ? rfsp->valuedouble : 0,
|
||||||
target_rfsp ? true : false,
|
target_rfsp ? true : false,
|
||||||
target_rfsp ? target_rfsp->valuedouble : 0,
|
target_rfsp ? target_rfsp->valuedouble : 0,
|
||||||
|
smf_sel_info && cJSON_IsNull(smf_sel_info) ? true : false,
|
||||||
smf_sel_info ? smf_sel_info_local_nonprim : NULL,
|
smf_sel_info ? smf_sel_info_local_nonprim : NULL,
|
||||||
ue_ambr ? ue_ambr_local_nonprim : NULL,
|
ue_ambr ? ue_ambr_local_nonprim : NULL,
|
||||||
ue_slice_mbrs ? ue_slice_mbrsList : NULL,
|
ue_slice_mbrs ? ue_slice_mbrsList : NULL,
|
||||||
|
pras && cJSON_IsNull(pras) ? true : false,
|
||||||
pras ? prasList : NULL,
|
pras ? prasList : NULL,
|
||||||
|
pcf_ue_info && cJSON_IsNull(pcf_ue_info) ? true : false,
|
||||||
pcf_ue_info ? pcf_ue_info_local_nonprim : NULL,
|
pcf_ue_info ? pcf_ue_info_local_nonprim : NULL,
|
||||||
|
match_pdus && cJSON_IsNull(match_pdus) ? true : false,
|
||||||
match_pdus ? match_pdusList : NULL,
|
match_pdus ? match_pdusList : NULL,
|
||||||
|
as_time_dis_param && cJSON_IsNull(as_time_dis_param) ? true : false,
|
||||||
as_time_dis_param ? as_time_dis_param_local_nonprim : NULL
|
as_time_dis_param ? as_time_dis_param_local_nonprim : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ extern "C" {
|
||||||
typedef struct OpenAPI_policy_update_s OpenAPI_policy_update_t;
|
typedef struct OpenAPI_policy_update_s OpenAPI_policy_update_t;
|
||||||
typedef struct OpenAPI_policy_update_s {
|
typedef struct OpenAPI_policy_update_s {
|
||||||
char *resource_uri;
|
char *resource_uri;
|
||||||
|
bool is_triggers_null;
|
||||||
OpenAPI_list_t *triggers;
|
OpenAPI_list_t *triggers;
|
||||||
struct OpenAPI_service_area_restriction_s *serv_area_res;
|
struct OpenAPI_service_area_restriction_s *serv_area_res;
|
||||||
struct OpenAPI_wireline_service_area_restriction_s *wl_serv_area_res;
|
struct OpenAPI_wireline_service_area_restriction_s *wl_serv_area_res;
|
||||||
|
@ -37,17 +38,23 @@ typedef struct OpenAPI_policy_update_s {
|
||||||
int rfsp;
|
int rfsp;
|
||||||
bool is_target_rfsp;
|
bool is_target_rfsp;
|
||||||
int target_rfsp;
|
int target_rfsp;
|
||||||
|
bool is_smf_sel_info_null;
|
||||||
struct OpenAPI_smf_selection_data_s *smf_sel_info;
|
struct OpenAPI_smf_selection_data_s *smf_sel_info;
|
||||||
struct OpenAPI_ambr_s *ue_ambr;
|
struct OpenAPI_ambr_s *ue_ambr;
|
||||||
OpenAPI_list_t *ue_slice_mbrs;
|
OpenAPI_list_t *ue_slice_mbrs;
|
||||||
|
bool is_pras_null;
|
||||||
OpenAPI_list_t* pras;
|
OpenAPI_list_t* pras;
|
||||||
|
bool is_pcf_ue_info_null;
|
||||||
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_info;
|
struct OpenAPI_pcf_ue_callback_info_s *pcf_ue_info;
|
||||||
|
bool is_match_pdus_null;
|
||||||
OpenAPI_list_t *match_pdus;
|
OpenAPI_list_t *match_pdus;
|
||||||
|
bool is_as_time_dis_param_null;
|
||||||
struct OpenAPI_as_time_distribution_param_s *as_time_dis_param;
|
struct OpenAPI_as_time_distribution_param_s *as_time_dis_param;
|
||||||
} OpenAPI_policy_update_t;
|
} OpenAPI_policy_update_t;
|
||||||
|
|
||||||
OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
||||||
char *resource_uri,
|
char *resource_uri,
|
||||||
|
bool is_triggers_null,
|
||||||
OpenAPI_list_t *triggers,
|
OpenAPI_list_t *triggers,
|
||||||
OpenAPI_service_area_restriction_t *serv_area_res,
|
OpenAPI_service_area_restriction_t *serv_area_res,
|
||||||
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
OpenAPI_wireline_service_area_restriction_t *wl_serv_area_res,
|
||||||
|
@ -55,12 +62,17 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_create(
|
||||||
int rfsp,
|
int rfsp,
|
||||||
bool is_target_rfsp,
|
bool is_target_rfsp,
|
||||||
int target_rfsp,
|
int target_rfsp,
|
||||||
|
bool is_smf_sel_info_null,
|
||||||
OpenAPI_smf_selection_data_t *smf_sel_info,
|
OpenAPI_smf_selection_data_t *smf_sel_info,
|
||||||
OpenAPI_ambr_t *ue_ambr,
|
OpenAPI_ambr_t *ue_ambr,
|
||||||
OpenAPI_list_t *ue_slice_mbrs,
|
OpenAPI_list_t *ue_slice_mbrs,
|
||||||
|
bool is_pras_null,
|
||||||
OpenAPI_list_t* pras,
|
OpenAPI_list_t* pras,
|
||||||
|
bool is_pcf_ue_info_null,
|
||||||
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
OpenAPI_pcf_ue_callback_info_t *pcf_ue_info,
|
||||||
|
bool is_match_pdus_null,
|
||||||
OpenAPI_list_t *match_pdus,
|
OpenAPI_list_t *match_pdus,
|
||||||
|
bool is_as_time_dis_param_null,
|
||||||
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
OpenAPI_as_time_distribution_param_t *as_time_dis_param
|
||||||
);
|
);
|
||||||
void OpenAPI_policy_update_free(OpenAPI_policy_update_t *policy_update);
|
void OpenAPI_policy_update_free(OpenAPI_policy_update_t *policy_update);
|
||||||
|
|
|
@ -5,28 +5,40 @@
|
||||||
#include "pp_data.h"
|
#include "pp_data.h"
|
||||||
|
|
||||||
OpenAPI_pp_data_t *OpenAPI_pp_data_create(
|
OpenAPI_pp_data_t *OpenAPI_pp_data_create(
|
||||||
|
bool is_communication_characteristics_null,
|
||||||
OpenAPI_communication_characteristics_t *communication_characteristics,
|
OpenAPI_communication_characteristics_t *communication_characteristics,
|
||||||
char *supported_features,
|
char *supported_features,
|
||||||
|
bool is_expected_ue_behaviour_parameters_null,
|
||||||
OpenAPI_expected_ue_behaviour_t *expected_ue_behaviour_parameters,
|
OpenAPI_expected_ue_behaviour_t *expected_ue_behaviour_parameters,
|
||||||
|
bool is_ec_restriction_null,
|
||||||
OpenAPI_ec_restriction_t *ec_restriction,
|
OpenAPI_ec_restriction_t *ec_restriction,
|
||||||
OpenAPI_acs_info_rm_t *acs_info,
|
OpenAPI_acs_info_rm_t *acs_info,
|
||||||
|
bool is_stn_sr_null,
|
||||||
char *stn_sr,
|
char *stn_sr,
|
||||||
|
bool is_lcs_privacy_null,
|
||||||
OpenAPI_lcs_privacy_t *lcs_privacy,
|
OpenAPI_lcs_privacy_t *lcs_privacy,
|
||||||
OpenAPI_sor_info_t *sor_info,
|
OpenAPI_sor_info_t *sor_info,
|
||||||
|
bool is__5mbs_authorization_info_null,
|
||||||
OpenAPI_model_5_mbs_authorization_info_t *_5mbs_authorization_info
|
OpenAPI_model_5_mbs_authorization_info_t *_5mbs_authorization_info
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
OpenAPI_pp_data_t *pp_data_local_var = ogs_malloc(sizeof(OpenAPI_pp_data_t));
|
OpenAPI_pp_data_t *pp_data_local_var = ogs_malloc(sizeof(OpenAPI_pp_data_t));
|
||||||
ogs_assert(pp_data_local_var);
|
ogs_assert(pp_data_local_var);
|
||||||
|
|
||||||
|
pp_data_local_var->is_communication_characteristics_null = is_communication_characteristics_null;
|
||||||
pp_data_local_var->communication_characteristics = communication_characteristics;
|
pp_data_local_var->communication_characteristics = communication_characteristics;
|
||||||
pp_data_local_var->supported_features = supported_features;
|
pp_data_local_var->supported_features = supported_features;
|
||||||
|
pp_data_local_var->is_expected_ue_behaviour_parameters_null = is_expected_ue_behaviour_parameters_null;
|
||||||
pp_data_local_var->expected_ue_behaviour_parameters = expected_ue_behaviour_parameters;
|
pp_data_local_var->expected_ue_behaviour_parameters = expected_ue_behaviour_parameters;
|
||||||
|
pp_data_local_var->is_ec_restriction_null = is_ec_restriction_null;
|
||||||
pp_data_local_var->ec_restriction = ec_restriction;
|
pp_data_local_var->ec_restriction = ec_restriction;
|
||||||
pp_data_local_var->acs_info = acs_info;
|
pp_data_local_var->acs_info = acs_info;
|
||||||
|
pp_data_local_var->is_stn_sr_null = is_stn_sr_null;
|
||||||
pp_data_local_var->stn_sr = stn_sr;
|
pp_data_local_var->stn_sr = stn_sr;
|
||||||
|
pp_data_local_var->is_lcs_privacy_null = is_lcs_privacy_null;
|
||||||
pp_data_local_var->lcs_privacy = lcs_privacy;
|
pp_data_local_var->lcs_privacy = lcs_privacy;
|
||||||
pp_data_local_var->sor_info = sor_info;
|
pp_data_local_var->sor_info = sor_info;
|
||||||
|
pp_data_local_var->is__5mbs_authorization_info_null = is__5mbs_authorization_info_null;
|
||||||
pp_data_local_var->_5mbs_authorization_info = _5mbs_authorization_info;
|
pp_data_local_var->_5mbs_authorization_info = _5mbs_authorization_info;
|
||||||
|
|
||||||
return pp_data_local_var;
|
return pp_data_local_var;
|
||||||
|
@ -100,6 +112,11 @@ cJSON *OpenAPI_pp_data_convertToJSON(OpenAPI_pp_data_t *pp_data)
|
||||||
ogs_error("OpenAPI_pp_data_convertToJSON() failed [communication_characteristics]");
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [communication_characteristics]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data->is_communication_characteristics_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "communicationCharacteristics") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [communication_characteristics]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data->supported_features) {
|
if (pp_data->supported_features) {
|
||||||
|
@ -120,6 +137,11 @@ cJSON *OpenAPI_pp_data_convertToJSON(OpenAPI_pp_data_t *pp_data)
|
||||||
ogs_error("OpenAPI_pp_data_convertToJSON() failed [expected_ue_behaviour_parameters]");
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [expected_ue_behaviour_parameters]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data->is_expected_ue_behaviour_parameters_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "expectedUeBehaviourParameters") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [expected_ue_behaviour_parameters]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data->ec_restriction) {
|
if (pp_data->ec_restriction) {
|
||||||
|
@ -133,6 +155,11 @@ cJSON *OpenAPI_pp_data_convertToJSON(OpenAPI_pp_data_t *pp_data)
|
||||||
ogs_error("OpenAPI_pp_data_convertToJSON() failed [ec_restriction]");
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [ec_restriction]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data->is_ec_restriction_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ecRestriction") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [ec_restriction]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data->acs_info) {
|
if (pp_data->acs_info) {
|
||||||
|
@ -153,6 +180,11 @@ cJSON *OpenAPI_pp_data_convertToJSON(OpenAPI_pp_data_t *pp_data)
|
||||||
ogs_error("OpenAPI_pp_data_convertToJSON() failed [stn_sr]");
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [stn_sr]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data->is_stn_sr_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "stnSr") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [stn_sr]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data->lcs_privacy) {
|
if (pp_data->lcs_privacy) {
|
||||||
|
@ -166,6 +198,11 @@ cJSON *OpenAPI_pp_data_convertToJSON(OpenAPI_pp_data_t *pp_data)
|
||||||
ogs_error("OpenAPI_pp_data_convertToJSON() failed [lcs_privacy]");
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [lcs_privacy]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data->is_lcs_privacy_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "lcsPrivacy") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [lcs_privacy]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data->sor_info) {
|
if (pp_data->sor_info) {
|
||||||
|
@ -192,6 +229,11 @@ cJSON *OpenAPI_pp_data_convertToJSON(OpenAPI_pp_data_t *pp_data)
|
||||||
ogs_error("OpenAPI_pp_data_convertToJSON() failed [_5mbs_authorization_info]");
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [_5mbs_authorization_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data->is__5mbs_authorization_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "5mbsAuthorizationInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_convertToJSON() failed [_5mbs_authorization_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -220,12 +262,14 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_parseFromJSON(cJSON *pp_dataJSON)
|
||||||
OpenAPI_model_5_mbs_authorization_info_t *_5mbs_authorization_info_local_nonprim = NULL;
|
OpenAPI_model_5_mbs_authorization_info_t *_5mbs_authorization_info_local_nonprim = NULL;
|
||||||
communication_characteristics = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "communicationCharacteristics");
|
communication_characteristics = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "communicationCharacteristics");
|
||||||
if (communication_characteristics) {
|
if (communication_characteristics) {
|
||||||
|
if (!cJSON_IsNull(communication_characteristics)) {
|
||||||
communication_characteristics_local_nonprim = OpenAPI_communication_characteristics_parseFromJSON(communication_characteristics);
|
communication_characteristics_local_nonprim = OpenAPI_communication_characteristics_parseFromJSON(communication_characteristics);
|
||||||
if (!communication_characteristics_local_nonprim) {
|
if (!communication_characteristics_local_nonprim) {
|
||||||
ogs_error("OpenAPI_communication_characteristics_parseFromJSON failed [communication_characteristics]");
|
ogs_error("OpenAPI_communication_characteristics_parseFromJSON failed [communication_characteristics]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
supported_features = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "supportedFeatures");
|
supported_features = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "supportedFeatures");
|
||||||
if (supported_features) {
|
if (supported_features) {
|
||||||
|
@ -237,21 +281,25 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_parseFromJSON(cJSON *pp_dataJSON)
|
||||||
|
|
||||||
expected_ue_behaviour_parameters = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "expectedUeBehaviourParameters");
|
expected_ue_behaviour_parameters = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "expectedUeBehaviourParameters");
|
||||||
if (expected_ue_behaviour_parameters) {
|
if (expected_ue_behaviour_parameters) {
|
||||||
|
if (!cJSON_IsNull(expected_ue_behaviour_parameters)) {
|
||||||
expected_ue_behaviour_parameters_local_nonprim = OpenAPI_expected_ue_behaviour_parseFromJSON(expected_ue_behaviour_parameters);
|
expected_ue_behaviour_parameters_local_nonprim = OpenAPI_expected_ue_behaviour_parseFromJSON(expected_ue_behaviour_parameters);
|
||||||
if (!expected_ue_behaviour_parameters_local_nonprim) {
|
if (!expected_ue_behaviour_parameters_local_nonprim) {
|
||||||
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON failed [expected_ue_behaviour_parameters]");
|
ogs_error("OpenAPI_expected_ue_behaviour_parseFromJSON failed [expected_ue_behaviour_parameters]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ec_restriction = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "ecRestriction");
|
ec_restriction = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "ecRestriction");
|
||||||
if (ec_restriction) {
|
if (ec_restriction) {
|
||||||
|
if (!cJSON_IsNull(ec_restriction)) {
|
||||||
ec_restriction_local_nonprim = OpenAPI_ec_restriction_parseFromJSON(ec_restriction);
|
ec_restriction_local_nonprim = OpenAPI_ec_restriction_parseFromJSON(ec_restriction);
|
||||||
if (!ec_restriction_local_nonprim) {
|
if (!ec_restriction_local_nonprim) {
|
||||||
ogs_error("OpenAPI_ec_restriction_parseFromJSON failed [ec_restriction]");
|
ogs_error("OpenAPI_ec_restriction_parseFromJSON failed [ec_restriction]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
acs_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "acsInfo");
|
acs_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "acsInfo");
|
||||||
if (acs_info) {
|
if (acs_info) {
|
||||||
|
@ -264,20 +312,24 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_parseFromJSON(cJSON *pp_dataJSON)
|
||||||
|
|
||||||
stn_sr = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "stnSr");
|
stn_sr = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "stnSr");
|
||||||
if (stn_sr) {
|
if (stn_sr) {
|
||||||
|
if (!cJSON_IsNull(stn_sr)) {
|
||||||
if (!cJSON_IsString(stn_sr) && !cJSON_IsNull(stn_sr)) {
|
if (!cJSON_IsString(stn_sr) && !cJSON_IsNull(stn_sr)) {
|
||||||
ogs_error("OpenAPI_pp_data_parseFromJSON() failed [stn_sr]");
|
ogs_error("OpenAPI_pp_data_parseFromJSON() failed [stn_sr]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
lcs_privacy = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "lcsPrivacy");
|
lcs_privacy = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "lcsPrivacy");
|
||||||
if (lcs_privacy) {
|
if (lcs_privacy) {
|
||||||
|
if (!cJSON_IsNull(lcs_privacy)) {
|
||||||
lcs_privacy_local_nonprim = OpenAPI_lcs_privacy_parseFromJSON(lcs_privacy);
|
lcs_privacy_local_nonprim = OpenAPI_lcs_privacy_parseFromJSON(lcs_privacy);
|
||||||
if (!lcs_privacy_local_nonprim) {
|
if (!lcs_privacy_local_nonprim) {
|
||||||
ogs_error("OpenAPI_lcs_privacy_parseFromJSON failed [lcs_privacy]");
|
ogs_error("OpenAPI_lcs_privacy_parseFromJSON failed [lcs_privacy]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sor_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "sorInfo");
|
sor_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "sorInfo");
|
||||||
if (sor_info) {
|
if (sor_info) {
|
||||||
|
@ -290,22 +342,30 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_parseFromJSON(cJSON *pp_dataJSON)
|
||||||
|
|
||||||
_5mbs_authorization_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "5mbsAuthorizationInfo");
|
_5mbs_authorization_info = cJSON_GetObjectItemCaseSensitive(pp_dataJSON, "5mbsAuthorizationInfo");
|
||||||
if (_5mbs_authorization_info) {
|
if (_5mbs_authorization_info) {
|
||||||
|
if (!cJSON_IsNull(_5mbs_authorization_info)) {
|
||||||
_5mbs_authorization_info_local_nonprim = OpenAPI_model_5_mbs_authorization_info_parseFromJSON(_5mbs_authorization_info);
|
_5mbs_authorization_info_local_nonprim = OpenAPI_model_5_mbs_authorization_info_parseFromJSON(_5mbs_authorization_info);
|
||||||
if (!_5mbs_authorization_info_local_nonprim) {
|
if (!_5mbs_authorization_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_model_5_mbs_authorization_info_parseFromJSON failed [_5mbs_authorization_info]");
|
ogs_error("OpenAPI_model_5_mbs_authorization_info_parseFromJSON failed [_5mbs_authorization_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_data_local_var = OpenAPI_pp_data_create (
|
pp_data_local_var = OpenAPI_pp_data_create (
|
||||||
|
communication_characteristics && cJSON_IsNull(communication_characteristics) ? true : false,
|
||||||
communication_characteristics ? communication_characteristics_local_nonprim : NULL,
|
communication_characteristics ? communication_characteristics_local_nonprim : NULL,
|
||||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
||||||
|
expected_ue_behaviour_parameters && cJSON_IsNull(expected_ue_behaviour_parameters) ? true : false,
|
||||||
expected_ue_behaviour_parameters ? expected_ue_behaviour_parameters_local_nonprim : NULL,
|
expected_ue_behaviour_parameters ? expected_ue_behaviour_parameters_local_nonprim : NULL,
|
||||||
|
ec_restriction && cJSON_IsNull(ec_restriction) ? true : false,
|
||||||
ec_restriction ? ec_restriction_local_nonprim : NULL,
|
ec_restriction ? ec_restriction_local_nonprim : NULL,
|
||||||
acs_info ? acs_info_local_nonprim : NULL,
|
acs_info ? acs_info_local_nonprim : NULL,
|
||||||
|
stn_sr && cJSON_IsNull(stn_sr) ? true : false,
|
||||||
stn_sr && !cJSON_IsNull(stn_sr) ? ogs_strdup(stn_sr->valuestring) : NULL,
|
stn_sr && !cJSON_IsNull(stn_sr) ? ogs_strdup(stn_sr->valuestring) : NULL,
|
||||||
|
lcs_privacy && cJSON_IsNull(lcs_privacy) ? true : false,
|
||||||
lcs_privacy ? lcs_privacy_local_nonprim : NULL,
|
lcs_privacy ? lcs_privacy_local_nonprim : NULL,
|
||||||
sor_info ? sor_info_local_nonprim : NULL,
|
sor_info ? sor_info_local_nonprim : NULL,
|
||||||
|
_5mbs_authorization_info && cJSON_IsNull(_5mbs_authorization_info) ? true : false,
|
||||||
_5mbs_authorization_info ? _5mbs_authorization_info_local_nonprim : NULL
|
_5mbs_authorization_info ? _5mbs_authorization_info_local_nonprim : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -26,26 +26,38 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_pp_data_s OpenAPI_pp_data_t;
|
typedef struct OpenAPI_pp_data_s OpenAPI_pp_data_t;
|
||||||
typedef struct OpenAPI_pp_data_s {
|
typedef struct OpenAPI_pp_data_s {
|
||||||
|
bool is_communication_characteristics_null;
|
||||||
struct OpenAPI_communication_characteristics_s *communication_characteristics;
|
struct OpenAPI_communication_characteristics_s *communication_characteristics;
|
||||||
char *supported_features;
|
char *supported_features;
|
||||||
|
bool is_expected_ue_behaviour_parameters_null;
|
||||||
struct OpenAPI_expected_ue_behaviour_s *expected_ue_behaviour_parameters;
|
struct OpenAPI_expected_ue_behaviour_s *expected_ue_behaviour_parameters;
|
||||||
|
bool is_ec_restriction_null;
|
||||||
struct OpenAPI_ec_restriction_s *ec_restriction;
|
struct OpenAPI_ec_restriction_s *ec_restriction;
|
||||||
struct OpenAPI_acs_info_rm_s *acs_info;
|
struct OpenAPI_acs_info_rm_s *acs_info;
|
||||||
|
bool is_stn_sr_null;
|
||||||
char *stn_sr;
|
char *stn_sr;
|
||||||
|
bool is_lcs_privacy_null;
|
||||||
struct OpenAPI_lcs_privacy_s *lcs_privacy;
|
struct OpenAPI_lcs_privacy_s *lcs_privacy;
|
||||||
struct OpenAPI_sor_info_s *sor_info;
|
struct OpenAPI_sor_info_s *sor_info;
|
||||||
|
bool is__5mbs_authorization_info_null;
|
||||||
struct OpenAPI_model_5_mbs_authorization_info_s *_5mbs_authorization_info;
|
struct OpenAPI_model_5_mbs_authorization_info_s *_5mbs_authorization_info;
|
||||||
} OpenAPI_pp_data_t;
|
} OpenAPI_pp_data_t;
|
||||||
|
|
||||||
OpenAPI_pp_data_t *OpenAPI_pp_data_create(
|
OpenAPI_pp_data_t *OpenAPI_pp_data_create(
|
||||||
|
bool is_communication_characteristics_null,
|
||||||
OpenAPI_communication_characteristics_t *communication_characteristics,
|
OpenAPI_communication_characteristics_t *communication_characteristics,
|
||||||
char *supported_features,
|
char *supported_features,
|
||||||
|
bool is_expected_ue_behaviour_parameters_null,
|
||||||
OpenAPI_expected_ue_behaviour_t *expected_ue_behaviour_parameters,
|
OpenAPI_expected_ue_behaviour_t *expected_ue_behaviour_parameters,
|
||||||
|
bool is_ec_restriction_null,
|
||||||
OpenAPI_ec_restriction_t *ec_restriction,
|
OpenAPI_ec_restriction_t *ec_restriction,
|
||||||
OpenAPI_acs_info_rm_t *acs_info,
|
OpenAPI_acs_info_rm_t *acs_info,
|
||||||
|
bool is_stn_sr_null,
|
||||||
char *stn_sr,
|
char *stn_sr,
|
||||||
|
bool is_lcs_privacy_null,
|
||||||
OpenAPI_lcs_privacy_t *lcs_privacy,
|
OpenAPI_lcs_privacy_t *lcs_privacy,
|
||||||
OpenAPI_sor_info_t *sor_info,
|
OpenAPI_sor_info_t *sor_info,
|
||||||
|
bool is__5mbs_authorization_info_null,
|
||||||
OpenAPI_model_5_mbs_authorization_info_t *_5mbs_authorization_info
|
OpenAPI_model_5_mbs_authorization_info_t *_5mbs_authorization_info
|
||||||
);
|
);
|
||||||
void OpenAPI_pp_data_free(OpenAPI_pp_data_t *pp_data);
|
void OpenAPI_pp_data_free(OpenAPI_pp_data_t *pp_data);
|
||||||
|
|
|
@ -5,28 +5,34 @@
|
||||||
#include "pp_data_entry.h"
|
#include "pp_data_entry.h"
|
||||||
|
|
||||||
OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_create(
|
OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_create(
|
||||||
|
bool is_communication_characteristics_null,
|
||||||
OpenAPI_communication_characteristics_af_t *communication_characteristics,
|
OpenAPI_communication_characteristics_af_t *communication_characteristics,
|
||||||
bool is_reference_id,
|
bool is_reference_id,
|
||||||
int reference_id,
|
int reference_id,
|
||||||
char *validity_time,
|
char *validity_time,
|
||||||
char *mtc_provider_information,
|
char *mtc_provider_information,
|
||||||
char *supported_features,
|
char *supported_features,
|
||||||
|
bool is_ecs_addr_config_info_null,
|
||||||
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
||||||
|
bool is_ec_restriction_null,
|
||||||
OpenAPI_ec_restriction_1_t *ec_restriction
|
OpenAPI_ec_restriction_1_t *ec_restriction
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
OpenAPI_pp_data_entry_t *pp_data_entry_local_var = ogs_malloc(sizeof(OpenAPI_pp_data_entry_t));
|
OpenAPI_pp_data_entry_t *pp_data_entry_local_var = ogs_malloc(sizeof(OpenAPI_pp_data_entry_t));
|
||||||
ogs_assert(pp_data_entry_local_var);
|
ogs_assert(pp_data_entry_local_var);
|
||||||
|
|
||||||
|
pp_data_entry_local_var->is_communication_characteristics_null = is_communication_characteristics_null;
|
||||||
pp_data_entry_local_var->communication_characteristics = communication_characteristics;
|
pp_data_entry_local_var->communication_characteristics = communication_characteristics;
|
||||||
pp_data_entry_local_var->is_reference_id = is_reference_id;
|
pp_data_entry_local_var->is_reference_id = is_reference_id;
|
||||||
pp_data_entry_local_var->reference_id = reference_id;
|
pp_data_entry_local_var->reference_id = reference_id;
|
||||||
pp_data_entry_local_var->validity_time = validity_time;
|
pp_data_entry_local_var->validity_time = validity_time;
|
||||||
pp_data_entry_local_var->mtc_provider_information = mtc_provider_information;
|
pp_data_entry_local_var->mtc_provider_information = mtc_provider_information;
|
||||||
pp_data_entry_local_var->supported_features = supported_features;
|
pp_data_entry_local_var->supported_features = supported_features;
|
||||||
|
pp_data_entry_local_var->is_ecs_addr_config_info_null = is_ecs_addr_config_info_null;
|
||||||
pp_data_entry_local_var->ecs_addr_config_info = ecs_addr_config_info;
|
pp_data_entry_local_var->ecs_addr_config_info = ecs_addr_config_info;
|
||||||
pp_data_entry_local_var->additional_ecs_addr_config_infos = additional_ecs_addr_config_infos;
|
pp_data_entry_local_var->additional_ecs_addr_config_infos = additional_ecs_addr_config_infos;
|
||||||
|
pp_data_entry_local_var->is_ec_restriction_null = is_ec_restriction_null;
|
||||||
pp_data_entry_local_var->ec_restriction = ec_restriction;
|
pp_data_entry_local_var->ec_restriction = ec_restriction;
|
||||||
|
|
||||||
return pp_data_entry_local_var;
|
return pp_data_entry_local_var;
|
||||||
|
@ -95,6 +101,11 @@ cJSON *OpenAPI_pp_data_entry_convertToJSON(OpenAPI_pp_data_entry_t *pp_data_entr
|
||||||
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [communication_characteristics]");
|
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [communication_characteristics]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data_entry->is_communication_characteristics_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "communicationCharacteristics") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [communication_characteristics]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data_entry->is_reference_id) {
|
if (pp_data_entry->is_reference_id) {
|
||||||
|
@ -136,6 +147,11 @@ cJSON *OpenAPI_pp_data_entry_convertToJSON(OpenAPI_pp_data_entry_t *pp_data_entr
|
||||||
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [ecs_addr_config_info]");
|
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [ecs_addr_config_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data_entry->is_ecs_addr_config_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ecsAddrConfigInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [ecs_addr_config_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pp_data_entry->additional_ecs_addr_config_infos) {
|
if (pp_data_entry->additional_ecs_addr_config_infos) {
|
||||||
|
@ -165,6 +181,11 @@ cJSON *OpenAPI_pp_data_entry_convertToJSON(OpenAPI_pp_data_entry_t *pp_data_entr
|
||||||
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [ec_restriction]");
|
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [ec_restriction]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pp_data_entry->is_ec_restriction_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "ecRestriction") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pp_data_entry_convertToJSON() failed [ec_restriction]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -189,12 +210,14 @@ OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_parseFromJSON(cJSON *pp_data_entr
|
||||||
OpenAPI_ec_restriction_1_t *ec_restriction_local_nonprim = NULL;
|
OpenAPI_ec_restriction_1_t *ec_restriction_local_nonprim = NULL;
|
||||||
communication_characteristics = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "communicationCharacteristics");
|
communication_characteristics = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "communicationCharacteristics");
|
||||||
if (communication_characteristics) {
|
if (communication_characteristics) {
|
||||||
|
if (!cJSON_IsNull(communication_characteristics)) {
|
||||||
communication_characteristics_local_nonprim = OpenAPI_communication_characteristics_af_parseFromJSON(communication_characteristics);
|
communication_characteristics_local_nonprim = OpenAPI_communication_characteristics_af_parseFromJSON(communication_characteristics);
|
||||||
if (!communication_characteristics_local_nonprim) {
|
if (!communication_characteristics_local_nonprim) {
|
||||||
ogs_error("OpenAPI_communication_characteristics_af_parseFromJSON failed [communication_characteristics]");
|
ogs_error("OpenAPI_communication_characteristics_af_parseFromJSON failed [communication_characteristics]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
reference_id = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "referenceId");
|
reference_id = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "referenceId");
|
||||||
if (reference_id) {
|
if (reference_id) {
|
||||||
|
@ -230,12 +253,14 @@ OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_parseFromJSON(cJSON *pp_data_entr
|
||||||
|
|
||||||
ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "ecsAddrConfigInfo");
|
ecs_addr_config_info = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "ecsAddrConfigInfo");
|
||||||
if (ecs_addr_config_info) {
|
if (ecs_addr_config_info) {
|
||||||
|
if (!cJSON_IsNull(ecs_addr_config_info)) {
|
||||||
ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_1_parseFromJSON(ecs_addr_config_info);
|
ecs_addr_config_info_local_nonprim = OpenAPI_ecs_addr_config_info_1_parseFromJSON(ecs_addr_config_info);
|
||||||
if (!ecs_addr_config_info_local_nonprim) {
|
if (!ecs_addr_config_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_ecs_addr_config_info_1_parseFromJSON failed [ecs_addr_config_info]");
|
ogs_error("OpenAPI_ecs_addr_config_info_1_parseFromJSON failed [ecs_addr_config_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "additionalEcsAddrConfigInfos");
|
additional_ecs_addr_config_infos = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "additionalEcsAddrConfigInfos");
|
||||||
if (additional_ecs_addr_config_infos) {
|
if (additional_ecs_addr_config_infos) {
|
||||||
|
@ -263,22 +288,27 @@ OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_parseFromJSON(cJSON *pp_data_entr
|
||||||
|
|
||||||
ec_restriction = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "ecRestriction");
|
ec_restriction = cJSON_GetObjectItemCaseSensitive(pp_data_entryJSON, "ecRestriction");
|
||||||
if (ec_restriction) {
|
if (ec_restriction) {
|
||||||
|
if (!cJSON_IsNull(ec_restriction)) {
|
||||||
ec_restriction_local_nonprim = OpenAPI_ec_restriction_1_parseFromJSON(ec_restriction);
|
ec_restriction_local_nonprim = OpenAPI_ec_restriction_1_parseFromJSON(ec_restriction);
|
||||||
if (!ec_restriction_local_nonprim) {
|
if (!ec_restriction_local_nonprim) {
|
||||||
ogs_error("OpenAPI_ec_restriction_1_parseFromJSON failed [ec_restriction]");
|
ogs_error("OpenAPI_ec_restriction_1_parseFromJSON failed [ec_restriction]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pp_data_entry_local_var = OpenAPI_pp_data_entry_create (
|
pp_data_entry_local_var = OpenAPI_pp_data_entry_create (
|
||||||
|
communication_characteristics && cJSON_IsNull(communication_characteristics) ? true : false,
|
||||||
communication_characteristics ? communication_characteristics_local_nonprim : NULL,
|
communication_characteristics ? communication_characteristics_local_nonprim : NULL,
|
||||||
reference_id ? true : false,
|
reference_id ? true : false,
|
||||||
reference_id ? reference_id->valuedouble : 0,
|
reference_id ? reference_id->valuedouble : 0,
|
||||||
validity_time && !cJSON_IsNull(validity_time) ? ogs_strdup(validity_time->valuestring) : NULL,
|
validity_time && !cJSON_IsNull(validity_time) ? ogs_strdup(validity_time->valuestring) : NULL,
|
||||||
mtc_provider_information && !cJSON_IsNull(mtc_provider_information) ? ogs_strdup(mtc_provider_information->valuestring) : NULL,
|
mtc_provider_information && !cJSON_IsNull(mtc_provider_information) ? ogs_strdup(mtc_provider_information->valuestring) : NULL,
|
||||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
||||||
|
ecs_addr_config_info && cJSON_IsNull(ecs_addr_config_info) ? true : false,
|
||||||
ecs_addr_config_info ? ecs_addr_config_info_local_nonprim : NULL,
|
ecs_addr_config_info ? ecs_addr_config_info_local_nonprim : NULL,
|
||||||
additional_ecs_addr_config_infos ? additional_ecs_addr_config_infosList : NULL,
|
additional_ecs_addr_config_infos ? additional_ecs_addr_config_infosList : NULL,
|
||||||
|
ec_restriction && cJSON_IsNull(ec_restriction) ? true : false,
|
||||||
ec_restriction ? ec_restriction_local_nonprim : NULL
|
ec_restriction ? ec_restriction_local_nonprim : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -22,26 +22,32 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_pp_data_entry_s OpenAPI_pp_data_entry_t;
|
typedef struct OpenAPI_pp_data_entry_s OpenAPI_pp_data_entry_t;
|
||||||
typedef struct OpenAPI_pp_data_entry_s {
|
typedef struct OpenAPI_pp_data_entry_s {
|
||||||
|
bool is_communication_characteristics_null;
|
||||||
struct OpenAPI_communication_characteristics_af_s *communication_characteristics;
|
struct OpenAPI_communication_characteristics_af_s *communication_characteristics;
|
||||||
bool is_reference_id;
|
bool is_reference_id;
|
||||||
int reference_id;
|
int reference_id;
|
||||||
char *validity_time;
|
char *validity_time;
|
||||||
char *mtc_provider_information;
|
char *mtc_provider_information;
|
||||||
char *supported_features;
|
char *supported_features;
|
||||||
|
bool is_ecs_addr_config_info_null;
|
||||||
struct OpenAPI_ecs_addr_config_info_1_s *ecs_addr_config_info;
|
struct OpenAPI_ecs_addr_config_info_1_s *ecs_addr_config_info;
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos;
|
OpenAPI_list_t *additional_ecs_addr_config_infos;
|
||||||
|
bool is_ec_restriction_null;
|
||||||
struct OpenAPI_ec_restriction_1_s *ec_restriction;
|
struct OpenAPI_ec_restriction_1_s *ec_restriction;
|
||||||
} OpenAPI_pp_data_entry_t;
|
} OpenAPI_pp_data_entry_t;
|
||||||
|
|
||||||
OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_create(
|
OpenAPI_pp_data_entry_t *OpenAPI_pp_data_entry_create(
|
||||||
|
bool is_communication_characteristics_null,
|
||||||
OpenAPI_communication_characteristics_af_t *communication_characteristics,
|
OpenAPI_communication_characteristics_af_t *communication_characteristics,
|
||||||
bool is_reference_id,
|
bool is_reference_id,
|
||||||
int reference_id,
|
int reference_id,
|
||||||
char *validity_time,
|
char *validity_time,
|
||||||
char *mtc_provider_information,
|
char *mtc_provider_information,
|
||||||
char *supported_features,
|
char *supported_features,
|
||||||
|
bool is_ecs_addr_config_info_null,
|
||||||
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
OpenAPI_ecs_addr_config_info_1_t *ecs_addr_config_info,
|
||||||
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
OpenAPI_list_t *additional_ecs_addr_config_infos,
|
||||||
|
bool is_ec_restriction_null,
|
||||||
OpenAPI_ec_restriction_1_t *ec_restriction
|
OpenAPI_ec_restriction_1_t *ec_restriction
|
||||||
);
|
);
|
||||||
void OpenAPI_pp_data_entry_free(OpenAPI_pp_data_entry_t *pp_data_entry);
|
void OpenAPI_pp_data_entry_free(OpenAPI_pp_data_entry_t *pp_data_entry);
|
||||||
|
|
|
@ -8,6 +8,7 @@ OpenAPI_pro_se_authentication_info_t *OpenAPI_pro_se_authentication_info_create(
|
||||||
char *supi_or_suci,
|
char *supi_or_suci,
|
||||||
char *_5g_pruk_id,
|
char *_5g_pruk_id,
|
||||||
int relay_service_code,
|
int relay_service_code,
|
||||||
|
bool is_nonce1_null,
|
||||||
char *nonce1,
|
char *nonce1,
|
||||||
char *supported_features
|
char *supported_features
|
||||||
)
|
)
|
||||||
|
@ -18,6 +19,7 @@ OpenAPI_pro_se_authentication_info_t *OpenAPI_pro_se_authentication_info_create(
|
||||||
pro_se_authentication_info_local_var->supi_or_suci = supi_or_suci;
|
pro_se_authentication_info_local_var->supi_or_suci = supi_or_suci;
|
||||||
pro_se_authentication_info_local_var->_5g_pruk_id = _5g_pruk_id;
|
pro_se_authentication_info_local_var->_5g_pruk_id = _5g_pruk_id;
|
||||||
pro_se_authentication_info_local_var->relay_service_code = relay_service_code;
|
pro_se_authentication_info_local_var->relay_service_code = relay_service_code;
|
||||||
|
pro_se_authentication_info_local_var->is_nonce1_null = is_nonce1_null;
|
||||||
pro_se_authentication_info_local_var->nonce1 = nonce1;
|
pro_se_authentication_info_local_var->nonce1 = nonce1;
|
||||||
pro_se_authentication_info_local_var->supported_features = supported_features;
|
pro_se_authentication_info_local_var->supported_features = supported_features;
|
||||||
|
|
||||||
|
@ -158,6 +160,7 @@ OpenAPI_pro_se_authentication_info_t *OpenAPI_pro_se_authentication_info_parseFr
|
||||||
_5g_pruk_id && !cJSON_IsNull(_5g_pruk_id) ? ogs_strdup(_5g_pruk_id->valuestring) : NULL,
|
_5g_pruk_id && !cJSON_IsNull(_5g_pruk_id) ? ogs_strdup(_5g_pruk_id->valuestring) : NULL,
|
||||||
|
|
||||||
relay_service_code->valuedouble,
|
relay_service_code->valuedouble,
|
||||||
|
nonce1 && cJSON_IsNull(nonce1) ? true : false,
|
||||||
ogs_strdup(nonce1->valuestring),
|
ogs_strdup(nonce1->valuestring),
|
||||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
|
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
|
||||||
);
|
);
|
||||||
|
|
|
@ -22,6 +22,7 @@ typedef struct OpenAPI_pro_se_authentication_info_s {
|
||||||
char *supi_or_suci;
|
char *supi_or_suci;
|
||||||
char *_5g_pruk_id;
|
char *_5g_pruk_id;
|
||||||
int relay_service_code;
|
int relay_service_code;
|
||||||
|
bool is_nonce1_null;
|
||||||
char *nonce1;
|
char *nonce1;
|
||||||
char *supported_features;
|
char *supported_features;
|
||||||
} OpenAPI_pro_se_authentication_info_t;
|
} OpenAPI_pro_se_authentication_info_t;
|
||||||
|
@ -30,6 +31,7 @@ OpenAPI_pro_se_authentication_info_t *OpenAPI_pro_se_authentication_info_create(
|
||||||
char *supi_or_suci,
|
char *supi_or_suci,
|
||||||
char *_5g_pruk_id,
|
char *_5g_pruk_id,
|
||||||
int relay_service_code,
|
int relay_service_code,
|
||||||
|
bool is_nonce1_null,
|
||||||
char *nonce1,
|
char *nonce1,
|
||||||
char *supported_features
|
char *supported_features
|
||||||
);
|
);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_create(
|
OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_create(
|
||||||
char *knr_pro_se,
|
char *knr_pro_se,
|
||||||
|
bool is_nonce2_null,
|
||||||
char *nonce2,
|
char *nonce2,
|
||||||
char *supported_features
|
char *supported_features
|
||||||
)
|
)
|
||||||
|
@ -14,6 +15,7 @@ OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_cre
|
||||||
ogs_assert(pro_se_authentication_result_local_var);
|
ogs_assert(pro_se_authentication_result_local_var);
|
||||||
|
|
||||||
pro_se_authentication_result_local_var->knr_pro_se = knr_pro_se;
|
pro_se_authentication_result_local_var->knr_pro_se = knr_pro_se;
|
||||||
|
pro_se_authentication_result_local_var->is_nonce2_null = is_nonce2_null;
|
||||||
pro_se_authentication_result_local_var->nonce2 = nonce2;
|
pro_se_authentication_result_local_var->nonce2 = nonce2;
|
||||||
pro_se_authentication_result_local_var->supported_features = supported_features;
|
pro_se_authentication_result_local_var->supported_features = supported_features;
|
||||||
|
|
||||||
|
@ -65,6 +67,11 @@ cJSON *OpenAPI_pro_se_authentication_result_convertToJSON(OpenAPI_pro_se_authent
|
||||||
ogs_error("OpenAPI_pro_se_authentication_result_convertToJSON() failed [nonce2]");
|
ogs_error("OpenAPI_pro_se_authentication_result_convertToJSON() failed [nonce2]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pro_se_authentication_result->is_nonce2_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "nonce2") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pro_se_authentication_result_convertToJSON() failed [nonce2]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pro_se_authentication_result->supported_features) {
|
if (pro_se_authentication_result->supported_features) {
|
||||||
|
@ -95,11 +102,13 @@ OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_par
|
||||||
|
|
||||||
nonce2 = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_resultJSON, "nonce2");
|
nonce2 = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_resultJSON, "nonce2");
|
||||||
if (nonce2) {
|
if (nonce2) {
|
||||||
|
if (!cJSON_IsNull(nonce2)) {
|
||||||
if (!cJSON_IsString(nonce2) && !cJSON_IsNull(nonce2)) {
|
if (!cJSON_IsString(nonce2) && !cJSON_IsNull(nonce2)) {
|
||||||
ogs_error("OpenAPI_pro_se_authentication_result_parseFromJSON() failed [nonce2]");
|
ogs_error("OpenAPI_pro_se_authentication_result_parseFromJSON() failed [nonce2]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
supported_features = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_resultJSON, "supportedFeatures");
|
supported_features = cJSON_GetObjectItemCaseSensitive(pro_se_authentication_resultJSON, "supportedFeatures");
|
||||||
if (supported_features) {
|
if (supported_features) {
|
||||||
|
@ -111,6 +120,7 @@ OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_par
|
||||||
|
|
||||||
pro_se_authentication_result_local_var = OpenAPI_pro_se_authentication_result_create (
|
pro_se_authentication_result_local_var = OpenAPI_pro_se_authentication_result_create (
|
||||||
knr_pro_se && !cJSON_IsNull(knr_pro_se) ? ogs_strdup(knr_pro_se->valuestring) : NULL,
|
knr_pro_se && !cJSON_IsNull(knr_pro_se) ? ogs_strdup(knr_pro_se->valuestring) : NULL,
|
||||||
|
nonce2 && cJSON_IsNull(nonce2) ? true : false,
|
||||||
nonce2 && !cJSON_IsNull(nonce2) ? ogs_strdup(nonce2->valuestring) : NULL,
|
nonce2 && !cJSON_IsNull(nonce2) ? ogs_strdup(nonce2->valuestring) : NULL,
|
||||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
|
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL
|
||||||
);
|
);
|
||||||
|
|
|
@ -20,12 +20,14 @@ extern "C" {
|
||||||
typedef struct OpenAPI_pro_se_authentication_result_s OpenAPI_pro_se_authentication_result_t;
|
typedef struct OpenAPI_pro_se_authentication_result_s OpenAPI_pro_se_authentication_result_t;
|
||||||
typedef struct OpenAPI_pro_se_authentication_result_s {
|
typedef struct OpenAPI_pro_se_authentication_result_s {
|
||||||
char *knr_pro_se;
|
char *knr_pro_se;
|
||||||
|
bool is_nonce2_null;
|
||||||
char *nonce2;
|
char *nonce2;
|
||||||
char *supported_features;
|
char *supported_features;
|
||||||
} OpenAPI_pro_se_authentication_result_t;
|
} OpenAPI_pro_se_authentication_result_t;
|
||||||
|
|
||||||
OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_create(
|
OpenAPI_pro_se_authentication_result_t *OpenAPI_pro_se_authentication_result_create(
|
||||||
char *knr_pro_se,
|
char *knr_pro_se,
|
||||||
|
bool is_nonce2_null,
|
||||||
char *nonce2,
|
char *nonce2,
|
||||||
char *supported_features
|
char *supported_features
|
||||||
);
|
);
|
||||||
|
|
|
@ -5,11 +5,13 @@
|
||||||
#include "pro_se_eap_session.h"
|
#include "pro_se_eap_session.h"
|
||||||
|
|
||||||
OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_create(
|
OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_create(
|
||||||
|
bool is_eap_payload_null,
|
||||||
char *eap_payload,
|
char *eap_payload,
|
||||||
char *knr_pro_se,
|
char *knr_pro_se,
|
||||||
OpenAPI_list_t* _links,
|
OpenAPI_list_t* _links,
|
||||||
OpenAPI_auth_result_e auth_result,
|
OpenAPI_auth_result_e auth_result,
|
||||||
char *supported_features,
|
char *supported_features,
|
||||||
|
bool is_nonce2_null,
|
||||||
char *nonce2,
|
char *nonce2,
|
||||||
char *_5g_pruk_id
|
char *_5g_pruk_id
|
||||||
)
|
)
|
||||||
|
@ -17,11 +19,13 @@ OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_create(
|
||||||
OpenAPI_pro_se_eap_session_t *pro_se_eap_session_local_var = ogs_malloc(sizeof(OpenAPI_pro_se_eap_session_t));
|
OpenAPI_pro_se_eap_session_t *pro_se_eap_session_local_var = ogs_malloc(sizeof(OpenAPI_pro_se_eap_session_t));
|
||||||
ogs_assert(pro_se_eap_session_local_var);
|
ogs_assert(pro_se_eap_session_local_var);
|
||||||
|
|
||||||
|
pro_se_eap_session_local_var->is_eap_payload_null = is_eap_payload_null;
|
||||||
pro_se_eap_session_local_var->eap_payload = eap_payload;
|
pro_se_eap_session_local_var->eap_payload = eap_payload;
|
||||||
pro_se_eap_session_local_var->knr_pro_se = knr_pro_se;
|
pro_se_eap_session_local_var->knr_pro_se = knr_pro_se;
|
||||||
pro_se_eap_session_local_var->_links = _links;
|
pro_se_eap_session_local_var->_links = _links;
|
||||||
pro_se_eap_session_local_var->auth_result = auth_result;
|
pro_se_eap_session_local_var->auth_result = auth_result;
|
||||||
pro_se_eap_session_local_var->supported_features = supported_features;
|
pro_se_eap_session_local_var->supported_features = supported_features;
|
||||||
|
pro_se_eap_session_local_var->is_nonce2_null = is_nonce2_null;
|
||||||
pro_se_eap_session_local_var->nonce2 = nonce2;
|
pro_se_eap_session_local_var->nonce2 = nonce2;
|
||||||
pro_se_eap_session_local_var->_5g_pruk_id = _5g_pruk_id;
|
pro_se_eap_session_local_var->_5g_pruk_id = _5g_pruk_id;
|
||||||
|
|
||||||
|
@ -144,6 +148,11 @@ cJSON *OpenAPI_pro_se_eap_session_convertToJSON(OpenAPI_pro_se_eap_session_t *pr
|
||||||
ogs_error("OpenAPI_pro_se_eap_session_convertToJSON() failed [nonce2]");
|
ogs_error("OpenAPI_pro_se_eap_session_convertToJSON() failed [nonce2]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (pro_se_eap_session->is_nonce2_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "nonce2") == NULL) {
|
||||||
|
ogs_error("OpenAPI_pro_se_eap_session_convertToJSON() failed [nonce2]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pro_se_eap_session->_5g_pruk_id) {
|
if (pro_se_eap_session->_5g_pruk_id) {
|
||||||
|
@ -233,11 +242,13 @@ OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_parseFromJSON(cJSON *pr
|
||||||
|
|
||||||
nonce2 = cJSON_GetObjectItemCaseSensitive(pro_se_eap_sessionJSON, "nonce2");
|
nonce2 = cJSON_GetObjectItemCaseSensitive(pro_se_eap_sessionJSON, "nonce2");
|
||||||
if (nonce2) {
|
if (nonce2) {
|
||||||
|
if (!cJSON_IsNull(nonce2)) {
|
||||||
if (!cJSON_IsString(nonce2) && !cJSON_IsNull(nonce2)) {
|
if (!cJSON_IsString(nonce2) && !cJSON_IsNull(nonce2)) {
|
||||||
ogs_error("OpenAPI_pro_se_eap_session_parseFromJSON() failed [nonce2]");
|
ogs_error("OpenAPI_pro_se_eap_session_parseFromJSON() failed [nonce2]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
_5g_pruk_id = cJSON_GetObjectItemCaseSensitive(pro_se_eap_sessionJSON, "5gPrukId");
|
_5g_pruk_id = cJSON_GetObjectItemCaseSensitive(pro_se_eap_sessionJSON, "5gPrukId");
|
||||||
if (_5g_pruk_id) {
|
if (_5g_pruk_id) {
|
||||||
|
@ -248,11 +259,13 @@ OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_parseFromJSON(cJSON *pr
|
||||||
}
|
}
|
||||||
|
|
||||||
pro_se_eap_session_local_var = OpenAPI_pro_se_eap_session_create (
|
pro_se_eap_session_local_var = OpenAPI_pro_se_eap_session_create (
|
||||||
|
eap_payload && cJSON_IsNull(eap_payload) ? true : false,
|
||||||
ogs_strdup(eap_payload->valuestring),
|
ogs_strdup(eap_payload->valuestring),
|
||||||
knr_pro_se && !cJSON_IsNull(knr_pro_se) ? ogs_strdup(knr_pro_se->valuestring) : NULL,
|
knr_pro_se && !cJSON_IsNull(knr_pro_se) ? ogs_strdup(knr_pro_se->valuestring) : NULL,
|
||||||
_links ? _linksList : NULL,
|
_links ? _linksList : NULL,
|
||||||
auth_result ? auth_resultVariable : 0,
|
auth_result ? auth_resultVariable : 0,
|
||||||
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
supported_features && !cJSON_IsNull(supported_features) ? ogs_strdup(supported_features->valuestring) : NULL,
|
||||||
|
nonce2 && cJSON_IsNull(nonce2) ? true : false,
|
||||||
nonce2 && !cJSON_IsNull(nonce2) ? ogs_strdup(nonce2->valuestring) : NULL,
|
nonce2 && !cJSON_IsNull(nonce2) ? ogs_strdup(nonce2->valuestring) : NULL,
|
||||||
_5g_pruk_id && !cJSON_IsNull(_5g_pruk_id) ? ogs_strdup(_5g_pruk_id->valuestring) : NULL
|
_5g_pruk_id && !cJSON_IsNull(_5g_pruk_id) ? ogs_strdup(_5g_pruk_id->valuestring) : NULL
|
||||||
);
|
);
|
||||||
|
|
|
@ -21,21 +21,25 @@ extern "C" {
|
||||||
|
|
||||||
typedef struct OpenAPI_pro_se_eap_session_s OpenAPI_pro_se_eap_session_t;
|
typedef struct OpenAPI_pro_se_eap_session_s OpenAPI_pro_se_eap_session_t;
|
||||||
typedef struct OpenAPI_pro_se_eap_session_s {
|
typedef struct OpenAPI_pro_se_eap_session_s {
|
||||||
|
bool is_eap_payload_null;
|
||||||
char *eap_payload;
|
char *eap_payload;
|
||||||
char *knr_pro_se;
|
char *knr_pro_se;
|
||||||
OpenAPI_list_t* _links;
|
OpenAPI_list_t* _links;
|
||||||
OpenAPI_auth_result_e auth_result;
|
OpenAPI_auth_result_e auth_result;
|
||||||
char *supported_features;
|
char *supported_features;
|
||||||
|
bool is_nonce2_null;
|
||||||
char *nonce2;
|
char *nonce2;
|
||||||
char *_5g_pruk_id;
|
char *_5g_pruk_id;
|
||||||
} OpenAPI_pro_se_eap_session_t;
|
} OpenAPI_pro_se_eap_session_t;
|
||||||
|
|
||||||
OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_create(
|
OpenAPI_pro_se_eap_session_t *OpenAPI_pro_se_eap_session_create(
|
||||||
|
bool is_eap_payload_null,
|
||||||
char *eap_payload,
|
char *eap_payload,
|
||||||
char *knr_pro_se,
|
char *knr_pro_se,
|
||||||
OpenAPI_list_t* _links,
|
OpenAPI_list_t* _links,
|
||||||
OpenAPI_auth_result_e auth_result,
|
OpenAPI_auth_result_e auth_result,
|
||||||
char *supported_features,
|
char *supported_features,
|
||||||
|
bool is_nonce2_null,
|
||||||
char *nonce2,
|
char *nonce2,
|
||||||
char *_5g_pruk_id
|
char *_5g_pruk_id
|
||||||
);
|
);
|
||||||
|
|
|
@ -9,6 +9,7 @@ OpenAPI_provisioned_data_sets_t *OpenAPI_provisioned_data_sets_create(
|
||||||
OpenAPI_smf_selection_subscription_data_t *smf_sel_data,
|
OpenAPI_smf_selection_subscription_data_t *smf_sel_data,
|
||||||
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
||||||
OpenAPI_sm_subs_data_t *sm_data,
|
OpenAPI_sm_subs_data_t *sm_data,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
||||||
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
||||||
|
@ -30,6 +31,7 @@ OpenAPI_provisioned_data_sets_t *OpenAPI_provisioned_data_sets_create(
|
||||||
provisioned_data_sets_local_var->smf_sel_data = smf_sel_data;
|
provisioned_data_sets_local_var->smf_sel_data = smf_sel_data;
|
||||||
provisioned_data_sets_local_var->sms_subs_data = sms_subs_data;
|
provisioned_data_sets_local_var->sms_subs_data = sms_subs_data;
|
||||||
provisioned_data_sets_local_var->sm_data = sm_data;
|
provisioned_data_sets_local_var->sm_data = sm_data;
|
||||||
|
provisioned_data_sets_local_var->is_trace_data_null = is_trace_data_null;
|
||||||
provisioned_data_sets_local_var->trace_data = trace_data;
|
provisioned_data_sets_local_var->trace_data = trace_data;
|
||||||
provisioned_data_sets_local_var->sms_mng_data = sms_mng_data;
|
provisioned_data_sets_local_var->sms_mng_data = sms_mng_data;
|
||||||
provisioned_data_sets_local_var->lcs_privacy_data = lcs_privacy_data;
|
provisioned_data_sets_local_var->lcs_privacy_data = lcs_privacy_data;
|
||||||
|
@ -194,6 +196,11 @@ cJSON *OpenAPI_provisioned_data_sets_convertToJSON(OpenAPI_provisioned_data_sets
|
||||||
ogs_error("OpenAPI_provisioned_data_sets_convertToJSON() failed [trace_data]");
|
ogs_error("OpenAPI_provisioned_data_sets_convertToJSON() failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (provisioned_data_sets->is_trace_data_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "traceData") == NULL) {
|
||||||
|
ogs_error("OpenAPI_provisioned_data_sets_convertToJSON() failed [trace_data]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (provisioned_data_sets->sms_mng_data) {
|
if (provisioned_data_sets->sms_mng_data) {
|
||||||
|
@ -417,12 +424,14 @@ OpenAPI_provisioned_data_sets_t *OpenAPI_provisioned_data_sets_parseFromJSON(cJS
|
||||||
|
|
||||||
trace_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "traceData");
|
trace_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "traceData");
|
||||||
if (trace_data) {
|
if (trace_data) {
|
||||||
|
if (!cJSON_IsNull(trace_data)) {
|
||||||
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
trace_data_local_nonprim = OpenAPI_trace_data_parseFromJSON(trace_data);
|
||||||
if (!trace_data_local_nonprim) {
|
if (!trace_data_local_nonprim) {
|
||||||
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
ogs_error("OpenAPI_trace_data_parseFromJSON failed [trace_data]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sms_mng_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "smsMngData");
|
sms_mng_data = cJSON_GetObjectItemCaseSensitive(provisioned_data_setsJSON, "smsMngData");
|
||||||
if (sms_mng_data) {
|
if (sms_mng_data) {
|
||||||
|
@ -528,6 +537,7 @@ OpenAPI_provisioned_data_sets_t *OpenAPI_provisioned_data_sets_parseFromJSON(cJS
|
||||||
smf_sel_data ? smf_sel_data_local_nonprim : NULL,
|
smf_sel_data ? smf_sel_data_local_nonprim : NULL,
|
||||||
sms_subs_data ? sms_subs_data_local_nonprim : NULL,
|
sms_subs_data ? sms_subs_data_local_nonprim : NULL,
|
||||||
sm_data ? sm_data_local_nonprim : NULL,
|
sm_data ? sm_data_local_nonprim : NULL,
|
||||||
|
trace_data && cJSON_IsNull(trace_data) ? true : false,
|
||||||
trace_data ? trace_data_local_nonprim : NULL,
|
trace_data ? trace_data_local_nonprim : NULL,
|
||||||
sms_mng_data ? sms_mng_data_local_nonprim : NULL,
|
sms_mng_data ? sms_mng_data_local_nonprim : NULL,
|
||||||
lcs_privacy_data ? lcs_privacy_data_local_nonprim : NULL,
|
lcs_privacy_data ? lcs_privacy_data_local_nonprim : NULL,
|
||||||
|
|
|
@ -39,6 +39,7 @@ typedef struct OpenAPI_provisioned_data_sets_s {
|
||||||
struct OpenAPI_smf_selection_subscription_data_s *smf_sel_data;
|
struct OpenAPI_smf_selection_subscription_data_s *smf_sel_data;
|
||||||
struct OpenAPI_sms_subscription_data_s *sms_subs_data;
|
struct OpenAPI_sms_subscription_data_s *sms_subs_data;
|
||||||
struct OpenAPI_sm_subs_data_s *sm_data;
|
struct OpenAPI_sm_subs_data_s *sm_data;
|
||||||
|
bool is_trace_data_null;
|
||||||
struct OpenAPI_trace_data_s *trace_data;
|
struct OpenAPI_trace_data_s *trace_data;
|
||||||
struct OpenAPI_sms_management_subscription_data_s *sms_mng_data;
|
struct OpenAPI_sms_management_subscription_data_s *sms_mng_data;
|
||||||
struct OpenAPI_lcs_privacy_data_s *lcs_privacy_data;
|
struct OpenAPI_lcs_privacy_data_s *lcs_privacy_data;
|
||||||
|
@ -58,6 +59,7 @@ OpenAPI_provisioned_data_sets_t *OpenAPI_provisioned_data_sets_create(
|
||||||
OpenAPI_smf_selection_subscription_data_t *smf_sel_data,
|
OpenAPI_smf_selection_subscription_data_t *smf_sel_data,
|
||||||
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
OpenAPI_sms_subscription_data_t *sms_subs_data,
|
||||||
OpenAPI_sm_subs_data_t *sm_data,
|
OpenAPI_sm_subs_data_t *sm_data,
|
||||||
|
bool is_trace_data_null,
|
||||||
OpenAPI_trace_data_t *trace_data,
|
OpenAPI_trace_data_t *trace_data,
|
||||||
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
OpenAPI_sms_management_subscription_data_t *sms_mng_data,
|
||||||
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
OpenAPI_lcs_privacy_data_t *lcs_privacy_data,
|
||||||
|
|
|
@ -8,29 +8,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_create(
|
||||||
char *qos_id,
|
char *qos_id,
|
||||||
bool is__5qi,
|
bool is__5qi,
|
||||||
int _5qi,
|
int _5qi,
|
||||||
|
bool is_maxbr_ul_null,
|
||||||
char *maxbr_ul,
|
char *maxbr_ul,
|
||||||
|
bool is_maxbr_dl_null,
|
||||||
char *maxbr_dl,
|
char *maxbr_dl,
|
||||||
|
bool is_gbr_ul_null,
|
||||||
char *gbr_ul,
|
char *gbr_ul,
|
||||||
|
bool is_gbr_dl_null,
|
||||||
char *gbr_dl,
|
char *gbr_dl,
|
||||||
OpenAPI_arp_t *arp,
|
OpenAPI_arp_t *arp,
|
||||||
bool is_qnc,
|
bool is_qnc,
|
||||||
int qnc,
|
int qnc,
|
||||||
|
bool is_priority_level_null,
|
||||||
bool is_priority_level,
|
bool is_priority_level,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
|
bool is_aver_window_null,
|
||||||
bool is_aver_window,
|
bool is_aver_window,
|
||||||
int aver_window,
|
int aver_window,
|
||||||
|
bool is_max_data_burst_vol_null,
|
||||||
bool is_max_data_burst_vol,
|
bool is_max_data_burst_vol,
|
||||||
int max_data_burst_vol,
|
int max_data_burst_vol,
|
||||||
bool is_reflective_qos,
|
bool is_reflective_qos,
|
||||||
int reflective_qos,
|
int reflective_qos,
|
||||||
char *sharing_key_dl,
|
char *sharing_key_dl,
|
||||||
char *sharing_key_ul,
|
char *sharing_key_ul,
|
||||||
|
bool is_max_packet_loss_rate_dl_null,
|
||||||
bool is_max_packet_loss_rate_dl,
|
bool is_max_packet_loss_rate_dl,
|
||||||
int max_packet_loss_rate_dl,
|
int max_packet_loss_rate_dl,
|
||||||
|
bool is_max_packet_loss_rate_ul_null,
|
||||||
bool is_max_packet_loss_rate_ul,
|
bool is_max_packet_loss_rate_ul,
|
||||||
int max_packet_loss_rate_ul,
|
int max_packet_loss_rate_ul,
|
||||||
bool is_def_qos_flow_indication,
|
bool is_def_qos_flow_indication,
|
||||||
int def_qos_flow_indication,
|
int def_qos_flow_indication,
|
||||||
|
bool is_ext_max_data_burst_vol_null,
|
||||||
bool is_ext_max_data_burst_vol,
|
bool is_ext_max_data_burst_vol,
|
||||||
int ext_max_data_burst_vol,
|
int ext_max_data_burst_vol,
|
||||||
bool is_packet_delay_budget,
|
bool is_packet_delay_budget,
|
||||||
|
@ -44,29 +54,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_create(
|
||||||
qos_data_local_var->qos_id = qos_id;
|
qos_data_local_var->qos_id = qos_id;
|
||||||
qos_data_local_var->is__5qi = is__5qi;
|
qos_data_local_var->is__5qi = is__5qi;
|
||||||
qos_data_local_var->_5qi = _5qi;
|
qos_data_local_var->_5qi = _5qi;
|
||||||
|
qos_data_local_var->is_maxbr_ul_null = is_maxbr_ul_null;
|
||||||
qos_data_local_var->maxbr_ul = maxbr_ul;
|
qos_data_local_var->maxbr_ul = maxbr_ul;
|
||||||
|
qos_data_local_var->is_maxbr_dl_null = is_maxbr_dl_null;
|
||||||
qos_data_local_var->maxbr_dl = maxbr_dl;
|
qos_data_local_var->maxbr_dl = maxbr_dl;
|
||||||
|
qos_data_local_var->is_gbr_ul_null = is_gbr_ul_null;
|
||||||
qos_data_local_var->gbr_ul = gbr_ul;
|
qos_data_local_var->gbr_ul = gbr_ul;
|
||||||
|
qos_data_local_var->is_gbr_dl_null = is_gbr_dl_null;
|
||||||
qos_data_local_var->gbr_dl = gbr_dl;
|
qos_data_local_var->gbr_dl = gbr_dl;
|
||||||
qos_data_local_var->arp = arp;
|
qos_data_local_var->arp = arp;
|
||||||
qos_data_local_var->is_qnc = is_qnc;
|
qos_data_local_var->is_qnc = is_qnc;
|
||||||
qos_data_local_var->qnc = qnc;
|
qos_data_local_var->qnc = qnc;
|
||||||
|
qos_data_local_var->is_priority_level_null = is_priority_level_null;
|
||||||
qos_data_local_var->is_priority_level = is_priority_level;
|
qos_data_local_var->is_priority_level = is_priority_level;
|
||||||
qos_data_local_var->priority_level = priority_level;
|
qos_data_local_var->priority_level = priority_level;
|
||||||
|
qos_data_local_var->is_aver_window_null = is_aver_window_null;
|
||||||
qos_data_local_var->is_aver_window = is_aver_window;
|
qos_data_local_var->is_aver_window = is_aver_window;
|
||||||
qos_data_local_var->aver_window = aver_window;
|
qos_data_local_var->aver_window = aver_window;
|
||||||
|
qos_data_local_var->is_max_data_burst_vol_null = is_max_data_burst_vol_null;
|
||||||
qos_data_local_var->is_max_data_burst_vol = is_max_data_burst_vol;
|
qos_data_local_var->is_max_data_burst_vol = is_max_data_burst_vol;
|
||||||
qos_data_local_var->max_data_burst_vol = max_data_burst_vol;
|
qos_data_local_var->max_data_burst_vol = max_data_burst_vol;
|
||||||
qos_data_local_var->is_reflective_qos = is_reflective_qos;
|
qos_data_local_var->is_reflective_qos = is_reflective_qos;
|
||||||
qos_data_local_var->reflective_qos = reflective_qos;
|
qos_data_local_var->reflective_qos = reflective_qos;
|
||||||
qos_data_local_var->sharing_key_dl = sharing_key_dl;
|
qos_data_local_var->sharing_key_dl = sharing_key_dl;
|
||||||
qos_data_local_var->sharing_key_ul = sharing_key_ul;
|
qos_data_local_var->sharing_key_ul = sharing_key_ul;
|
||||||
|
qos_data_local_var->is_max_packet_loss_rate_dl_null = is_max_packet_loss_rate_dl_null;
|
||||||
qos_data_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
|
qos_data_local_var->is_max_packet_loss_rate_dl = is_max_packet_loss_rate_dl;
|
||||||
qos_data_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
|
qos_data_local_var->max_packet_loss_rate_dl = max_packet_loss_rate_dl;
|
||||||
|
qos_data_local_var->is_max_packet_loss_rate_ul_null = is_max_packet_loss_rate_ul_null;
|
||||||
qos_data_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
|
qos_data_local_var->is_max_packet_loss_rate_ul = is_max_packet_loss_rate_ul;
|
||||||
qos_data_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
|
qos_data_local_var->max_packet_loss_rate_ul = max_packet_loss_rate_ul;
|
||||||
qos_data_local_var->is_def_qos_flow_indication = is_def_qos_flow_indication;
|
qos_data_local_var->is_def_qos_flow_indication = is_def_qos_flow_indication;
|
||||||
qos_data_local_var->def_qos_flow_indication = def_qos_flow_indication;
|
qos_data_local_var->def_qos_flow_indication = def_qos_flow_indication;
|
||||||
|
qos_data_local_var->is_ext_max_data_burst_vol_null = is_ext_max_data_burst_vol_null;
|
||||||
qos_data_local_var->is_ext_max_data_burst_vol = is_ext_max_data_burst_vol;
|
qos_data_local_var->is_ext_max_data_burst_vol = is_ext_max_data_burst_vol;
|
||||||
qos_data_local_var->ext_max_data_burst_vol = ext_max_data_burst_vol;
|
qos_data_local_var->ext_max_data_burst_vol = ext_max_data_burst_vol;
|
||||||
qos_data_local_var->is_packet_delay_budget = is_packet_delay_budget;
|
qos_data_local_var->is_packet_delay_budget = is_packet_delay_budget;
|
||||||
|
@ -154,6 +174,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_ul]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_maxbr_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxbrUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->maxbr_dl) {
|
if (qos_data->maxbr_dl) {
|
||||||
|
@ -161,6 +186,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_dl]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_maxbr_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxbrDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [maxbr_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->gbr_ul) {
|
if (qos_data->gbr_ul) {
|
||||||
|
@ -168,6 +198,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_ul]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_gbr_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "gbrUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->gbr_dl) {
|
if (qos_data->gbr_dl) {
|
||||||
|
@ -175,6 +210,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_dl]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_gbr_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "gbrDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [gbr_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->arp) {
|
if (qos_data->arp) {
|
||||||
|
@ -202,6 +242,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [priority_level]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [priority_level]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_priority_level_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "priorityLevel") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [priority_level]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->is_aver_window) {
|
if (qos_data->is_aver_window) {
|
||||||
|
@ -209,6 +254,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [aver_window]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [aver_window]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_aver_window_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "averWindow") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [aver_window]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->is_max_data_burst_vol) {
|
if (qos_data->is_max_data_burst_vol) {
|
||||||
|
@ -216,6 +266,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_data_burst_vol]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_max_data_burst_vol_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxDataBurstVol") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_data_burst_vol]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->is_reflective_qos) {
|
if (qos_data->is_reflective_qos) {
|
||||||
|
@ -244,6 +299,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_dl]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_max_packet_loss_rate_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxPacketLossRateDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->is_max_packet_loss_rate_ul) {
|
if (qos_data->is_max_packet_loss_rate_ul) {
|
||||||
|
@ -251,6 +311,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_ul]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_max_packet_loss_rate_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "maxPacketLossRateUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [max_packet_loss_rate_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->is_def_qos_flow_indication) {
|
if (qos_data->is_def_qos_flow_indication) {
|
||||||
|
@ -265,6 +330,11 @@ cJSON *OpenAPI_qos_data_convertToJSON(OpenAPI_qos_data_t *qos_data)
|
||||||
ogs_error("OpenAPI_qos_data_convertToJSON() failed [ext_max_data_burst_vol]");
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [ext_max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_data->is_ext_max_data_burst_vol_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "extMaxDataBurstVol") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_data_convertToJSON() failed [ext_max_data_burst_vol]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_data->is_packet_delay_budget) {
|
if (qos_data->is_packet_delay_budget) {
|
||||||
|
@ -330,35 +400,43 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
|
||||||
|
|
||||||
maxbr_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxbrUl");
|
maxbr_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxbrUl");
|
||||||
if (maxbr_ul) {
|
if (maxbr_ul) {
|
||||||
|
if (!cJSON_IsNull(maxbr_ul)) {
|
||||||
if (!cJSON_IsString(maxbr_ul) && !cJSON_IsNull(maxbr_ul)) {
|
if (!cJSON_IsString(maxbr_ul) && !cJSON_IsNull(maxbr_ul)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [maxbr_ul]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [maxbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
maxbr_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxbrDl");
|
maxbr_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxbrDl");
|
||||||
if (maxbr_dl) {
|
if (maxbr_dl) {
|
||||||
|
if (!cJSON_IsNull(maxbr_dl)) {
|
||||||
if (!cJSON_IsString(maxbr_dl) && !cJSON_IsNull(maxbr_dl)) {
|
if (!cJSON_IsString(maxbr_dl) && !cJSON_IsNull(maxbr_dl)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [maxbr_dl]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [maxbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
gbr_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "gbrUl");
|
gbr_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "gbrUl");
|
||||||
if (gbr_ul) {
|
if (gbr_ul) {
|
||||||
|
if (!cJSON_IsNull(gbr_ul)) {
|
||||||
if (!cJSON_IsString(gbr_ul) && !cJSON_IsNull(gbr_ul)) {
|
if (!cJSON_IsString(gbr_ul) && !cJSON_IsNull(gbr_ul)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [gbr_ul]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [gbr_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
gbr_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "gbrDl");
|
gbr_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "gbrDl");
|
||||||
if (gbr_dl) {
|
if (gbr_dl) {
|
||||||
|
if (!cJSON_IsNull(gbr_dl)) {
|
||||||
if (!cJSON_IsString(gbr_dl) && !cJSON_IsNull(gbr_dl)) {
|
if (!cJSON_IsString(gbr_dl) && !cJSON_IsNull(gbr_dl)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [gbr_dl]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [gbr_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
arp = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "arp");
|
arp = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "arp");
|
||||||
if (arp) {
|
if (arp) {
|
||||||
|
@ -379,27 +457,33 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
|
||||||
|
|
||||||
priority_level = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "priorityLevel");
|
priority_level = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "priorityLevel");
|
||||||
if (priority_level) {
|
if (priority_level) {
|
||||||
|
if (!cJSON_IsNull(priority_level)) {
|
||||||
if (!cJSON_IsNumber(priority_level)) {
|
if (!cJSON_IsNumber(priority_level)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [priority_level]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [priority_level]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
aver_window = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "averWindow");
|
aver_window = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "averWindow");
|
||||||
if (aver_window) {
|
if (aver_window) {
|
||||||
|
if (!cJSON_IsNull(aver_window)) {
|
||||||
if (!cJSON_IsNumber(aver_window)) {
|
if (!cJSON_IsNumber(aver_window)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [aver_window]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [aver_window]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxDataBurstVol");
|
max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxDataBurstVol");
|
||||||
if (max_data_burst_vol) {
|
if (max_data_burst_vol) {
|
||||||
|
if (!cJSON_IsNull(max_data_burst_vol)) {
|
||||||
if (!cJSON_IsNumber(max_data_burst_vol)) {
|
if (!cJSON_IsNumber(max_data_burst_vol)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_data_burst_vol]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
reflective_qos = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "reflectiveQos");
|
reflective_qos = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "reflectiveQos");
|
||||||
if (reflective_qos) {
|
if (reflective_qos) {
|
||||||
|
@ -427,19 +511,23 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
|
||||||
|
|
||||||
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxPacketLossRateDl");
|
max_packet_loss_rate_dl = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxPacketLossRateDl");
|
||||||
if (max_packet_loss_rate_dl) {
|
if (max_packet_loss_rate_dl) {
|
||||||
|
if (!cJSON_IsNull(max_packet_loss_rate_dl)) {
|
||||||
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
|
if (!cJSON_IsNumber(max_packet_loss_rate_dl)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_packet_loss_rate_dl]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_packet_loss_rate_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxPacketLossRateUl");
|
max_packet_loss_rate_ul = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "maxPacketLossRateUl");
|
||||||
if (max_packet_loss_rate_ul) {
|
if (max_packet_loss_rate_ul) {
|
||||||
|
if (!cJSON_IsNull(max_packet_loss_rate_ul)) {
|
||||||
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
|
if (!cJSON_IsNumber(max_packet_loss_rate_ul)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_packet_loss_rate_ul]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [max_packet_loss_rate_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
def_qos_flow_indication = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "defQosFlowIndication");
|
def_qos_flow_indication = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "defQosFlowIndication");
|
||||||
if (def_qos_flow_indication) {
|
if (def_qos_flow_indication) {
|
||||||
|
@ -451,11 +539,13 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
|
||||||
|
|
||||||
ext_max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "extMaxDataBurstVol");
|
ext_max_data_burst_vol = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "extMaxDataBurstVol");
|
||||||
if (ext_max_data_burst_vol) {
|
if (ext_max_data_burst_vol) {
|
||||||
|
if (!cJSON_IsNull(ext_max_data_burst_vol)) {
|
||||||
if (!cJSON_IsNumber(ext_max_data_burst_vol)) {
|
if (!cJSON_IsNumber(ext_max_data_burst_vol)) {
|
||||||
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [ext_max_data_burst_vol]");
|
ogs_error("OpenAPI_qos_data_parseFromJSON() failed [ext_max_data_burst_vol]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
packet_delay_budget = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "packetDelayBudget");
|
packet_delay_budget = cJSON_GetObjectItemCaseSensitive(qos_dataJSON, "packetDelayBudget");
|
||||||
if (packet_delay_budget) {
|
if (packet_delay_budget) {
|
||||||
|
@ -477,29 +567,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON)
|
||||||
ogs_strdup(qos_id->valuestring),
|
ogs_strdup(qos_id->valuestring),
|
||||||
_5qi ? true : false,
|
_5qi ? true : false,
|
||||||
_5qi ? _5qi->valuedouble : 0,
|
_5qi ? _5qi->valuedouble : 0,
|
||||||
|
maxbr_ul && cJSON_IsNull(maxbr_ul) ? true : false,
|
||||||
maxbr_ul && !cJSON_IsNull(maxbr_ul) ? ogs_strdup(maxbr_ul->valuestring) : NULL,
|
maxbr_ul && !cJSON_IsNull(maxbr_ul) ? ogs_strdup(maxbr_ul->valuestring) : NULL,
|
||||||
|
maxbr_dl && cJSON_IsNull(maxbr_dl) ? true : false,
|
||||||
maxbr_dl && !cJSON_IsNull(maxbr_dl) ? ogs_strdup(maxbr_dl->valuestring) : NULL,
|
maxbr_dl && !cJSON_IsNull(maxbr_dl) ? ogs_strdup(maxbr_dl->valuestring) : NULL,
|
||||||
|
gbr_ul && cJSON_IsNull(gbr_ul) ? true : false,
|
||||||
gbr_ul && !cJSON_IsNull(gbr_ul) ? ogs_strdup(gbr_ul->valuestring) : NULL,
|
gbr_ul && !cJSON_IsNull(gbr_ul) ? ogs_strdup(gbr_ul->valuestring) : NULL,
|
||||||
|
gbr_dl && cJSON_IsNull(gbr_dl) ? true : false,
|
||||||
gbr_dl && !cJSON_IsNull(gbr_dl) ? ogs_strdup(gbr_dl->valuestring) : NULL,
|
gbr_dl && !cJSON_IsNull(gbr_dl) ? ogs_strdup(gbr_dl->valuestring) : NULL,
|
||||||
arp ? arp_local_nonprim : NULL,
|
arp ? arp_local_nonprim : NULL,
|
||||||
qnc ? true : false,
|
qnc ? true : false,
|
||||||
qnc ? qnc->valueint : 0,
|
qnc ? qnc->valueint : 0,
|
||||||
|
priority_level && cJSON_IsNull(priority_level) ? true : false,
|
||||||
priority_level ? true : false,
|
priority_level ? true : false,
|
||||||
priority_level ? priority_level->valuedouble : 0,
|
priority_level ? priority_level->valuedouble : 0,
|
||||||
|
aver_window && cJSON_IsNull(aver_window) ? true : false,
|
||||||
aver_window ? true : false,
|
aver_window ? true : false,
|
||||||
aver_window ? aver_window->valuedouble : 0,
|
aver_window ? aver_window->valuedouble : 0,
|
||||||
|
max_data_burst_vol && cJSON_IsNull(max_data_burst_vol) ? true : false,
|
||||||
max_data_burst_vol ? true : false,
|
max_data_burst_vol ? true : false,
|
||||||
max_data_burst_vol ? max_data_burst_vol->valuedouble : 0,
|
max_data_burst_vol ? max_data_burst_vol->valuedouble : 0,
|
||||||
reflective_qos ? true : false,
|
reflective_qos ? true : false,
|
||||||
reflective_qos ? reflective_qos->valueint : 0,
|
reflective_qos ? reflective_qos->valueint : 0,
|
||||||
sharing_key_dl && !cJSON_IsNull(sharing_key_dl) ? ogs_strdup(sharing_key_dl->valuestring) : NULL,
|
sharing_key_dl && !cJSON_IsNull(sharing_key_dl) ? ogs_strdup(sharing_key_dl->valuestring) : NULL,
|
||||||
sharing_key_ul && !cJSON_IsNull(sharing_key_ul) ? ogs_strdup(sharing_key_ul->valuestring) : NULL,
|
sharing_key_ul && !cJSON_IsNull(sharing_key_ul) ? ogs_strdup(sharing_key_ul->valuestring) : NULL,
|
||||||
|
max_packet_loss_rate_dl && cJSON_IsNull(max_packet_loss_rate_dl) ? true : false,
|
||||||
max_packet_loss_rate_dl ? true : false,
|
max_packet_loss_rate_dl ? true : false,
|
||||||
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
|
max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0,
|
||||||
|
max_packet_loss_rate_ul && cJSON_IsNull(max_packet_loss_rate_ul) ? true : false,
|
||||||
max_packet_loss_rate_ul ? true : false,
|
max_packet_loss_rate_ul ? true : false,
|
||||||
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
|
max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0,
|
||||||
def_qos_flow_indication ? true : false,
|
def_qos_flow_indication ? true : false,
|
||||||
def_qos_flow_indication ? def_qos_flow_indication->valueint : 0,
|
def_qos_flow_indication ? def_qos_flow_indication->valueint : 0,
|
||||||
|
ext_max_data_burst_vol && cJSON_IsNull(ext_max_data_burst_vol) ? true : false,
|
||||||
ext_max_data_burst_vol ? true : false,
|
ext_max_data_burst_vol ? true : false,
|
||||||
ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0,
|
ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0,
|
||||||
packet_delay_budget ? true : false,
|
packet_delay_budget ? true : false,
|
||||||
|
|
|
@ -23,29 +23,39 @@ typedef struct OpenAPI_qos_data_s {
|
||||||
char *qos_id;
|
char *qos_id;
|
||||||
bool is__5qi;
|
bool is__5qi;
|
||||||
int _5qi;
|
int _5qi;
|
||||||
|
bool is_maxbr_ul_null;
|
||||||
char *maxbr_ul;
|
char *maxbr_ul;
|
||||||
|
bool is_maxbr_dl_null;
|
||||||
char *maxbr_dl;
|
char *maxbr_dl;
|
||||||
|
bool is_gbr_ul_null;
|
||||||
char *gbr_ul;
|
char *gbr_ul;
|
||||||
|
bool is_gbr_dl_null;
|
||||||
char *gbr_dl;
|
char *gbr_dl;
|
||||||
struct OpenAPI_arp_s *arp;
|
struct OpenAPI_arp_s *arp;
|
||||||
bool is_qnc;
|
bool is_qnc;
|
||||||
int qnc;
|
int qnc;
|
||||||
|
bool is_priority_level_null;
|
||||||
bool is_priority_level;
|
bool is_priority_level;
|
||||||
int priority_level;
|
int priority_level;
|
||||||
|
bool is_aver_window_null;
|
||||||
bool is_aver_window;
|
bool is_aver_window;
|
||||||
int aver_window;
|
int aver_window;
|
||||||
|
bool is_max_data_burst_vol_null;
|
||||||
bool is_max_data_burst_vol;
|
bool is_max_data_burst_vol;
|
||||||
int max_data_burst_vol;
|
int max_data_burst_vol;
|
||||||
bool is_reflective_qos;
|
bool is_reflective_qos;
|
||||||
int reflective_qos;
|
int reflective_qos;
|
||||||
char *sharing_key_dl;
|
char *sharing_key_dl;
|
||||||
char *sharing_key_ul;
|
char *sharing_key_ul;
|
||||||
|
bool is_max_packet_loss_rate_dl_null;
|
||||||
bool is_max_packet_loss_rate_dl;
|
bool is_max_packet_loss_rate_dl;
|
||||||
int max_packet_loss_rate_dl;
|
int max_packet_loss_rate_dl;
|
||||||
|
bool is_max_packet_loss_rate_ul_null;
|
||||||
bool is_max_packet_loss_rate_ul;
|
bool is_max_packet_loss_rate_ul;
|
||||||
int max_packet_loss_rate_ul;
|
int max_packet_loss_rate_ul;
|
||||||
bool is_def_qos_flow_indication;
|
bool is_def_qos_flow_indication;
|
||||||
int def_qos_flow_indication;
|
int def_qos_flow_indication;
|
||||||
|
bool is_ext_max_data_burst_vol_null;
|
||||||
bool is_ext_max_data_burst_vol;
|
bool is_ext_max_data_burst_vol;
|
||||||
int ext_max_data_burst_vol;
|
int ext_max_data_burst_vol;
|
||||||
bool is_packet_delay_budget;
|
bool is_packet_delay_budget;
|
||||||
|
@ -57,29 +67,39 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_create(
|
||||||
char *qos_id,
|
char *qos_id,
|
||||||
bool is__5qi,
|
bool is__5qi,
|
||||||
int _5qi,
|
int _5qi,
|
||||||
|
bool is_maxbr_ul_null,
|
||||||
char *maxbr_ul,
|
char *maxbr_ul,
|
||||||
|
bool is_maxbr_dl_null,
|
||||||
char *maxbr_dl,
|
char *maxbr_dl,
|
||||||
|
bool is_gbr_ul_null,
|
||||||
char *gbr_ul,
|
char *gbr_ul,
|
||||||
|
bool is_gbr_dl_null,
|
||||||
char *gbr_dl,
|
char *gbr_dl,
|
||||||
OpenAPI_arp_t *arp,
|
OpenAPI_arp_t *arp,
|
||||||
bool is_qnc,
|
bool is_qnc,
|
||||||
int qnc,
|
int qnc,
|
||||||
|
bool is_priority_level_null,
|
||||||
bool is_priority_level,
|
bool is_priority_level,
|
||||||
int priority_level,
|
int priority_level,
|
||||||
|
bool is_aver_window_null,
|
||||||
bool is_aver_window,
|
bool is_aver_window,
|
||||||
int aver_window,
|
int aver_window,
|
||||||
|
bool is_max_data_burst_vol_null,
|
||||||
bool is_max_data_burst_vol,
|
bool is_max_data_burst_vol,
|
||||||
int max_data_burst_vol,
|
int max_data_burst_vol,
|
||||||
bool is_reflective_qos,
|
bool is_reflective_qos,
|
||||||
int reflective_qos,
|
int reflective_qos,
|
||||||
char *sharing_key_dl,
|
char *sharing_key_dl,
|
||||||
char *sharing_key_ul,
|
char *sharing_key_ul,
|
||||||
|
bool is_max_packet_loss_rate_dl_null,
|
||||||
bool is_max_packet_loss_rate_dl,
|
bool is_max_packet_loss_rate_dl,
|
||||||
int max_packet_loss_rate_dl,
|
int max_packet_loss_rate_dl,
|
||||||
|
bool is_max_packet_loss_rate_ul_null,
|
||||||
bool is_max_packet_loss_rate_ul,
|
bool is_max_packet_loss_rate_ul,
|
||||||
int max_packet_loss_rate_ul,
|
int max_packet_loss_rate_ul,
|
||||||
bool is_def_qos_flow_indication,
|
bool is_def_qos_flow_indication,
|
||||||
int def_qos_flow_indication,
|
int def_qos_flow_indication,
|
||||||
|
bool is_ext_max_data_burst_vol_null,
|
||||||
bool is_ext_max_data_burst_vol,
|
bool is_ext_max_data_burst_vol,
|
||||||
int ext_max_data_burst_vol,
|
int ext_max_data_burst_vol,
|
||||||
bool is_packet_delay_budget,
|
bool is_packet_delay_budget,
|
||||||
|
|
|
@ -8,17 +8,24 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_create(
|
||||||
char *qm_id,
|
char *qm_id,
|
||||||
OpenAPI_list_t *req_qos_mon_params,
|
OpenAPI_list_t *req_qos_mon_params,
|
||||||
OpenAPI_list_t *rep_freqs,
|
OpenAPI_list_t *rep_freqs,
|
||||||
|
bool is_rep_thresh_dl_null,
|
||||||
bool is_rep_thresh_dl,
|
bool is_rep_thresh_dl,
|
||||||
int rep_thresh_dl,
|
int rep_thresh_dl,
|
||||||
|
bool is_rep_thresh_ul_null,
|
||||||
bool is_rep_thresh_ul,
|
bool is_rep_thresh_ul,
|
||||||
int rep_thresh_ul,
|
int rep_thresh_ul,
|
||||||
|
bool is_rep_thresh_rp_null,
|
||||||
bool is_rep_thresh_rp,
|
bool is_rep_thresh_rp,
|
||||||
int rep_thresh_rp,
|
int rep_thresh_rp,
|
||||||
|
bool is_wait_time_null,
|
||||||
bool is_wait_time,
|
bool is_wait_time,
|
||||||
int wait_time,
|
int wait_time,
|
||||||
|
bool is_rep_period_null,
|
||||||
bool is_rep_period,
|
bool is_rep_period,
|
||||||
int rep_period,
|
int rep_period,
|
||||||
|
bool is_notify_uri_null,
|
||||||
char *notify_uri,
|
char *notify_uri,
|
||||||
|
bool is_notify_corre_id_null,
|
||||||
char *notify_corre_id,
|
char *notify_corre_id,
|
||||||
bool is_direct_notif_ind,
|
bool is_direct_notif_ind,
|
||||||
int direct_notif_ind
|
int direct_notif_ind
|
||||||
|
@ -30,17 +37,24 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_create(
|
||||||
qos_monitoring_data_local_var->qm_id = qm_id;
|
qos_monitoring_data_local_var->qm_id = qm_id;
|
||||||
qos_monitoring_data_local_var->req_qos_mon_params = req_qos_mon_params;
|
qos_monitoring_data_local_var->req_qos_mon_params = req_qos_mon_params;
|
||||||
qos_monitoring_data_local_var->rep_freqs = rep_freqs;
|
qos_monitoring_data_local_var->rep_freqs = rep_freqs;
|
||||||
|
qos_monitoring_data_local_var->is_rep_thresh_dl_null = is_rep_thresh_dl_null;
|
||||||
qos_monitoring_data_local_var->is_rep_thresh_dl = is_rep_thresh_dl;
|
qos_monitoring_data_local_var->is_rep_thresh_dl = is_rep_thresh_dl;
|
||||||
qos_monitoring_data_local_var->rep_thresh_dl = rep_thresh_dl;
|
qos_monitoring_data_local_var->rep_thresh_dl = rep_thresh_dl;
|
||||||
|
qos_monitoring_data_local_var->is_rep_thresh_ul_null = is_rep_thresh_ul_null;
|
||||||
qos_monitoring_data_local_var->is_rep_thresh_ul = is_rep_thresh_ul;
|
qos_monitoring_data_local_var->is_rep_thresh_ul = is_rep_thresh_ul;
|
||||||
qos_monitoring_data_local_var->rep_thresh_ul = rep_thresh_ul;
|
qos_monitoring_data_local_var->rep_thresh_ul = rep_thresh_ul;
|
||||||
|
qos_monitoring_data_local_var->is_rep_thresh_rp_null = is_rep_thresh_rp_null;
|
||||||
qos_monitoring_data_local_var->is_rep_thresh_rp = is_rep_thresh_rp;
|
qos_monitoring_data_local_var->is_rep_thresh_rp = is_rep_thresh_rp;
|
||||||
qos_monitoring_data_local_var->rep_thresh_rp = rep_thresh_rp;
|
qos_monitoring_data_local_var->rep_thresh_rp = rep_thresh_rp;
|
||||||
|
qos_monitoring_data_local_var->is_wait_time_null = is_wait_time_null;
|
||||||
qos_monitoring_data_local_var->is_wait_time = is_wait_time;
|
qos_monitoring_data_local_var->is_wait_time = is_wait_time;
|
||||||
qos_monitoring_data_local_var->wait_time = wait_time;
|
qos_monitoring_data_local_var->wait_time = wait_time;
|
||||||
|
qos_monitoring_data_local_var->is_rep_period_null = is_rep_period_null;
|
||||||
qos_monitoring_data_local_var->is_rep_period = is_rep_period;
|
qos_monitoring_data_local_var->is_rep_period = is_rep_period;
|
||||||
qos_monitoring_data_local_var->rep_period = rep_period;
|
qos_monitoring_data_local_var->rep_period = rep_period;
|
||||||
|
qos_monitoring_data_local_var->is_notify_uri_null = is_notify_uri_null;
|
||||||
qos_monitoring_data_local_var->notify_uri = notify_uri;
|
qos_monitoring_data_local_var->notify_uri = notify_uri;
|
||||||
|
qos_monitoring_data_local_var->is_notify_corre_id_null = is_notify_corre_id_null;
|
||||||
qos_monitoring_data_local_var->notify_corre_id = notify_corre_id;
|
qos_monitoring_data_local_var->notify_corre_id = notify_corre_id;
|
||||||
qos_monitoring_data_local_var->is_direct_notif_ind = is_direct_notif_ind;
|
qos_monitoring_data_local_var->is_direct_notif_ind = is_direct_notif_ind;
|
||||||
qos_monitoring_data_local_var->direct_notif_ind = direct_notif_ind;
|
qos_monitoring_data_local_var->direct_notif_ind = direct_notif_ind;
|
||||||
|
@ -135,6 +149,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_dl]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_rep_thresh_dl_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "repThreshDl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_dl]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->is_rep_thresh_ul) {
|
if (qos_monitoring_data->is_rep_thresh_ul) {
|
||||||
|
@ -142,6 +161,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_ul]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_rep_thresh_ul_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "repThreshUl") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_ul]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->is_rep_thresh_rp) {
|
if (qos_monitoring_data->is_rep_thresh_rp) {
|
||||||
|
@ -149,6 +173,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_rp]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_rp]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_rep_thresh_rp_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "repThreshRp") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_thresh_rp]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->is_wait_time) {
|
if (qos_monitoring_data->is_wait_time) {
|
||||||
|
@ -156,6 +185,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [wait_time]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [wait_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_wait_time_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "waitTime") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [wait_time]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->is_rep_period) {
|
if (qos_monitoring_data->is_rep_period) {
|
||||||
|
@ -163,6 +197,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_period]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_period]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_rep_period_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "repPeriod") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [rep_period]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->notify_uri) {
|
if (qos_monitoring_data->notify_uri) {
|
||||||
|
@ -170,6 +209,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [notify_uri]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [notify_uri]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_notify_uri_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "notifyUri") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [notify_uri]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->notify_corre_id) {
|
if (qos_monitoring_data->notify_corre_id) {
|
||||||
|
@ -177,6 +221,11 @@ cJSON *OpenAPI_qos_monitoring_data_convertToJSON(OpenAPI_qos_monitoring_data_t *
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [notify_corre_id]");
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [notify_corre_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (qos_monitoring_data->is_notify_corre_id_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "notifyCorreId") == NULL) {
|
||||||
|
ogs_error("OpenAPI_qos_monitoring_data_convertToJSON() failed [notify_corre_id]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qos_monitoring_data->is_direct_notif_ind) {
|
if (qos_monitoring_data->is_direct_notif_ind) {
|
||||||
|
@ -273,59 +322,73 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_parseFromJSON(cJSON *
|
||||||
|
|
||||||
rep_thresh_dl = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshDl");
|
rep_thresh_dl = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshDl");
|
||||||
if (rep_thresh_dl) {
|
if (rep_thresh_dl) {
|
||||||
|
if (!cJSON_IsNull(rep_thresh_dl)) {
|
||||||
if (!cJSON_IsNumber(rep_thresh_dl)) {
|
if (!cJSON_IsNumber(rep_thresh_dl)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_thresh_dl]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_thresh_dl]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rep_thresh_ul = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshUl");
|
rep_thresh_ul = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshUl");
|
||||||
if (rep_thresh_ul) {
|
if (rep_thresh_ul) {
|
||||||
|
if (!cJSON_IsNull(rep_thresh_ul)) {
|
||||||
if (!cJSON_IsNumber(rep_thresh_ul)) {
|
if (!cJSON_IsNumber(rep_thresh_ul)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_thresh_ul]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_thresh_ul]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rep_thresh_rp = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshRp");
|
rep_thresh_rp = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repThreshRp");
|
||||||
if (rep_thresh_rp) {
|
if (rep_thresh_rp) {
|
||||||
|
if (!cJSON_IsNull(rep_thresh_rp)) {
|
||||||
if (!cJSON_IsNumber(rep_thresh_rp)) {
|
if (!cJSON_IsNumber(rep_thresh_rp)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_thresh_rp]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_thresh_rp]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
wait_time = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "waitTime");
|
wait_time = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "waitTime");
|
||||||
if (wait_time) {
|
if (wait_time) {
|
||||||
|
if (!cJSON_IsNull(wait_time)) {
|
||||||
if (!cJSON_IsNumber(wait_time)) {
|
if (!cJSON_IsNumber(wait_time)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [wait_time]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [wait_time]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rep_period = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repPeriod");
|
rep_period = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "repPeriod");
|
||||||
if (rep_period) {
|
if (rep_period) {
|
||||||
|
if (!cJSON_IsNull(rep_period)) {
|
||||||
if (!cJSON_IsNumber(rep_period)) {
|
if (!cJSON_IsNumber(rep_period)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_period]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [rep_period]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
notify_uri = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "notifyUri");
|
notify_uri = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "notifyUri");
|
||||||
if (notify_uri) {
|
if (notify_uri) {
|
||||||
|
if (!cJSON_IsNull(notify_uri)) {
|
||||||
if (!cJSON_IsString(notify_uri) && !cJSON_IsNull(notify_uri)) {
|
if (!cJSON_IsString(notify_uri) && !cJSON_IsNull(notify_uri)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [notify_uri]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [notify_uri]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
notify_corre_id = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "notifyCorreId");
|
notify_corre_id = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "notifyCorreId");
|
||||||
if (notify_corre_id) {
|
if (notify_corre_id) {
|
||||||
|
if (!cJSON_IsNull(notify_corre_id)) {
|
||||||
if (!cJSON_IsString(notify_corre_id) && !cJSON_IsNull(notify_corre_id)) {
|
if (!cJSON_IsString(notify_corre_id) && !cJSON_IsNull(notify_corre_id)) {
|
||||||
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [notify_corre_id]");
|
ogs_error("OpenAPI_qos_monitoring_data_parseFromJSON() failed [notify_corre_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
direct_notif_ind = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "directNotifInd");
|
direct_notif_ind = cJSON_GetObjectItemCaseSensitive(qos_monitoring_dataJSON, "directNotifInd");
|
||||||
if (direct_notif_ind) {
|
if (direct_notif_ind) {
|
||||||
|
@ -339,17 +402,24 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_parseFromJSON(cJSON *
|
||||||
ogs_strdup(qm_id->valuestring),
|
ogs_strdup(qm_id->valuestring),
|
||||||
req_qos_mon_paramsList,
|
req_qos_mon_paramsList,
|
||||||
rep_freqsList,
|
rep_freqsList,
|
||||||
|
rep_thresh_dl && cJSON_IsNull(rep_thresh_dl) ? true : false,
|
||||||
rep_thresh_dl ? true : false,
|
rep_thresh_dl ? true : false,
|
||||||
rep_thresh_dl ? rep_thresh_dl->valuedouble : 0,
|
rep_thresh_dl ? rep_thresh_dl->valuedouble : 0,
|
||||||
|
rep_thresh_ul && cJSON_IsNull(rep_thresh_ul) ? true : false,
|
||||||
rep_thresh_ul ? true : false,
|
rep_thresh_ul ? true : false,
|
||||||
rep_thresh_ul ? rep_thresh_ul->valuedouble : 0,
|
rep_thresh_ul ? rep_thresh_ul->valuedouble : 0,
|
||||||
|
rep_thresh_rp && cJSON_IsNull(rep_thresh_rp) ? true : false,
|
||||||
rep_thresh_rp ? true : false,
|
rep_thresh_rp ? true : false,
|
||||||
rep_thresh_rp ? rep_thresh_rp->valuedouble : 0,
|
rep_thresh_rp ? rep_thresh_rp->valuedouble : 0,
|
||||||
|
wait_time && cJSON_IsNull(wait_time) ? true : false,
|
||||||
wait_time ? true : false,
|
wait_time ? true : false,
|
||||||
wait_time ? wait_time->valuedouble : 0,
|
wait_time ? wait_time->valuedouble : 0,
|
||||||
|
rep_period && cJSON_IsNull(rep_period) ? true : false,
|
||||||
rep_period ? true : false,
|
rep_period ? true : false,
|
||||||
rep_period ? rep_period->valuedouble : 0,
|
rep_period ? rep_period->valuedouble : 0,
|
||||||
|
notify_uri && cJSON_IsNull(notify_uri) ? true : false,
|
||||||
notify_uri && !cJSON_IsNull(notify_uri) ? ogs_strdup(notify_uri->valuestring) : NULL,
|
notify_uri && !cJSON_IsNull(notify_uri) ? ogs_strdup(notify_uri->valuestring) : NULL,
|
||||||
|
notify_corre_id && cJSON_IsNull(notify_corre_id) ? true : false,
|
||||||
notify_corre_id && !cJSON_IsNull(notify_corre_id) ? ogs_strdup(notify_corre_id->valuestring) : NULL,
|
notify_corre_id && !cJSON_IsNull(notify_corre_id) ? ogs_strdup(notify_corre_id->valuestring) : NULL,
|
||||||
direct_notif_ind ? true : false,
|
direct_notif_ind ? true : false,
|
||||||
direct_notif_ind ? direct_notif_ind->valueint : 0
|
direct_notif_ind ? direct_notif_ind->valueint : 0
|
||||||
|
|
|
@ -24,17 +24,24 @@ typedef struct OpenAPI_qos_monitoring_data_s {
|
||||||
char *qm_id;
|
char *qm_id;
|
||||||
OpenAPI_list_t *req_qos_mon_params;
|
OpenAPI_list_t *req_qos_mon_params;
|
||||||
OpenAPI_list_t *rep_freqs;
|
OpenAPI_list_t *rep_freqs;
|
||||||
|
bool is_rep_thresh_dl_null;
|
||||||
bool is_rep_thresh_dl;
|
bool is_rep_thresh_dl;
|
||||||
int rep_thresh_dl;
|
int rep_thresh_dl;
|
||||||
|
bool is_rep_thresh_ul_null;
|
||||||
bool is_rep_thresh_ul;
|
bool is_rep_thresh_ul;
|
||||||
int rep_thresh_ul;
|
int rep_thresh_ul;
|
||||||
|
bool is_rep_thresh_rp_null;
|
||||||
bool is_rep_thresh_rp;
|
bool is_rep_thresh_rp;
|
||||||
int rep_thresh_rp;
|
int rep_thresh_rp;
|
||||||
|
bool is_wait_time_null;
|
||||||
bool is_wait_time;
|
bool is_wait_time;
|
||||||
int wait_time;
|
int wait_time;
|
||||||
|
bool is_rep_period_null;
|
||||||
bool is_rep_period;
|
bool is_rep_period;
|
||||||
int rep_period;
|
int rep_period;
|
||||||
|
bool is_notify_uri_null;
|
||||||
char *notify_uri;
|
char *notify_uri;
|
||||||
|
bool is_notify_corre_id_null;
|
||||||
char *notify_corre_id;
|
char *notify_corre_id;
|
||||||
bool is_direct_notif_ind;
|
bool is_direct_notif_ind;
|
||||||
int direct_notif_ind;
|
int direct_notif_ind;
|
||||||
|
@ -44,17 +51,24 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_create(
|
||||||
char *qm_id,
|
char *qm_id,
|
||||||
OpenAPI_list_t *req_qos_mon_params,
|
OpenAPI_list_t *req_qos_mon_params,
|
||||||
OpenAPI_list_t *rep_freqs,
|
OpenAPI_list_t *rep_freqs,
|
||||||
|
bool is_rep_thresh_dl_null,
|
||||||
bool is_rep_thresh_dl,
|
bool is_rep_thresh_dl,
|
||||||
int rep_thresh_dl,
|
int rep_thresh_dl,
|
||||||
|
bool is_rep_thresh_ul_null,
|
||||||
bool is_rep_thresh_ul,
|
bool is_rep_thresh_ul,
|
||||||
int rep_thresh_ul,
|
int rep_thresh_ul,
|
||||||
|
bool is_rep_thresh_rp_null,
|
||||||
bool is_rep_thresh_rp,
|
bool is_rep_thresh_rp,
|
||||||
int rep_thresh_rp,
|
int rep_thresh_rp,
|
||||||
|
bool is_wait_time_null,
|
||||||
bool is_wait_time,
|
bool is_wait_time,
|
||||||
int wait_time,
|
int wait_time,
|
||||||
|
bool is_rep_period_null,
|
||||||
bool is_rep_period,
|
bool is_rep_period,
|
||||||
int rep_period,
|
int rep_period,
|
||||||
|
bool is_notify_uri_null,
|
||||||
char *notify_uri,
|
char *notify_uri,
|
||||||
|
bool is_notify_corre_id_null,
|
||||||
char *notify_corre_id,
|
char *notify_corre_id,
|
||||||
bool is_direct_notif_ind,
|
bool is_direct_notif_ind,
|
||||||
int direct_notif_ind
|
int direct_notif_ind
|
||||||
|
|
|
@ -6,7 +6,9 @@
|
||||||
|
|
||||||
OpenAPI_route_to_location_t *OpenAPI_route_to_location_create(
|
OpenAPI_route_to_location_t *OpenAPI_route_to_location_create(
|
||||||
char *dnai,
|
char *dnai,
|
||||||
|
bool is_route_info_null,
|
||||||
OpenAPI_route_information_t *route_info,
|
OpenAPI_route_information_t *route_info,
|
||||||
|
bool is_route_prof_id_null,
|
||||||
char *route_prof_id
|
char *route_prof_id
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -14,7 +16,9 @@ OpenAPI_route_to_location_t *OpenAPI_route_to_location_create(
|
||||||
ogs_assert(route_to_location_local_var);
|
ogs_assert(route_to_location_local_var);
|
||||||
|
|
||||||
route_to_location_local_var->dnai = dnai;
|
route_to_location_local_var->dnai = dnai;
|
||||||
|
route_to_location_local_var->is_route_info_null = is_route_info_null;
|
||||||
route_to_location_local_var->route_info = route_info;
|
route_to_location_local_var->route_info = route_info;
|
||||||
|
route_to_location_local_var->is_route_prof_id_null = is_route_prof_id_null;
|
||||||
route_to_location_local_var->route_prof_id = route_prof_id;
|
route_to_location_local_var->route_prof_id = route_prof_id;
|
||||||
|
|
||||||
return route_to_location_local_var;
|
return route_to_location_local_var;
|
||||||
|
@ -73,6 +77,11 @@ cJSON *OpenAPI_route_to_location_convertToJSON(OpenAPI_route_to_location_t *rout
|
||||||
ogs_error("OpenAPI_route_to_location_convertToJSON() failed [route_info]");
|
ogs_error("OpenAPI_route_to_location_convertToJSON() failed [route_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (route_to_location->is_route_info_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "routeInfo") == NULL) {
|
||||||
|
ogs_error("OpenAPI_route_to_location_convertToJSON() failed [route_info]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (route_to_location->route_prof_id) {
|
if (route_to_location->route_prof_id) {
|
||||||
|
@ -80,6 +89,11 @@ cJSON *OpenAPI_route_to_location_convertToJSON(OpenAPI_route_to_location_t *rout
|
||||||
ogs_error("OpenAPI_route_to_location_convertToJSON() failed [route_prof_id]");
|
ogs_error("OpenAPI_route_to_location_convertToJSON() failed [route_prof_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
} else if (route_to_location->is_route_prof_id_null) {
|
||||||
|
if (cJSON_AddNullToObject(item, "routeProfId") == NULL) {
|
||||||
|
ogs_error("OpenAPI_route_to_location_convertToJSON() failed [route_prof_id]");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
|
@ -106,24 +120,30 @@ OpenAPI_route_to_location_t *OpenAPI_route_to_location_parseFromJSON(cJSON *rout
|
||||||
|
|
||||||
route_info = cJSON_GetObjectItemCaseSensitive(route_to_locationJSON, "routeInfo");
|
route_info = cJSON_GetObjectItemCaseSensitive(route_to_locationJSON, "routeInfo");
|
||||||
if (route_info) {
|
if (route_info) {
|
||||||
|
if (!cJSON_IsNull(route_info)) {
|
||||||
route_info_local_nonprim = OpenAPI_route_information_parseFromJSON(route_info);
|
route_info_local_nonprim = OpenAPI_route_information_parseFromJSON(route_info);
|
||||||
if (!route_info_local_nonprim) {
|
if (!route_info_local_nonprim) {
|
||||||
ogs_error("OpenAPI_route_information_parseFromJSON failed [route_info]");
|
ogs_error("OpenAPI_route_information_parseFromJSON failed [route_info]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
route_prof_id = cJSON_GetObjectItemCaseSensitive(route_to_locationJSON, "routeProfId");
|
route_prof_id = cJSON_GetObjectItemCaseSensitive(route_to_locationJSON, "routeProfId");
|
||||||
if (route_prof_id) {
|
if (route_prof_id) {
|
||||||
|
if (!cJSON_IsNull(route_prof_id)) {
|
||||||
if (!cJSON_IsString(route_prof_id) && !cJSON_IsNull(route_prof_id)) {
|
if (!cJSON_IsString(route_prof_id) && !cJSON_IsNull(route_prof_id)) {
|
||||||
ogs_error("OpenAPI_route_to_location_parseFromJSON() failed [route_prof_id]");
|
ogs_error("OpenAPI_route_to_location_parseFromJSON() failed [route_prof_id]");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
route_to_location_local_var = OpenAPI_route_to_location_create (
|
route_to_location_local_var = OpenAPI_route_to_location_create (
|
||||||
ogs_strdup(dnai->valuestring),
|
ogs_strdup(dnai->valuestring),
|
||||||
|
route_info && cJSON_IsNull(route_info) ? true : false,
|
||||||
route_info ? route_info_local_nonprim : NULL,
|
route_info ? route_info_local_nonprim : NULL,
|
||||||
|
route_prof_id && cJSON_IsNull(route_prof_id) ? true : false,
|
||||||
route_prof_id && !cJSON_IsNull(route_prof_id) ? ogs_strdup(route_prof_id->valuestring) : NULL
|
route_prof_id && !cJSON_IsNull(route_prof_id) ? ogs_strdup(route_prof_id->valuestring) : NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -21,13 +21,17 @@ extern "C" {
|
||||||
typedef struct OpenAPI_route_to_location_s OpenAPI_route_to_location_t;
|
typedef struct OpenAPI_route_to_location_s OpenAPI_route_to_location_t;
|
||||||
typedef struct OpenAPI_route_to_location_s {
|
typedef struct OpenAPI_route_to_location_s {
|
||||||
char *dnai;
|
char *dnai;
|
||||||
|
bool is_route_info_null;
|
||||||
struct OpenAPI_route_information_s *route_info;
|
struct OpenAPI_route_information_s *route_info;
|
||||||
|
bool is_route_prof_id_null;
|
||||||
char *route_prof_id;
|
char *route_prof_id;
|
||||||
} OpenAPI_route_to_location_t;
|
} OpenAPI_route_to_location_t;
|
||||||
|
|
||||||
OpenAPI_route_to_location_t *OpenAPI_route_to_location_create(
|
OpenAPI_route_to_location_t *OpenAPI_route_to_location_create(
|
||||||
char *dnai,
|
char *dnai,
|
||||||
|
bool is_route_info_null,
|
||||||
OpenAPI_route_information_t *route_info,
|
OpenAPI_route_information_t *route_info,
|
||||||
|
bool is_route_prof_id_null,
|
||||||
char *route_prof_id
|
char *route_prof_id
|
||||||
);
|
);
|
||||||
void OpenAPI_route_to_location_free(OpenAPI_route_to_location_t *route_to_location);
|
void OpenAPI_route_to_location_free(OpenAPI_route_to_location_t *route_to_location);
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue