proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 22:52:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Replace prefix2str for JSON to %pFX

Browse Source 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2021-11-25 17:30:36 +02:00
parent d63f3ff7cc
commit a6c8642429
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/plist.c
View File

@ -1021,10 +1021,9 @@ static void vty_show_prefix_entry(struct vty *vty, json_object *json, afi_t afi,
json_object_string_add( json_object_string_add(
json_entry, "type", json_entry, "type",
prefix_list_type_str(pentry)); prefix_list_type_str(pentry));
json_object_string_add( json_object_string_addf(json_entry, "prefix",
json_entry, "prefix", "%pFX",
prefix2str(&pentry->prefix, buf, &pentry->prefix);
sizeof(buf)));
if (pentry->ge) if (pentry->ge)
json_object_int_add( json_object_int_add(

8
lib/srv6.c
View File

@ -161,12 +161,10 @@ void srv6_locator_chunk_free(struct srv6_locator_chunk *chunk)
json_object *srv6_locator_chunk_json(const struct srv6_locator_chunk *chunk) json_object *srv6_locator_chunk_json(const struct srv6_locator_chunk *chunk)
{ {
char str[256];
json_object *jo_root = NULL; json_object *jo_root = NULL;
jo_root = json_object_new_object(); jo_root = json_object_new_object();
prefix2str(&chunk->prefix, str, sizeof(str)); json_object_string_addf(jo_root, "prefix", "%pFX", &chunk->prefix);
json_object_string_add(jo_root, "prefix", str);
json_object_string_add(jo_root, "proto", json_object_string_add(jo_root, "proto",
zebra_route_string(chunk->proto)); zebra_route_string(chunk->proto));
@ -175,7 +173,6 @@ json_object *srv6_locator_chunk_json(const struct srv6_locator_chunk *chunk)
json_object *srv6_locator_json(const struct srv6_locator *loc) json_object *srv6_locator_json(const struct srv6_locator *loc)
{ {
char str[256];
struct listnode *node; struct listnode *node;
struct srv6_locator_chunk *chunk; struct srv6_locator_chunk *chunk;
json_object *jo_root = NULL; json_object *jo_root = NULL;
@ -188,8 +185,7 @@ json_object *srv6_locator_json(const struct srv6_locator *loc)
json_object_string_add(jo_root, "name", loc->name); json_object_string_add(jo_root, "name", loc->name);
/* set prefix */ /* set prefix */
prefix2str(&loc->prefix, str, sizeof(str)); json_object_string_addf(jo_root, "prefix", "%pFX", &loc->prefix);
json_object_string_add(jo_root, "prefix", str);
/* set function_bits_length */ /* set function_bits_length */
json_object_int_add(jo_root, "functionBitsLength", json_object_int_add(jo_root, "functionBitsLength",