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

Merge pull request #6161 from qlyoung/fix-bsm-json-keys

Browse Source 
pimd: fix BSM JSON keys
This commit is contained in:
Donatas Abraitis 2020-04-06 10:37:32 +03:00 committed by GitHub
commit b71f5218db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pimd/pim_cmd.c
View File

@ -3319,12 +3319,9 @@ static void pim_show_statistics(struct pim_instance *pim, struct vty *vty,
if (uj) { if (uj) {
json = json_object_new_object(); json = json_object_new_object();
json_object_int_add(json, "Number of Received BSMs", json_object_int_add(json, "bsmRx", pim->bsm_rcvd);
pim->bsm_rcvd); json_object_int_add(json, "bsmTx", pim->bsm_sent);
json_object_int_add(json, "Number of Forwared BSMs", json_object_int_add(json, "bsmDropped", pim->bsm_dropped);
pim->bsm_sent);
json_object_int_add(json, "Number of Dropped BSMs",
pim->bsm_dropped);
} else { } else {
vty_out(vty, "BSM Statistics :\n"); vty_out(vty, "BSM Statistics :\n");
vty_out(vty, "----------------\n"); vty_out(vty, "----------------\n");
@ -3366,15 +3363,13 @@ static void pim_show_statistics(struct pim_instance *pim, struct vty *vty,
json_row = json_object_new_object(); json_row = json_object_new_object();
json_object_string_add(json_row, "If Name", ifp->name); json_object_string_add(json_row, "If Name", ifp->name);
json_object_int_add(json_row, "bsmDroppedConfig",
pim_ifp->pim_ifstat_bsm_cfg_miss);
json_object_int_add( json_object_int_add(
json_row, json_row, "bsmDroppedUnicast",
"Number of BSMs dropped due to config miss",
pim_ifp->pim_ifstat_bsm_cfg_miss);
json_object_int_add(
json_row, "Number of unicast BSMs dropped",
pim_ifp->pim_ifstat_ucast_bsm_cfg_miss); pim_ifp->pim_ifstat_ucast_bsm_cfg_miss);
json_object_int_add(json_row, json_object_int_add(json_row,
"Number of BSMs dropped due to invalid scope zone", "bsmDroppedInvalidScopeZone",
pim_ifp->pim_ifstat_bsm_invalid_sz); pim_ifp->pim_ifstat_bsm_invalid_sz);
json_object_object_add(json, ifp->name, json_row); json_object_object_add(json, ifp->name, json_row);
} }
@ -3776,11 +3771,11 @@ static void pim_show_bsr(struct pim_instance *pim,
json_object_string_add(json, "bsr", bsr_str); json_object_string_add(json, "bsr", bsr_str);
json_object_int_add(json, "priority", json_object_int_add(json, "priority",
pim->global_scope.current_bsr_prio); pim->global_scope.current_bsr_prio);
json_object_int_add(json, "fragment_tag", json_object_int_add(json, "fragmentTag",
pim->global_scope.bsm_frag_tag); pim->global_scope.bsm_frag_tag);
json_object_string_add(json, "state", bsr_state); json_object_string_add(json, "state", bsr_state);
json_object_string_add(json, "upTime", uptime); json_object_string_add(json, "upTime", uptime);
json_object_string_add(json, "last_bsm_seen", last_bsm_seen); json_object_string_add(json, "lastBsmSeen", last_bsm_seen);
} }
else { else {