diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-04-26 11:07:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-26 11:07:00 +0300 |
| commit | 34a8441fe8bb5777c9c450d2ba0dfc6bd33fd2c9 (patch) | |
| tree | 0a02b675b62656448bc32323208f07bc46317440 /bgpd | |
| parent | 13c426150fd4699466306d88a917df6493faf9bd (diff) | |
| parent | 24dede9b3022e11a4031bb3566206416145a53da (diff) | |
Merge pull request #13386 from donaldsharp/bgp_received_routes
bgpd: Fix `received-routes detail`
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_route.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index f2ee50ee19..2cea525320 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -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) { if (ain->peer != peer) continue; - show_adj_route_header(vty, peer, table, header1, header2, json, json_scode, json_ocode, wide, detail); @@ -14328,9 +14327,23 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table, if (use_json) json_net = 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( - NULL /* prefix_rd */, dest, vty, - bgp, afi, safi, json_net, + NULL, pass_in, vty, bgp, afi, + safi, json_net, BGP_PATH_SHOW_ALL, &display, RPKI_NOT_BEING_USED); if (use_json) |