proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 07:59:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "vtysh, zebra: Fix malformed json output for multiple vrfs in command 'show ip route vrf all json'"

Browse Source 
This reverts commit 0e2fc3d67f.

This fix was correct but not optimal for memory consumption at scale.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2024-05-24 16:46:17 +02:00
parent 2871a4e8cb
commit 0c6f14ec14
1 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
zebra/zebra_vty.c
View File

@ -60,8 +60,8 @@ struct route_show_ctx {
}; };
static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi, static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
safi_t safi, bool use_fib, json_object *vrf_json, safi_t safi, bool use_fib, bool use_json,
bool use_json, route_tag_t tag, route_tag_t tag,
const struct prefix *longer_prefix_p, const struct prefix *longer_prefix_p,
bool supernets_only, int type, bool supernets_only, int type,
unsigned short ospf_instance_id, uint32_t tableid, unsigned short ospf_instance_id, uint32_t tableid,
@ -153,8 +153,8 @@ DEFPY (show_ip_rpf,
}; };
return do_show_ip_route(vty, VRF_DEFAULT_NAME, ip ? AFI_IP : AFI_IP6, return do_show_ip_route(vty, VRF_DEFAULT_NAME, ip ? AFI_IP : AFI_IP6,
SAFI_MULTICAST, false, NULL, uj, 0, NULL, false, SAFI_MULTICAST, false, uj, 0, NULL, false, 0, 0,
0, 0, 0, false, &ctx); 0, false, &ctx);
} }
DEFPY (show_ip_rpf_addr, DEFPY (show_ip_rpf_addr,
@ -858,13 +858,14 @@ static void vty_show_ip_route_detail_json(struct vty *vty,
vty_json(vty, json); vty_json(vty, json);
} }
static void static void do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
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, bool use_fib, route_tag_t tag,
json_object *vrf_json, route_tag_t tag, const struct prefix *longer_prefix_p,
const struct prefix *longer_prefix_p, bool supernets_only, bool supernets_only, int type,
int type, unsigned short ospf_instance_id, bool use_json, unsigned short ospf_instance_id, bool use_json,
uint32_t tableid, bool show_ng, struct route_show_ctx *ctx) uint32_t tableid, bool show_ng,
struct route_show_ctx *ctx)
{ {
struct route_node *rn; struct route_node *rn;
struct route_entry *re; struct route_entry *re;
@ -886,7 +887,7 @@ do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
* => display the VRF and table if specific * => display the VRF and table if specific
*/ */
if (use_json && !vrf_json) if (use_json)
json = json_object_new_object(); json = json_object_new_object();
/* Show all routes. */ /* Show all routes. */
@ -961,11 +962,7 @@ do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
if (json_prefix) { if (json_prefix) {
prefix2str(&rn->p, buf, sizeof(buf)); prefix2str(&rn->p, buf, sizeof(buf));
if (!vrf_json) json_object_object_add(json, buf, json_prefix);
json_object_object_add(json, buf, json_prefix);
else
json_object_object_add(vrf_json, buf,
json_prefix);
json_prefix = NULL; json_prefix = NULL;
} }
} }
@ -974,15 +971,13 @@ do_show_route_helper(struct vty *vty, struct zebra_vrf *zvrf,
* This is an extremely expensive operation at scale * This is an extremely expensive operation at scale
* and non-pretty reduces memory footprint significantly. * and non-pretty reduces memory footprint significantly.
*/ */
if (use_json && !vrf_json) { if (use_json)
vty_json_no_pretty(vty, json); vty_json_no_pretty(vty, json);
json = NULL;
}
} }
static void do_show_ip_route_all(struct vty *vty, struct zebra_vrf *zvrf, static void do_show_ip_route_all(struct vty *vty, struct zebra_vrf *zvrf,
afi_t afi, bool use_fib, json_object *vrf_json, afi_t afi, bool use_fib, bool use_json,
bool use_json, route_tag_t tag, route_tag_t tag,
const struct prefix *longer_prefix_p, const struct prefix *longer_prefix_p,
bool supernets_only, int type, bool supernets_only, int type,
unsigned short ospf_instance_id, bool show_ng, unsigned short ospf_instance_id, bool show_ng,
@ -1002,15 +997,15 @@ static void do_show_ip_route_all(struct vty *vty, struct zebra_vrf *zvrf,
continue; continue;
do_show_ip_route(vty, zvrf_name(zvrf), afi, SAFI_UNICAST, do_show_ip_route(vty, zvrf_name(zvrf), afi, SAFI_UNICAST,
use_fib, vrf_json, use_json, tag, use_fib, use_json, tag, longer_prefix_p,
longer_prefix_p, supernets_only, type, supernets_only, type, ospf_instance_id,
ospf_instance_id, zrt->tableid, show_ng, ctx); zrt->tableid, show_ng, ctx);
} }
} }
static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi, static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
safi_t safi, bool use_fib, json_object *vrf_json, safi_t safi, bool use_fib, bool use_json,
bool use_json, route_tag_t tag, route_tag_t tag,
const struct prefix *longer_prefix_p, const struct prefix *longer_prefix_p,
bool supernets_only, int type, bool supernets_only, int type,
unsigned short ospf_instance_id, uint32_t tableid, unsigned short ospf_instance_id, uint32_t tableid,
@ -1045,7 +1040,7 @@ static int do_show_ip_route(struct vty *vty, const char *vrf_name, afi_t afi,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
do_show_route_helper(vty, zvrf, table, afi, use_fib, vrf_json, tag, do_show_route_helper(vty, zvrf, table, afi, use_fib, tag,
longer_prefix_p, supernets_only, type, longer_prefix_p, supernets_only, type,
ospf_instance_id, use_json, tableid, show_ng, ctx); ospf_instance_id, use_json, tableid, show_ng, ctx);
@ -1750,7 +1745,6 @@ DEFPY (show_route,
struct route_show_ctx ctx = { struct route_show_ctx ctx = {
.multi = vrf_all || table_all, .multi = vrf_all || table_all,
}; };
json_object *root_json = NULL;
if (!vrf_is_backend_netns()) { if (!vrf_is_backend_netns()) {
if ((vrf_all || vrf_name) && (table || table_all)) { if ((vrf_all || vrf_name) && (table || table_all)) {
@ -1772,42 +1766,25 @@ DEFPY (show_route,
} }
if (vrf_all) { if (vrf_all) {
if (!!json)
root_json = json_object_new_object();
RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
json_object *vrf_json = NULL;
if ((zvrf = vrf->info) == NULL if ((zvrf = vrf->info) == NULL
|| (zvrf->table[afi][SAFI_UNICAST] == NULL)) || (zvrf->table[afi][SAFI_UNICAST] == NULL))
continue; continue;
if (!!json)
vrf_json = json_object_new_object();
if (table_all) if (table_all)
do_show_ip_route_all(vty, zvrf, afi, !!fib, do_show_ip_route_all(vty, zvrf, afi, !!fib,
vrf_json, !!json, tag, !!json, tag,
prefix_str ? prefix : NULL, prefix_str ? prefix : NULL,
!!supernets_only, type, !!supernets_only, type,
ospf_instance_id, !!ng, ospf_instance_id, !!ng,
&ctx); &ctx);
else else
do_show_ip_route(vty, zvrf_name(zvrf), afi, do_show_ip_route(vty, zvrf_name(zvrf), afi,
SAFI_UNICAST, !!fib, vrf_json, SAFI_UNICAST, !!fib, !!json,
!!json, tag, tag, prefix_str ? prefix : NULL,
prefix_str ? prefix : NULL,
!!supernets_only, type, !!supernets_only, type,
ospf_instance_id, table, !!ng, ospf_instance_id, table, !!ng,
&ctx); &ctx);
if (!!json)
json_object_object_add(root_json,
zvrf_name(zvrf),
vrf_json);
}
if (!!json) {
vty_json_no_pretty(vty, root_json);
root_json = NULL;
} }
} else { } else {
vrf_id_t vrf_id = VRF_DEFAULT; vrf_id_t vrf_id = VRF_DEFAULT;
@ -1823,13 +1800,13 @@ DEFPY (show_route,
return CMD_SUCCESS; return CMD_SUCCESS;
if (table_all) if (table_all)
do_show_ip_route_all(vty, zvrf, afi, !!fib, NULL, !!json, do_show_ip_route_all(vty, zvrf, afi, !!fib, !!json, tag,
tag, prefix_str ? prefix : NULL, prefix_str ? prefix : NULL,
!!supernets_only, type, !!supernets_only, type,
ospf_instance_id, !!ng, &ctx); ospf_instance_id, !!ng, &ctx);
else else
do_show_ip_route(vty, vrf->name, afi, SAFI_UNICAST, do_show_ip_route(vty, vrf->name, afi, SAFI_UNICAST,
!!fib, NULL, !!json, tag, !!fib, !!json, tag,
prefix_str ? prefix : NULL, prefix_str ? prefix : NULL,
!!supernets_only, type, !!supernets_only, type,
ospf_instance_id, table, !!ng, &ctx); ospf_instance_id, table, !!ng, &ctx);