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

Merge pull request #7646 from volta-networks/fix_show_route_summary

Browse Source 
zebra: fix show ip route vrf X summary
This commit is contained in:
Donald Sharp 2020-12-02 08:59:54 -05:00 committed by GitHub
commit fe76cf322e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zebra/zebra_vty.c
View File

@ -1963,9 +1963,6 @@ DEFPY (show_route_summary,
struct route_table *table;
bool uj = use_json(argc, argv);
if (table_id == 0)
table_id = RT_TABLE_MAIN;
if (vrf_all) {
struct vrf *vrf;
struct zebra_vrf *zvrf;
@ -1974,8 +1971,13 @@ DEFPY (show_route_summary,
if ((zvrf = vrf->info) == NULL)
continue;
table = zebra_vrf_lookup_table_with_table_id(
afi, SAFI_UNICAST, zvrf->vrf->vrf_id, table_id);
if (table_id == 0)
table = zebra_vrf_table(afi, SAFI_UNICAST,
zvrf->vrf->vrf_id);
else
table = zebra_vrf_lookup_table_with_table_id(
afi, SAFI_UNICAST, zvrf->vrf->vrf_id,
table_id);
if (!table)
continue;
@ -1992,8 +1994,11 @@ DEFPY (show_route_summary,
if (vrf_name)
VRF_GET_ID(vrf_id, vrf_name, false);
table = zebra_vrf_lookup_table_with_table_id(afi, SAFI_UNICAST,
vrf_id, table_id);
if (table_id == 0)
table = zebra_vrf_table(afi, SAFI_UNICAST, vrf_id);
else
table = zebra_vrf_lookup_table_with_table_id(
afi, SAFI_UNICAST, vrf_id, table_id);
if (!table)
return CMD_SUCCESS;