proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 03:53:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: fix keys display in show isis database detail json

Browse Source 
Some keys are wrongly displayed at the JSON parent level.

Add the key at the current level.

Fixes: a2cac12a63 ("isisd: Add json to show isis database command.")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2022-09-05 10:34:15 +02:00
parent 9a83c6cf72
commit 9730e604e6
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
isisd/isis_tlvs.c
View File

@ -3202,7 +3202,7 @@ static void format_item_extended_reach(uint16_t mtid, struct isis_item *i,
isis_mtid2str(mtid)); isis_mtid2str(mtid));
if (r->subtlvs) if (r->subtlvs)
format_item_ext_subtlvs(r->subtlvs, NULL, json, format_item_ext_subtlvs(r->subtlvs, NULL, reach_json,
indent + 2, mtid); indent + 2, mtid);
} else { } else {
sbuf_push(buf, indent, "%s Reachability: %s (Metric: %u)", sbuf_push(buf, indent, "%s Reachability: %s (Metric: %u)",
@ -3906,21 +3906,22 @@ static void format_item_extended_ip_reach(uint16_t mtid, struct isis_item *i,
json_object_object_add(json, "ext-ip-reach", array_json); json_object_object_add(json, "ext-ip-reach", array_json);
} }
json_object_array_add(array_json, ext_json); json_object_array_add(array_json, ext_json);
json_object_string_add( json_object_string_add(ext_json, "mt-id",
json, "mt-id", (mtid == ISIS_MT_IPV4_UNICAST)
(mtid == ISIS_MT_IPV4_UNICAST) ? "Extended" : "MT"); ? "Extended"
json_object_string_add( : "MT");
json, "ip-reach", json_object_string_add(ext_json, "ip-reach",
prefix2str(&r->prefix, prefixbuf, sizeof(prefixbuf))); prefix2str(&r->prefix, prefixbuf,
json_object_int_add(json, "ip-reach-metric", r->metric); sizeof(prefixbuf)));
json_object_string_add(json, "down", r->down ? "yes" : ""); json_object_int_add(ext_json, "ip-reach-metric", r->metric);
json_object_string_add(ext_json, "down", r->down ? "yes" : "");
if (mtid != ISIS_MT_IPV4_UNICAST) if (mtid != ISIS_MT_IPV4_UNICAST)
json_object_string_add(json, "mt-name", json_object_string_add(ext_json, "mt-name",
isis_mtid2str(mtid)); isis_mtid2str(mtid));
if (r->subtlvs) { if (r->subtlvs) {
struct json_object *subtlv_json; struct json_object *subtlv_json;
subtlv_json = json_object_new_object(); subtlv_json = json_object_new_object();
json_object_object_add(json, "subtlvs", subtlv_json); json_object_object_add(ext_json, "subtlvs", subtlv_json);
format_subtlvs(r->subtlvs, NULL, subtlv_json, 0); format_subtlvs(r->subtlvs, NULL, subtlv_json, 0);
} }
} else { } else {
@ -4559,7 +4560,8 @@ static void format_item_ipv6_reach(uint16_t mtid, struct isis_item *i,
if (r->subtlvs) { if (r->subtlvs) {
struct json_object *subtlvs_json; struct json_object *subtlvs_json;
subtlvs_json = json_object_new_object(); subtlvs_json = json_object_new_object();
json_object_object_add(json, "subtlvs", subtlvs_json); json_object_object_add(reach_json, "subtlvs",
subtlvs_json);
format_subtlvs(r->subtlvs, NULL, subtlvs_json, 0); format_subtlvs(r->subtlvs, NULL, subtlvs_json, 0);
} }
} else { } else {