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

pimd, pim6d: Using ttable for displaying "show ip/ipv6 pim rpf" command output.

Browse Source 
Signed-off-by: Abhishek N R <abnr@vmware.com>
This commit is contained in:
Abhishek N R 2022-08-11 04:10:00 -07:00
parent 0b368b50dd
commit 1b6dbdcd1e
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pimd/pim_cmd_common.c
View File

@ -888,6 +888,8 @@ void pim_show_rpf(struct pim_instance *pim, struct vty *vty, json_object *json)
{ {
struct pim_upstream *up; struct pim_upstream *up;
time_t now = pim_time_monotonic_sec(); time_t now = pim_time_monotonic_sec();
struct ttable *tt = NULL;
char *table = NULL;
json_object *json_group = NULL; json_object *json_group = NULL;
json_object *json_row = NULL; json_object *json_row = NULL;
@ -895,8 +897,15 @@ void pim_show_rpf(struct pim_instance *pim, struct vty *vty, json_object *json)
if (!json) { if (!json) {
vty_out(vty, "\n"); vty_out(vty, "\n");
vty_out(vty,
"Source Group RpfIface RpfAddress RibNextHop Metric Pref\n"); /* Prepare table. */
tt = ttable_new(&ttable_styles[TTSTYLE_BLANK]);
ttable_add_row(
tt,
"Source|Group|RpfIface|RpfAddress|RibNextHop|Metric|Pref");
tt->style.cell.rpad = 2;
tt->style.corner = '+';
ttable_restyle(tt);
} }
frr_each (rb_pim_upstream, &pim->upstream_head, up) { frr_each (rb_pim_upstream, &pim->upstream_head, up) {
@ -944,8 +953,8 @@ void pim_show_rpf(struct pim_instance *pim, struct vty *vty, json_object *json)
json_object_object_add(json_group, src_str, json_row); json_object_object_add(json_group, src_str, json_row);
} else { } else {
vty_out(vty, ttable_add_row(
"%-15pPAs %-15pPAs %-16s %-15pPA %-15pPAs %6d %4d\n", tt, "%pPAs|%pPAs|%s|%pPA|%pPAs|%d|%d",
&up->sg.src, &up->sg.grp, rpf_ifname, &up->sg.src, &up->sg.grp, rpf_ifname,
&rpf->rpf_addr, &rpf->rpf_addr,
&rpf->source_nexthop.mrib_nexthop_addr, &rpf->source_nexthop.mrib_nexthop_addr,
@ -953,6 +962,13 @@ void pim_show_rpf(struct pim_instance *pim, struct vty *vty, json_object *json)
rpf->source_nexthop.mrib_metric_preference); rpf->source_nexthop.mrib_metric_preference);
} }
} }
/* Dump the generated table. */
if (!json) {
table = ttable_dump(tt, "\n");
vty_out(vty, "%s\n", table);
XFREE(MTYPE_TMP, table);
ttable_del(tt);
}
} }
void pim_show_neighbors_secondary(struct pim_instance *pim, struct vty *vty) void pim_show_neighbors_secondary(struct pim_instance *pim, struct vty *vty)