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

Merge pull request #13386 from donaldsharp/bgp_received_routes

Browse Source 
bgpd: Fix `received-routes detail`
This commit is contained in:
Donatas Abraitis 2023-04-26 11:07:00 +03:00 committed by GitHub
commit 34a8441fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bgpd/bgp_route.c
View File

@ -14277,7 +14277,6 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table,
for (ain = dest->adj_in; ain; ain = ain->next) { for (ain = dest->adj_in; ain; ain = ain->next) {
if (ain->peer != peer) if (ain->peer != peer)
continue; continue;
show_adj_route_header(vty, peer, table, header1, show_adj_route_header(vty, peer, table, header1,
header2, json, json_scode, header2, json, json_scode,
json_ocode, wide, detail); json_ocode, wide, detail);
@ -14328,9 +14327,23 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table,
if (use_json) if (use_json)
json_net = json_net =
json_object_new_object(); json_object_new_object();
struct bgp_path_info bpi;
struct bgp_dest buildit = *dest;
struct bgp_dest *pass_in;
if (route_filtered ||
ret == RMAP_DENY) {
bpi.attr = &attr;
bpi.peer = peer;
buildit.info = &bpi;
pass_in = &buildit;
} else
pass_in = dest;
bgp_show_path_info( bgp_show_path_info(
NULL /* prefix_rd */, dest, vty, NULL, pass_in, vty, bgp, afi,
bgp, afi, safi, json_net, safi, json_net,
BGP_PATH_SHOW_ALL, &display, BGP_PATH_SHOW_ALL, &display,
RPKI_NOT_BEING_USED); RPKI_NOT_BEING_USED);
if (use_json) if (use_json)