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

zebra: Remove large indentation level in do_show_route_helper

Browse Source 
CI is complaining about the large level of indentation.
Make it a bit better.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2024-11-04 13:02:36 -05:00
parent f51d2a6b97
commit e88cbd65dd
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
zebra/zebra_vty.c
View File

@ -858,6 +858,27 @@ static void vty_show_ip_route_detail_json(struct vty *vty,
vty_json(vty, json); vty_json(vty, json);
} }
static void zebra_vty_display_vrf_header(struct vty *vty, struct zebra_vrf *zvrf, uint32_t tableid)
{
if (!tableid)
vty_out(vty, "VRF %s:\n", zvrf_name(zvrf));
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);
}
}
}
}
static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf, static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
struct route_table *table, afi_t afi, struct route_table *table, afi_t afi,
bool use_fib, route_tag_t tag, bool use_fib, route_tag_t tag,
@ -937,33 +958,9 @@ static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
} }
if (ctx->multi && ctx->header_done) if (ctx->multi && ctx->header_done)
vty_out(vty, "\n"); vty_out(vty, "\n");
if (ctx->multi || zvrf_id(zvrf) != VRF_DEFAULT if (ctx->multi || zvrf_id(zvrf) != VRF_DEFAULT || tableid)
|| tableid) { zebra_vty_display_vrf_header(vty, zvrf, tableid);
if (!tableid)
vty_out(vty, "VRF %s:\n",
zvrf_name(zvrf));
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; ctx->header_done = true;
first = 0; first = 0;
} }