paulmataruso/open5gs
1
0
Fork 0
mirror of https://github.com/open5gs/open5gs.git synced 2025-11-13 02:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

array is added

Browse Source
This commit is contained in:
Sukchan Lee
2017-11-28 13:44:44 +09:00
parent 1528568bb8
commit c4b86f5ee9
2 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/yaml_helper.c
View File

@@ -129,6 +129,10 @@ const char *yaml_iter_value(yaml_iter_t *iter)
d_assert(iter->document, return NULL,); d_assert(iter->document, return NULL,);
d_assert(iter->node, return NULL,); d_assert(iter->node, return NULL,);
if (iter->node->type == YAML_SCALAR_NODE)
{
return (const char *)iter->node->data.scalar.value;
}
if (iter->node->type == YAML_MAPPING_NODE) if (iter->node->type == YAML_MAPPING_NODE)
{ {
yaml_node_t *node = NULL; yaml_node_t *node = NULL;
@@ -140,8 +144,19 @@ const char *yaml_iter_value(yaml_iter_t *iter)
return (const char *)node->data.scalar.value; return (const char *)node->data.scalar.value;
} }
else if (iter->node->type == YAML_SEQUENCE_NODE)
{
yaml_node_t *node = NULL;
d_assert(iter->item, return NULL,);
node = yaml_document_get_node(iter->document, *iter->item);
d_assert(node, return NULL,);
d_assert(node->type == YAML_SCALAR_NODE, return NULL,);
return (const char *)node->data.scalar.value;
}
else else
d_assert(0, return NULL,"type = %d\n", iter->node->type); d_assert(0, return NULL,);
} }
int yaml_iter_bool(yaml_iter_t *iter) int yaml_iter_bool(yaml_iter_t *iter)

58
src/mme/mme_context.c
View File

@@ -1029,39 +1029,59 @@ status_t mme_context_parse_config()
d_assert(gummei_key, return CORE_ERROR,); d_assert(gummei_key, return CORE_ERROR,);
if (!strcmp(gummei_key, "plmn_id")) if (!strcmp(gummei_key, "plmn_id"))
{ {
yaml_iter_t plmn_id_array, plmn_id_iter;
yaml_iter_recurse(&gummei_iter, &plmn_id_array);
while(yaml_iter_next(&plmn_id_array))
{
if (yaml_iter_type(&plmn_id_array)
== YAML_MAPPING_NODE)
memcpy(&plmn_id_iter, &plmn_id_array,
sizeof(yaml_iter_t));
else if (yaml_iter_type(&plmn_id_array) ==
YAML_SEQUENCE_NODE)
{
yaml_iter_recurse(&plmn_id_array,
&plmn_id_iter);
d_assert(yaml_iter_next(&plmn_id_iter),
return CORE_ERROR,);
}
else
d_assert(0, return CORE_ERROR,);
do
{
const char *plmn_id_key =
yaml_iter_key(&plmn_id_iter);
d_assert(plmn_id_key,
return CORE_ERROR,);
printf("plmn_id_ley = %s\n",
plmn_id_key);
} while(
yaml_iter_type(&plmn_id_array) ==
YAML_SEQUENCE_NODE &&
yaml_iter_next(&plmn_id_iter));
}
} }
else if (!strcmp(gummei_key, "mme_gid")) else if (!strcmp(gummei_key, "mme_gid"))
{ {
#if 0 yaml_iter_t mme_gid_iter;
yaml_iter_t mme_gid_array, mme_gid_iter; yaml_iter_recurse(&gummei_iter, &mme_gid_iter);
yaml_iter_recurse(&gummei_iter, &mme_gid_array); d_assert(yaml_iter_type(&mme_gid_iter) !=
YAML_MAPPING_NODE, return CORE_ERROR,);
if (yaml_iter_type(&mme_gid_array) == if (yaml_iter_type(&mme_gid_iter) ==
YAML_SCALAR_NODE)
memcpy(&mme_gid_iter, &mme_gid_array,
sizeof(yaml_iter_t));
else if (yaml_iter_type(&mme_gid_array) ==
YAML_SEQUENCE_NODE) YAML_SEQUENCE_NODE)
{
yaml_iter_recurse(&mme_gid_array,
&mme_gid_iter);
d_assert(yaml_iter_next(&mme_gid_iter), d_assert(yaml_iter_next(&mme_gid_iter),
return CORE_ERROR,); return CORE_ERROR,);
}
else
d_assert(0, return CORE_ERROR,);
do do
{ {
const char *v = const char *v = yaml_iter_value(
yaml_iter_value(&mme_gid_iter); &mme_gid_iter);
printf("v = %s\n", v); printf("v = %s\n", v);
} while( } while(
yaml_iter_type(&mme_gid_array) == yaml_iter_type(&mme_gid_iter) ==
YAML_SEQUENCE_NODE && YAML_SEQUENCE_NODE &&
yaml_iter_next(&mme_gid_iter)); yaml_iter_next(&mme_gid_iter));
#endif
} }
} while( } while(
yaml_iter_type(&gummei_array) == yaml_iter_type(&gummei_array) ==