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

zebra: display the table identifier along with table and entries

Browse Source 
the table identifier is made visible. this permits to easily know which
table identifier is dumped, or which table that entry belongs to, when
one calls 'show ip route all' command.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2019-07-09 11:49:26 +02:00
parent 16c42fba57
commit 234963a589
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zebra/zebra_vty.c
View File

@ -448,6 +448,9 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
if (re->tag)
json_object_int_add(json_route, "tag", re->tag);
if (re->table)
json_object_int_add(json_route, "table", re->table);
json_object_int_add(json_route, "internalStatus",
re->status);
json_object_int_add(json_route, "internalFlags",
@ -804,7 +807,8 @@ static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
bool use_fib, route_tag_t tag,
const struct prefix *longer_prefix_p,
bool supernets_only, int type,
unsigned short ospf_instance_id, bool use_json)
unsigned short ospf_instance_id, bool use_json,
uint32_t tableid)
{
struct route_node *rn;
struct route_entry *re;
@ -867,10 +871,12 @@ static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
vty_out(vty,
SHOW_ROUTE_V6_HEADER);
if (zvrf_id(zvrf) != VRF_DEFAULT)
if (tableid && tableid != RT_TABLE_MAIN)
vty_out(vty, "\nVRF %s table %u:\n",
zvrf_name(zvrf), tableid);
else if (zvrf_id(zvrf) != VRF_DEFAULT)
vty_out(vty, "\nVRF %s:\n",
zvrf_name(zvrf));
first = 0;
}
}
@ -927,7 +933,7 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
do_show_route_helper(vty, zvrf, table, afi, use_fib, tag,
longer_prefix_p, supernets_only, type,
ospf_instance_id, use_json);
ospf_instance_id, use_json, 0);
return CMD_SUCCESS;
}
@ -950,7 +956,7 @@ DEFPY (show_route_table,
t = zebra_router_find_table(zvrf, table, afi, SAFI_UNICAST);
if (t)
do_show_route_helper(vty, zvrf, t, afi, false, 0, false, false,
0, 0, !!json);
0, 0, !!json, table);
return CMD_SUCCESS;
}
@ -979,7 +985,7 @@ DEFPY (show_route_table_vrf,
t = zebra_router_find_table(zvrf, table, afi, SAFI_UNICAST);
if (t)
do_show_route_helper(vty, zvrf, t, afi, false, 0, false, false,
0, 0, !!json);
0, 0, !!json, table);
return CMD_SUCCESS;
}
@ -1013,11 +1019,10 @@ DEFPY (show_route_all_table_vrf,
continue;
if (zrt->afi != afi || zrt->safi != SAFI_UNICAST)
continue;
if (zrt->table) {
if (zrt->table)
do_show_route_helper(vty, info->zvrf, zrt->table, afi,
false, 0, false, false,
0, 0, !!json);
}
0, 0, !!json, zrt->tableid);
}
return CMD_SUCCESS;
}