From 636632c32f4024d35427e6b3c77a481c89f7e26b Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Tue, 6 Sep 2022 11:49:48 +0300 Subject: [PATCH] bgpd: Reuse prep_for_rmap_apply() when applying route-map for show cmd Include extra path attributes. Signed-off-by: Donatas Abraitis --- bgpd/bgp_route.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index f042d0bd95..bf82e10096 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -11145,13 +11145,14 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi, if (type == bgp_show_type_route_map) { struct route_map *rmap = output_arg; struct bgp_path_info path; - struct attr dummy_attr; + struct bgp_path_info_extra extra; + struct attr dummy_attr = {}; route_map_result_t ret; dummy_attr = *pi->attr; - path.peer = pi->peer; - path.attr = &dummy_attr; + prep_for_rmap_apply(&path, &extra, dest, pi, + pi->peer, &dummy_attr); ret = route_map_apply(rmap, dest_p, &path); bgp_attr_flush(&dummy_attr); -- 2.39.5