mirror of
https://github.com/open5gs/open5gs.git
synced 2026-05-05 15:24:14 +00:00
[Release-17] Upgrade SBI to v17.x.0
This commit is contained in:
parent
969c116e77
commit
4d44b1843e
1687 changed files with 121604 additions and 9310 deletions
|
|
@ -8,7 +8,12 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_create(
|
|||
OpenAPI_list_t *dnn_list,
|
||||
OpenAPI_list_t *ip_domain_list,
|
||||
OpenAPI_list_t *ipv4_address_ranges,
|
||||
OpenAPI_list_t *ipv6_prefix_ranges
|
||||
OpenAPI_list_t *ipv6_prefix_ranges,
|
||||
char *rx_diam_host,
|
||||
char *rx_diam_realm,
|
||||
char *group_id,
|
||||
OpenAPI_list_t *supi_ranges,
|
||||
OpenAPI_list_t *gpsi_ranges
|
||||
)
|
||||
{
|
||||
OpenAPI_bsf_info_t *bsf_info_local_var = ogs_malloc(sizeof(OpenAPI_bsf_info_t));
|
||||
|
|
@ -18,6 +23,11 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_create(
|
|||
bsf_info_local_var->ip_domain_list = ip_domain_list;
|
||||
bsf_info_local_var->ipv4_address_ranges = ipv4_address_ranges;
|
||||
bsf_info_local_var->ipv6_prefix_ranges = ipv6_prefix_ranges;
|
||||
bsf_info_local_var->rx_diam_host = rx_diam_host;
|
||||
bsf_info_local_var->rx_diam_realm = rx_diam_realm;
|
||||
bsf_info_local_var->group_id = group_id;
|
||||
bsf_info_local_var->supi_ranges = supi_ranges;
|
||||
bsf_info_local_var->gpsi_ranges = gpsi_ranges;
|
||||
|
||||
return bsf_info_local_var;
|
||||
}
|
||||
|
|
@ -57,6 +67,32 @@ void OpenAPI_bsf_info_free(OpenAPI_bsf_info_t *bsf_info)
|
|||
OpenAPI_list_free(bsf_info->ipv6_prefix_ranges);
|
||||
bsf_info->ipv6_prefix_ranges = NULL;
|
||||
}
|
||||
if (bsf_info->rx_diam_host) {
|
||||
ogs_free(bsf_info->rx_diam_host);
|
||||
bsf_info->rx_diam_host = NULL;
|
||||
}
|
||||
if (bsf_info->rx_diam_realm) {
|
||||
ogs_free(bsf_info->rx_diam_realm);
|
||||
bsf_info->rx_diam_realm = NULL;
|
||||
}
|
||||
if (bsf_info->group_id) {
|
||||
ogs_free(bsf_info->group_id);
|
||||
bsf_info->group_id = NULL;
|
||||
}
|
||||
if (bsf_info->supi_ranges) {
|
||||
OpenAPI_list_for_each(bsf_info->supi_ranges, node) {
|
||||
OpenAPI_supi_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->supi_ranges);
|
||||
bsf_info->supi_ranges = NULL;
|
||||
}
|
||||
if (bsf_info->gpsi_ranges) {
|
||||
OpenAPI_list_for_each(bsf_info->gpsi_ranges, node) {
|
||||
OpenAPI_identity_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(bsf_info->gpsi_ranges);
|
||||
bsf_info->gpsi_ranges = NULL;
|
||||
}
|
||||
ogs_free(bsf_info);
|
||||
}
|
||||
|
||||
|
|
@ -131,6 +167,59 @@ cJSON *OpenAPI_bsf_info_convertToJSON(OpenAPI_bsf_info_t *bsf_info)
|
|||
}
|
||||
}
|
||||
|
||||
if (bsf_info->rx_diam_host) {
|
||||
if (cJSON_AddStringToObject(item, "rxDiamHost", bsf_info->rx_diam_host) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [rx_diam_host]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
if (bsf_info->rx_diam_realm) {
|
||||
if (cJSON_AddStringToObject(item, "rxDiamRealm", bsf_info->rx_diam_realm) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [rx_diam_realm]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
if (bsf_info->group_id) {
|
||||
if (cJSON_AddStringToObject(item, "groupId", bsf_info->group_id) == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [group_id]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
if (bsf_info->supi_ranges) {
|
||||
cJSON *supi_rangesList = cJSON_AddArrayToObject(item, "supiRanges");
|
||||
if (supi_rangesList == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_for_each(bsf_info->supi_ranges, node) {
|
||||
cJSON *itemLocal = OpenAPI_supi_range_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(supi_rangesList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
if (bsf_info->gpsi_ranges) {
|
||||
cJSON *gpsi_rangesList = cJSON_AddArrayToObject(item, "gpsiRanges");
|
||||
if (gpsi_rangesList == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_for_each(bsf_info->gpsi_ranges, node) {
|
||||
cJSON *itemLocal = OpenAPI_identity_range_convertToJSON(node->data);
|
||||
if (itemLocal == NULL) {
|
||||
ogs_error("OpenAPI_bsf_info_convertToJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
cJSON_AddItemToArray(gpsi_rangesList, itemLocal);
|
||||
}
|
||||
}
|
||||
|
||||
end:
|
||||
return item;
|
||||
}
|
||||
|
|
@ -147,6 +236,13 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON)
|
|||
OpenAPI_list_t *ipv4_address_rangesList = NULL;
|
||||
cJSON *ipv6_prefix_ranges = NULL;
|
||||
OpenAPI_list_t *ipv6_prefix_rangesList = NULL;
|
||||
cJSON *rx_diam_host = NULL;
|
||||
cJSON *rx_diam_realm = NULL;
|
||||
cJSON *group_id = NULL;
|
||||
cJSON *supi_ranges = NULL;
|
||||
OpenAPI_list_t *supi_rangesList = NULL;
|
||||
cJSON *gpsi_ranges = NULL;
|
||||
OpenAPI_list_t *gpsi_rangesList = NULL;
|
||||
dnn_list = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "dnnList");
|
||||
if (dnn_list) {
|
||||
cJSON *dnn_list_local = NULL;
|
||||
|
|
@ -239,11 +335,90 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON)
|
|||
}
|
||||
}
|
||||
|
||||
rx_diam_host = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "rxDiamHost");
|
||||
if (rx_diam_host) {
|
||||
if (!cJSON_IsString(rx_diam_host) && !cJSON_IsNull(rx_diam_host)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [rx_diam_host]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
rx_diam_realm = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "rxDiamRealm");
|
||||
if (rx_diam_realm) {
|
||||
if (!cJSON_IsString(rx_diam_realm) && !cJSON_IsNull(rx_diam_realm)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [rx_diam_realm]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
group_id = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "groupId");
|
||||
if (group_id) {
|
||||
if (!cJSON_IsString(group_id) && !cJSON_IsNull(group_id)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [group_id]");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
supi_ranges = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "supiRanges");
|
||||
if (supi_ranges) {
|
||||
cJSON *supi_ranges_local = NULL;
|
||||
if (!cJSON_IsArray(supi_ranges)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
supi_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(supi_ranges_local, supi_ranges) {
|
||||
if (!cJSON_IsObject(supi_ranges_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [supi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_supi_range_t *supi_rangesItem = OpenAPI_supi_range_parseFromJSON(supi_ranges_local);
|
||||
if (!supi_rangesItem) {
|
||||
ogs_error("No supi_rangesItem");
|
||||
OpenAPI_list_free(supi_rangesList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(supi_rangesList, supi_rangesItem);
|
||||
}
|
||||
}
|
||||
|
||||
gpsi_ranges = cJSON_GetObjectItemCaseSensitive(bsf_infoJSON, "gpsiRanges");
|
||||
if (gpsi_ranges) {
|
||||
cJSON *gpsi_ranges_local = NULL;
|
||||
if (!cJSON_IsArray(gpsi_ranges)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
|
||||
gpsi_rangesList = OpenAPI_list_create();
|
||||
|
||||
cJSON_ArrayForEach(gpsi_ranges_local, gpsi_ranges) {
|
||||
if (!cJSON_IsObject(gpsi_ranges_local)) {
|
||||
ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [gpsi_ranges]");
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_identity_range_t *gpsi_rangesItem = OpenAPI_identity_range_parseFromJSON(gpsi_ranges_local);
|
||||
if (!gpsi_rangesItem) {
|
||||
ogs_error("No gpsi_rangesItem");
|
||||
OpenAPI_list_free(gpsi_rangesList);
|
||||
goto end;
|
||||
}
|
||||
OpenAPI_list_add(gpsi_rangesList, gpsi_rangesItem);
|
||||
}
|
||||
}
|
||||
|
||||
bsf_info_local_var = OpenAPI_bsf_info_create (
|
||||
dnn_list ? dnn_listList : NULL,
|
||||
ip_domain_list ? ip_domain_listList : NULL,
|
||||
ipv4_address_ranges ? ipv4_address_rangesList : NULL,
|
||||
ipv6_prefix_ranges ? ipv6_prefix_rangesList : NULL
|
||||
ipv6_prefix_ranges ? ipv6_prefix_rangesList : NULL,
|
||||
rx_diam_host && !cJSON_IsNull(rx_diam_host) ? ogs_strdup(rx_diam_host->valuestring) : NULL,
|
||||
rx_diam_realm && !cJSON_IsNull(rx_diam_realm) ? ogs_strdup(rx_diam_realm->valuestring) : NULL,
|
||||
group_id && !cJSON_IsNull(group_id) ? ogs_strdup(group_id->valuestring) : NULL,
|
||||
supi_ranges ? supi_rangesList : NULL,
|
||||
gpsi_ranges ? gpsi_rangesList : NULL
|
||||
);
|
||||
|
||||
return bsf_info_local_var;
|
||||
|
|
@ -276,6 +451,20 @@ end:
|
|||
OpenAPI_list_free(ipv6_prefix_rangesList);
|
||||
ipv6_prefix_rangesList = NULL;
|
||||
}
|
||||
if (supi_rangesList) {
|
||||
OpenAPI_list_for_each(supi_rangesList, node) {
|
||||
OpenAPI_supi_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(supi_rangesList);
|
||||
supi_rangesList = NULL;
|
||||
}
|
||||
if (gpsi_rangesList) {
|
||||
OpenAPI_list_for_each(gpsi_rangesList, node) {
|
||||
OpenAPI_identity_range_free(node->data);
|
||||
}
|
||||
OpenAPI_list_free(gpsi_rangesList);
|
||||
gpsi_rangesList = NULL;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue