From 09047d2bf614d7794fb855923caa94cbfeb94ceb Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 10 Jan 2024 15:26:05 +0100 Subject: pceplib: add json string option to subgroup counter The created counters in pceplib library are structures with a string attribute which is used for further display. This string information is not formatted for json output. Add a second option in the create_subgroup_counter() creation API to provide the json attribute output. Create a json naming compatible with caml format for each subgroup counter used. Signed-off-by: Philippe Guibert --- pceplib/pcep_utils_counters.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pceplib/pcep_utils_counters.c') diff --git a/pceplib/pcep_utils_counters.c b/pceplib/pcep_utils_counters.c index badef9351a..1ab341c69c 100644 --- a/pceplib/pcep_utils_counters.c +++ b/pceplib/pcep_utils_counters.c @@ -139,7 +139,8 @@ clone_counters_subgroup(struct counters_subgroup *subgroup, if (counter != NULL) { create_subgroup_counter(cloned_subgroup, counter->counter_id, - counter->counter_name); + counter->counter_name, + counter->counter_name_json); } } @@ -180,7 +181,8 @@ bool add_counters_subgroup(struct counters_group *group, } bool create_subgroup_counter(struct counters_subgroup *subgroup, - uint32_t counter_id, const char *counter_name) + uint32_t counter_id, const char *counter_name, + const char *counter_name_json) { if (subgroup == NULL) { pcep_log( @@ -212,7 +214,9 @@ bool create_subgroup_counter(struct counters_subgroup *subgroup, counter->counter_id = counter_id; strlcpy(counter->counter_name, counter_name, sizeof(counter->counter_name)); - + if (counter_name_json) + strlcpy(counter->counter_name_json, counter_name_json, + sizeof(counter->counter_name_json)); subgroup->num_counters++; subgroup->counters[counter->counter_id] = counter; -- cgit v1.2.3