matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: Don't display the vrf if not using namespace based vrfs

Browse source 
Currently when doing a `show ip route table XXXX`, zebra is displaying
the current default vrf as the vrf we are in.  We are displaying a
table not a vrf.  This is only true if you are not using namespace
based vrf's, so modify the output to display accordingly.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-09-05 09:11:04 -04:00
parent 960462aade
commit f51d2a6b97
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
zebra/table_manager.h
View file

@ -24,6 +24,7 @@ extern "C" {
#if !defined(GNU_LINUX)
/* BSD systems
*/
#define RT_TABLE_ID_MAIN 0
#else
/* Linux Systems
*/

2
zebra/zebra_vrf.c
View file

@ -398,6 +398,7 @@ vrf_id_t zebra_vrf_lookup_by_table(uint32_t table_id, ns_id_t ns_id)
RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) {
zvrf = vrf->info;
if (zvrf == NULL)
continue;
/* case vrf with netns : match the netnsid */
@ -408,6 +409,7 @@ vrf_id_t zebra_vrf_lookup_by_table(uint32_t table_id, ns_id_t ns_id)
/* VRF is VRF_BACKEND_VRF_LITE */
if (zvrf->table_id != table_id)
continue;
return zvrf_id(zvrf);
}
}

26
zebra/zebra_vty.c
View file

@ -942,11 +942,27 @@ static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
if (!tableid)
vty_out(vty, "VRF %s:\n",
zvrf_name(zvrf));
else
vty_out(vty,
"VRF %s table %u:\n",
zvrf_name(zvrf),
tableid);
else {
if (vrf_is_backend_netns())
vty_out(vty, "VRF %s table %u:\n",
zvrf_name(zvrf), tableid);
else {
vrf_id_t vrf =
zebra_vrf_lookup_by_table(tableid,
zvrf->zns->ns_id);
if (vrf == VRF_DEFAULT &&
tableid != RT_TABLE_ID_MAIN)
vty_out(vty, "table %u:\n", tableid);
else {
struct zebra_vrf *zvrf2 =
zebra_vrf_lookup_by_id(vrf);
vty_out(vty, "VRF %s table %u:\n",
zvrf_name(zvrf2), tableid);
}
}
}
}
ctx->header_done = true;
first = 0;