diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-12-07 14:03:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 14:03:59 +0100 |
| commit | 1b97fa99769bf75752dc1cd898794e82ad11ece8 (patch) | |
| tree | 2efa77d6c6e7ced676fb04f98f5699443698cdf2 /bgpd/bgp_route.c | |
| parent | Merge pull request #12339 from anlancs/fix/bgpd-null-show (diff) | |
| parent | bgpd: Adopt addpath functionality for labeled-unicast (diff) | |
| download | frr-1b97fa99769bf75752dc1cd898794e82ad11ece8.tar.xz frr-1b97fa99769bf75752dc1cd898794e82ad11ece8.zip | |
Merge pull request #12456 from opensourcerouting/fix/bgpd_labeled_unicast_rr_addpath
bgpd: Labeled unicast fixes for addpath capability
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 9fb8d7cfe..427997fe2 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -2086,11 +2086,9 @@ bool subgroup_announce_check(struct bgp_dest *dest, struct bgp_path_info *pi, /* If this is not the bestpath then check to see if there is an enabled * addpath * feature that requires us to advertise it */ - if (!CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)) { - if (!bgp_addpath_tx_path(peer->addpath_type[afi][safi], pi)) { + if (!CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)) + if (!bgp_addpath_capable(pi, peer, afi, safi)) return false; - } - } /* Aggregate-address suppress check. */ if (bgp_path_suppressed(pi) && !UNSUPPRESS_MAP_NAME(filter)) @@ -9736,8 +9734,13 @@ void route_vty_out_tmp(struct vty *vty, struct bgp_dest *dest, } } if (use_json) { + struct bgp_path_info *bpi = bgp_dest_get_bgp_path_info(dest); + json_object_boolean_true_add(json_status, "*"); json_object_boolean_true_add(json_status, ">"); + + if (bpi && CHECK_FLAG(bpi->flags, BGP_PATH_MULTIPATH)) + json_object_boolean_true_add(json_status, "="); json_object_object_add(json_net, "appliedStatusSymbols", json_status); json_object_object_addf(json_ar, json_net, "%pFX", p); |