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

Merge pull request #17757 from FRRouting/mergify/bp/stable/10.0/pr-17732

Browse Source 
isisd: Show correct level information for `show isis interface detail json` (backport #17732)
This commit is contained in:
Mark Stapp 2025-01-03 10:10:22 -05:00 committed by GitHub
commit ae3d2f08de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
isisd/isis_circuit.c
View File

@ -1006,45 +1006,40 @@ void isis_circuit_print_json(struct isis_circuit *circuit,
circuit_t2string(level)); circuit_t2string(level));
if (circuit->area->newmetric) if (circuit->area->newmetric)
json_object_int_add(level_json, "metric", json_object_int_add(level_json, "metric",
circuit->te_metric[0]); circuit->te_metric[level - 1]);
else else
json_object_int_add(level_json, "metric", json_object_int_add(level_json, "metric",
circuit->metric[0]); circuit->metric[level - 1]);
if (!circuit->is_passive) { if (!circuit->is_passive) {
json_object_int_add(level_json, json_object_int_add(level_json, "active-neighbors",
"active-neighbors", circuit->upadjcount[level - 1]);
circuit->upadjcount[0]); json_object_int_add(level_json, "hello-interval",
json_object_int_add(level_json, circuit->hello_interval[level - 1]);
"hello-interval",
circuit->hello_interval[0]);
hold_json = json_object_new_object(); hold_json = json_object_new_object();
json_object_object_add(level_json, "holddown", json_object_object_add(level_json, "holddown",
hold_json); hold_json);
json_object_int_add( json_object_int_add(hold_json, "count",
hold_json, "count", circuit->hello_multiplier[level - 1]);
circuit->hello_multiplier[0]);
json_object_string_add( json_object_string_add(
hold_json, "pad", hold_json, "pad",
isis_hello_padding2string( isis_hello_padding2string(
circuit->pad_hellos)); circuit->pad_hellos));
json_object_int_add(level_json, "cnsp-interval", json_object_int_add(level_json, "cnsp-interval",
circuit->csnp_interval[0]); circuit->csnp_interval[level - 1]);
json_object_int_add(level_json, "psnp-interval", json_object_int_add(level_json, "psnp-interval",
circuit->psnp_interval[0]); circuit->psnp_interval[level - 1]);
if (circuit->circ_type == CIRCUIT_T_BROADCAST) { if (circuit->circ_type == CIRCUIT_T_BROADCAST) {
lan_prio_json = lan_prio_json =
json_object_new_object(); json_object_new_object();
json_object_object_add(level_json, json_object_object_add(level_json,
"lan", "lan",
lan_prio_json); lan_prio_json);
json_object_int_add( json_object_int_add(lan_prio_json, "priority",
lan_prio_json, "priority", circuit->priority[level - 1]);
circuit->priority[0]); json_object_string_add(lan_prio_json, "is-dis",
json_object_string_add( (circuit->u.bc.is_dr[level - 1]
lan_prio_json, "is-dis", ? "yes"
(circuit->u.bc.is_dr[0] : "no"));
? "yes"
: "no"));
} }
} }
json_object_array_add(levels_json, level_json); json_object_array_add(levels_json, level_json);