sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[SBI] Change discovery option TAI from array to single item (#2725) 

According to 3GPP TS 29.510, the search parameter "tai" should be a
single item, not an array of items.

TS 29.510: Table 6.2.3.2.3.1-1:
URI query parameters supported by the GET method on this resource

Revert "[SBI] Change discovery option TAI from array to single item"

This reverts commit b4beff1ae16c64b3c6d84d8bdb47c36e19b705f2.

wip
This commit is contained in:
Bostjan Meglic 2023-11-22 12:37:06 +01:00 committed by GitHub
parent 18b1095697
commit adcdcf6426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 56 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/sbi/context.c
View File

@ -1970,9 +1970,9 @@ bool ogs_sbi_discovery_option_is_matched(
&discovery_option->snssais[0], &discovery_option->snssais[0],
discovery_option->dnn) == false) discovery_option->dnn) == false)
return false; return false;
if (discovery_option->num_of_tai && if (discovery_option->tai_presence &&
ogs_sbi_check_smf_info_tai(&nf_info->smf, ogs_sbi_check_smf_info_tai(&nf_info->smf,
&discovery_option->tai[0]) == false) &discovery_option->tai) == false)
return false; return false;
break; break;
default: default:

96
lib/sbi/message.c
View File

@ -445,17 +445,16 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message)
ogs_sbi_header_set(request->http.params, ogs_sbi_header_set(request->http.params,
OGS_SBI_PARAM_DNN, discovery_option->dnn); OGS_SBI_PARAM_DNN, discovery_option->dnn);
} }
if (discovery_option->num_of_tai) { if (discovery_option->tai_presence) {
char *v = ogs_sbi_discovery_option_build_tai(discovery_option); char *v = ogs_sbi_discovery_option_build_tai(discovery_option);
if (v) { if (v) {
ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_TAI, v); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_TAI, v);
ogs_free(v); ogs_free(v);
} else { } else {
ogs_error("build failed: tai(%d)[PLMN_ID:%06x,TAC:%d]", ogs_error("build failed: tai[PLMN_ID:%06x,TAC:%d]",
discovery_option->num_of_tai,
ogs_plmn_id_hexdump( ogs_plmn_id_hexdump(
&discovery_option->tai[0].plmn_id), &discovery_option->tai.plmn_id),
discovery_option->tai[0].tac.v); discovery_option->tai.tac.v);
} }
} }
@ -3105,62 +3104,49 @@ void ogs_sbi_discovery_option_parse_snssais(
ogs_free(v); ogs_free(v);
} }
void ogs_sbi_discovery_option_add_tai( void ogs_sbi_discovery_option_set_tai(
ogs_sbi_discovery_option_t *discovery_option, ogs_5gs_tai_t *tai) ogs_sbi_discovery_option_t *discovery_option, ogs_5gs_tai_t *tai)
{ {
ogs_assert(discovery_option); ogs_assert(discovery_option);
ogs_assert(tai); ogs_assert(tai);
ogs_assert(discovery_option->num_of_tai < OGS_MAX_NUM_OF_TAI); ogs_assert(discovery_option->tai_presence == false);
memcpy(&discovery_option->tai[discovery_option->num_of_tai], memcpy(&discovery_option->tai, tai, sizeof(ogs_5gs_tai_t));
tai, sizeof(ogs_5gs_tai_t)); discovery_option->tai_presence = true;
discovery_option->num_of_tai++;
} }
char *ogs_sbi_discovery_option_build_tai( char *ogs_sbi_discovery_option_build_tai(
ogs_sbi_discovery_option_t *discovery_option) ogs_sbi_discovery_option_t *discovery_option)
{ {
cJSON *item = NULL; OpenAPI_tai_t Tai;
cJSON *taiItem = NULL;
char *v = NULL; char *v = NULL;
int i;
ogs_assert(discovery_option); ogs_assert(discovery_option);
ogs_assert(discovery_option->tai_presence);
item = cJSON_CreateArray(); memset(&Tai, 0, sizeof(Tai));
if (!item) {
ogs_error("cJSON_CreateArray() failed");
return NULL;
}
for (i = 0; i < discovery_option->num_of_tai; i++) { Tai.plmn_id = ogs_sbi_build_plmn_id(&discovery_option->tai.plmn_id);
OpenAPI_tai_t Tai; ogs_assert(Tai.plmn_id);
cJSON *taiItem = NULL; Tai.tac = ogs_uint24_to_0string(discovery_option->tai.tac);
ogs_assert(Tai.tac);
memset(&Tai, 0, sizeof(Tai)); taiItem = OpenAPI_tai_convertToJSON(&Tai);
ogs_assert(taiItem);
Tai.plmn_id = ogs_sbi_build_plmn_id(&discovery_option->tai[i].plmn_id); ogs_sbi_free_plmn_id(Tai.plmn_id);
ogs_assert(Tai.plmn_id); ogs_free(Tai.tac);
Tai.tac = ogs_uint24_to_0string(discovery_option->tai[i].tac);
ogs_assert(Tai.tac);
taiItem = OpenAPI_tai_convertToJSON(&Tai); v = cJSON_PrintUnformatted(taiItem);
ogs_assert(taiItem);
cJSON_AddItemToArray(item, taiItem);
ogs_sbi_free_plmn_id(Tai.plmn_id);
ogs_free(Tai.tac);
}
v = cJSON_PrintUnformatted(item);
ogs_expect(v); ogs_expect(v);
cJSON_Delete(item); cJSON_Delete(taiItem);
return v; return v;
} }
void ogs_sbi_discovery_option_parse_tai( void ogs_sbi_discovery_option_parse_tai(
ogs_sbi_discovery_option_t *discovery_option, char *tai) ogs_sbi_discovery_option_t *discovery_option, char *tai)
{ {
cJSON *item = NULL;
cJSON *taiItem = NULL; cJSON *taiItem = NULL;
char *v = NULL; char *v = NULL;
@ -3173,39 +3159,37 @@ void ogs_sbi_discovery_option_parse_tai(
return; return;
} }
item = cJSON_Parse(v); taiItem = cJSON_Parse(v);
if (!item) { if (!taiItem) {
ogs_error("Cannot parse tai[%s]", tai); ogs_error("Cannot parse tai[%s]", tai);
ogs_free(v); ogs_free(v);
return; return;
} }
cJSON_ArrayForEach(taiItem, item) { if (cJSON_IsObject(taiItem)) {
if (cJSON_IsObject(taiItem)) { OpenAPI_tai_t *Tai = OpenAPI_tai_parseFromJSON(taiItem);
OpenAPI_tai_t *Tai = OpenAPI_tai_parseFromJSON(taiItem);
if (Tai) { if (Tai) {
ogs_5gs_tai_t tai; ogs_5gs_tai_t tai;
memset(&tai, 0, sizeof(tai)); memset(&tai, 0, sizeof(tai));
if (Tai->plmn_id) if (Tai->plmn_id)
ogs_sbi_parse_plmn_id(&tai.plmn_id, Tai->plmn_id); ogs_sbi_parse_plmn_id(&tai.plmn_id, Tai->plmn_id);
if (Tai->tac) if (Tai->tac)
tai.tac = ogs_uint24_from_string(Tai->tac); tai.tac = ogs_uint24_from_string(Tai->tac);
ogs_sbi_discovery_option_add_tai(discovery_option, &tai); ogs_sbi_discovery_option_set_tai(discovery_option, &tai);
OpenAPI_tai_free(Tai); OpenAPI_tai_free(Tai);
} else {
ogs_error("OpenAPI_snssai_parseFromJSON() failed : tai[%s]",
tai);
}
} else { } else {
ogs_error("Invalid cJSON Type in snssias[%s]", tai); ogs_error("OpenAPI_snssai_parseFromJSON() failed : tai[%s]",
tai);
} }
} else {
ogs_error("Invalid cJSON Type in snssias[%s]", tai);
} }
cJSON_Delete(item); cJSON_Delete(taiItem);
ogs_free(v); ogs_free(v);
} }

6
lib/sbi/message.h
View File

@ -428,8 +428,8 @@ typedef struct ogs_sbi_discovery_option_s {
int num_of_snssais; int num_of_snssais;
ogs_s_nssai_t snssais[OGS_MAX_NUM_OF_SLICE]; ogs_s_nssai_t snssais[OGS_MAX_NUM_OF_SLICE];
char *dnn; char *dnn;
int num_of_tai; bool tai_presence;
ogs_5gs_tai_t tai[OGS_MAX_NUM_OF_TAI]; ogs_5gs_tai_t tai;
int num_of_target_plmn_list; int num_of_target_plmn_list;
ogs_plmn_id_t target_plmn_list[OGS_MAX_NUM_OF_PLMN]; ogs_plmn_id_t target_plmn_list[OGS_MAX_NUM_OF_PLMN];
@ -641,7 +641,7 @@ char *ogs_sbi_discovery_option_build_snssais(
void ogs_sbi_discovery_option_parse_snssais( void ogs_sbi_discovery_option_parse_snssais(
ogs_sbi_discovery_option_t *discovery_option, char *snssais); ogs_sbi_discovery_option_t *discovery_option, char *snssais);
void ogs_sbi_discovery_option_add_tai( void ogs_sbi_discovery_option_set_tai(
ogs_sbi_discovery_option_t *discovery_option, ogs_5gs_tai_t *tai); ogs_sbi_discovery_option_t *discovery_option, ogs_5gs_tai_t *tai);
char *ogs_sbi_discovery_option_build_tai( char *ogs_sbi_discovery_option_build_tai(
ogs_sbi_discovery_option_t *discovery_option); ogs_sbi_discovery_option_t *discovery_option);

9
lib/sbi/path.c
View File

@ -338,7 +338,7 @@ int ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact)
OGS_SBI_CUSTOM_DISCOVERY_DNN, discovery_option->dnn); OGS_SBI_CUSTOM_DISCOVERY_DNN, discovery_option->dnn);
} }
if (discovery_option && discovery_option->num_of_tai) { if (discovery_option && discovery_option->tai_presence) {
bool rc = false; bool rc = false;
char *v = ogs_sbi_discovery_option_build_tai(discovery_option); char *v = ogs_sbi_discovery_option_build_tai(discovery_option);
ogs_expect(v); ogs_expect(v);
@ -358,11 +358,10 @@ int ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact)
} }
if (rc == false) if (rc == false)
ogs_error("build failed: tai(%d)[PLMN_ID:%06x,TAC:%d]", ogs_error("build failed: tai[PLMN_ID:%06x,TAC:%d]",
discovery_option->num_of_tai,
ogs_plmn_id_hexdump( ogs_plmn_id_hexdump(
&discovery_option->tai[0].plmn_id), &discovery_option->tai.plmn_id),
discovery_option->tai[0].tac.v); discovery_option->tai.tac.v);
} }
if (discovery_option && if (discovery_option &&

2
src/amf/gmm-handler.c
View File

@ -1256,7 +1256,7 @@ int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue,
ogs_sbi_discovery_option_add_snssais( ogs_sbi_discovery_option_add_snssais(
discovery_option, &sess->s_nssai); discovery_option, &sess->s_nssai);
ogs_sbi_discovery_option_set_dnn(discovery_option, sess->dnn); ogs_sbi_discovery_option_set_dnn(discovery_option, sess->dnn);
ogs_sbi_discovery_option_add_tai( ogs_sbi_discovery_option_set_tai(
discovery_option, &amf_ue->nr_tai); discovery_option, &amf_ue->nr_tai);
nf_instance = sess->sbi. nf_instance = sess->sbi.

2
src/amf/nnssf-handler.c
View File

@ -95,7 +95,7 @@ int amf_nnssf_nsselection_handle_get(
ogs_sbi_discovery_option_add_snssais(discovery_option, &sess->s_nssai); ogs_sbi_discovery_option_add_snssais(discovery_option, &sess->s_nssai);
ogs_sbi_discovery_option_set_dnn(discovery_option, sess->dnn); ogs_sbi_discovery_option_set_dnn(discovery_option, sess->dnn);
ogs_sbi_discovery_option_add_tai(discovery_option, &amf_ue->nr_tai); ogs_sbi_discovery_option_set_tai(discovery_option, &amf_ue->nr_tai);
if (sess->nssf.nrf.id) if (sess->nssf.nrf.id)
ogs_free(sess->nssf.nrf.id); ogs_free(sess->nssf.nrf.id);

11
src/nrf/nnrf-handler.c
View File

@ -824,12 +824,11 @@ bool nrf_nnrf_handle_nf_discover(
if (discovery_option->dnn) { if (discovery_option->dnn) {
ogs_debug("dnn[%s]", discovery_option->dnn); ogs_debug("dnn[%s]", discovery_option->dnn);
} }
if (discovery_option->num_of_tai) { if (discovery_option->tai_presence) {
for (i = 0; i < discovery_option->num_of_tai; i++) ogs_debug("tai[PLMN_ID:%06x,TAC:%d]",
ogs_debug("[%d] tai[PLMN_ID:%06x,TAC:%d]", i, ogs_plmn_id_hexdump(
ogs_plmn_id_hexdump( &discovery_option->tai.plmn_id),
&discovery_option->tai[0].plmn_id), discovery_option->tai.tac.v);
discovery_option->tai[0].tac.v);
} }
if (discovery_option->num_of_target_plmn_list) { if (discovery_option->num_of_target_plmn_list) {
for (i = 0; i < discovery_option->num_of_target_plmn_list; i++) for (i = 0; i < discovery_option->num_of_target_plmn_list; i++)