diff options
| author | Abhishek N R <abnr@vmware.com> | 2022-08-11 04:22:33 -0700 | 
|---|---|---|
| committer | Abhishek N R <abnr@vmware.com> | 2022-08-14 08:29:11 -0700 | 
| commit | 0148e53f3b1669b2eac40c71da0b2604b64dca7a (patch) | |
| tree | b86b5a5436138b6aa69c5d54291558a055f8f4b7 /pimd/pim_cmd_common.c | |
| parent | 1b6dbdcd1ea31ed5067e7c488df81e85fd6e4d39 (diff) | |
pimd, pim6d: Using ttable for displaying "show ip/ipv6 pim secondary" command output
Signed-off-by: Abhishek N R <abnr@vmware.com>
Diffstat (limited to 'pimd/pim_cmd_common.c')
| -rw-r--r-- | pimd/pim_cmd_common.c | 22 | 
1 files changed, 16 insertions, 6 deletions
diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index f4c92e8f96..3eaa9c8e5c 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -974,9 +974,15 @@ void pim_show_rpf(struct pim_instance *pim, struct vty *vty, json_object *json)  void pim_show_neighbors_secondary(struct pim_instance *pim, struct vty *vty)  {  	struct interface *ifp; +	struct ttable *tt = NULL; +	char *table = NULL; -	vty_out(vty, -		"Interface        Address         Neighbor        Secondary      \n"); +	/* Prepare table. */ +	tt = ttable_new(&ttable_styles[TTSTYLE_BLANK]); +	ttable_add_row(tt, "Interface|Address|Neighbor|Secondary"); +	tt->style.cell.rpad = 2; +	tt->style.corner = '+'; +	ttable_restyle(tt);  	FOR_ALL_INTERFACES (pim->vrf, ifp) {  		struct pim_interface *pim_ifp; @@ -1004,12 +1010,16 @@ void pim_show_neighbors_secondary(struct pim_instance *pim, struct vty *vty)  			for (ALL_LIST_ELEMENTS_RO(neigh->prefix_list,  						  prefix_node, p)) -				vty_out(vty, -					"%-16s %-15pPAs %-15pPAs %-15pFX\n", -					ifp->name, &ifaddr, &neigh->source_addr, -					p); +				ttable_add_row(tt, "%s|%pPAs|%pPAs|%pFX", +					       ifp->name, &ifaddr, +					       &neigh->source_addr, p);  		}  	} +	/* Dump the generated table. */ +	table = ttable_dump(tt, "\n"); +	vty_out(vty, "%s\n", table); +	XFREE(MTYPE_TMP, table); +	ttable_del(tt);  }  void pim_show_state(struct pim_instance *pim, struct vty *vty,  | 
