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

Merge pull request #12577 from louis-6wind/fix-bgp-evpn-all

Browse Source 
bgpd: fix show bgp all with evpn
This commit is contained in:
Donatas Abraitis 2023-01-11 14:20:16 +02:00 committed by GitHub
commit 01dbc4b384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bgpd/bgp_evpn_vty.c
View File

@ -3192,6 +3192,21 @@ static void evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
} }
} }
int bgp_evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
bool use_json, int detail)
{
json_object *json = NULL;
if (use_json)
json = json_object_new_object();
evpn_show_all_routes(vty, bgp, type, json, detail);
if (use_json)
vty_json(vty, json);
return CMD_SUCCESS;
}
/* /*
* Display specified VNI (vty handler) * Display specified VNI (vty handler)
*/ */

3
bgpd/bgp_evpn_vty.h
View File

@ -42,4 +42,7 @@ extern int argv_find_and_parse_oly_idx(struct cmd_token **argv, int argc,
extern int bgp_evpn_cli_parse_type(int *type, struct cmd_token **argv, extern int bgp_evpn_cli_parse_type(int *type, struct cmd_token **argv,
int argc); int argc);
extern int bgp_evpn_show_all_routes(struct vty *vty, struct bgp *bgp, int type,
bool use_json, int detail);
#endif /* _QUAGGA_BGP_EVPN_VTY_H */ #endif /* _QUAGGA_BGP_EVPN_VTY_H */

3
bgpd/bgp_route.c
View File

@ -11812,6 +11812,9 @@ static int bgp_show(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
1, NULL, NULL); 1, NULL, NULL);
} }
if (safi == SAFI_EVPN)
return bgp_evpn_show_all_routes(vty, bgp, type, use_json, 0);
return bgp_show_table(vty, bgp, safi, table, type, output_arg, NULL, 1, return bgp_show_table(vty, bgp, safi, table, type, output_arg, NULL, 1,
NULL, NULL, &json_header_depth, show_flags, NULL, NULL, &json_header_depth, show_flags,
rpki_target_state); rpki_target_state);