proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 11:44:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

Browse Source
This commit is contained in:
Donald Sharp 2016-02-24 15:06:58 -05:00
commit 51b9c0cc9e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zebra/zebra_vty.c
View File

@ -1885,6 +1885,7 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib)
int recursing; int recursing;
int len = 0; int len = 0;
char buf[BUFSIZ]; char buf[BUFSIZ];
struct zebra_vrf *zvrf;
/* Nexthop information. */ /* Nexthop information. */
for (ALL_NEXTHOPS_RO(rib->nexthop, nexthop, tnexthop, recursing)) for (ALL_NEXTHOPS_RO(rib->nexthop, nexthop, tnexthop, recursing))
@ -1910,7 +1911,10 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib)
rib->metric); rib->metric);
if (rib->vrf_id != VRF_DEFAULT) if (rib->vrf_id != VRF_DEFAULT)
len += vty_out (vty, " [vrf %u]", rib->vrf_id); {
zvrf = vrf_info_lookup(rib->vrf_id);
len += vty_out (vty, " [vrf %s/table %u]", zvrf->name, zvrf->table_id);
}
} }
else else
vty_out (vty, " %c%*c", vty_out (vty, " %c%*c",
@ -2544,9 +2548,9 @@ vty_show_ip_route_summary (struct vty *vty, struct route_table *table)
} }
} }
vty_out (vty, "%-20s %-20s %s (vrf %u)%s", vty_out (vty, "%-20s %-20s %s (vrf %s)%s",
"Route Source", "Routes", "FIB", "Route Source", "Routes", "FIB",
((rib_table_info_t *)table->info)->zvrf->vrf_id, ((rib_table_info_t *)table->info)->zvrf->name,
VTY_NEWLINE); VTY_NEWLINE);
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++)