Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

bgpd: update bmp bgp labels

Browse source 
Signed-off-by: Maxence Younsi <mx.yns@outlook.fr>
(cherry picked from commit 706e774fc7)

Conflicts:
	bgpd/bgp_bmp.c

Signed-off-by: Loïc Sang <loic.sang@6wind.com>
This commit is contained in:
Maxence Younsi 2024-11-05 10:49:39 +01:00 committed by Loïc Sang
parent 83e04597f2
commit c9e05b98d3
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bgpd/bgp_bmp.c
View file

@ -1621,6 +1621,7 @@ static int bmp_monitor_rib_out_pre_updgrp_walkcb(struct update_group *updgrp, vo
struct peer_af *paf;
uint32_t addpath_tx_id;
struct bgp_path_info *bpi = ctx->bpi;
uint8_t bpi_num_labels = BGP_PATH_INFO_NUM_LABELS(bpi);
UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) {
struct attr dummy_attr = { 0 };
@ -1640,8 +1641,8 @@ static int bmp_monitor_rib_out_pre_updgrp_walkcb(struct update_group *updgrp, vo
bmp_get_peer_type(PAF_PEER(paf)),
bgp_dest_get_prefix(ctx->dest), ctx->prd, ctx->attr,
SUBGRP_AFI(subgrp), SUBGRP_SAFI(subgrp), addpath_tx_id,
(time_t)(-1L), bpi->extra ? bpi->extra->labels->label : NULL,
bpi->extra ? bpi->extra->labels->num_labels : 0);
(time_t)(-1L), bpi_num_labels ? bpi->extra->labels->label : NULL,
bpi_num_labels);
*ctx->written_ref = true;
}
@ -1693,6 +1694,7 @@ static int bmp_monitor_rib_out_post_updgrp_walkcb(struct update_group *updgrp, v
struct attr *advertised_attr;
uint32_t addpath_tx_id;
struct bgp_path_info *bpi = ctx->bpi;
uint8_t bpi_num_labels = BGP_PATH_INFO_NUM_LABELS(bpi);
UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) {
addpath_tx_id =
@ -1714,8 +1716,8 @@ static int bmp_monitor_rib_out_post_updgrp_walkcb(struct update_group *updgrp, v
bmp_get_peer_type(PAF_PEER(paf)), ctx->pfx, ctx->prd,
advertised_attr, SUBGRP_AFI(subgrp), SUBGRP_SAFI(subgrp),
addpath_tx_id, (time_t)(-1L),
bpi->extra ? bpi->extra->labels->label : NULL,
bpi->extra ? bpi->extra->labels->num_labels : 0);
bpi_num_labels ? bpi->extra->labels->label : NULL,
bpi_num_labels);
*ctx->written_ref = true;
}
@ -2062,6 +2064,7 @@ static bool bmp_wrqueue_locrib(struct bmp *bmp, struct pullwr *pullwr)
struct peer *peer;
struct bgp_dest *bn = NULL;
bool written = false;
uint8_t bpi_num_labels;
bqe = bmp_pull_locrib(bmp);
if (!bqe)
@ -2094,8 +2097,7 @@ static bool bmp_wrqueue_locrib(struct bmp *bmp, struct pullwr *pullwr)
/* retrieve info about the selected path
*/
bool is_vpn = (bqe->afi == AFI_L2VPN && bqe->safi == SAFI_EVPN) ||
(bqe->safi == SAFI_MPLS_VPN);
bool is_vpn = (afi == AFI_L2VPN && safi == SAFI_EVPN) || (safi == SAFI_MPLS_VPN);
struct prefix_rd *prd = is_vpn ? &bqe->rd : NULL;
@ -2108,13 +2110,15 @@ static bool bmp_wrqueue_locrib(struct bmp *bmp, struct pullwr *pullwr)
if (bpi->peer != peer || bpi->addpath_rx_id != addpath_rx_id)
continue;
bpi_num_labels = BGP_PATH_INFO_NUM_LABELS(bpi);
/* rib-in post-policy configured and path is valid */
if (CHECK_FLAG(flags, BMP_MON_IN_POSTPOLICY) &&
CHECK_FLAG(bpi->flags, BGP_PATH_VALID)) {
bmp_monitor(bmp, peer, BMP_PEER_FLAG_L, bmp_get_peer_type(peer), &bqe->p,
prd, bpi->attr, afi, safi, addpath_rx_id, bpi->uptime,
bpi && bpi->extra ? bpi->extra->labels->label : NULL,
bpi && bpi->extra ? bpi->extra->labels->num_labels : 0);
bpi_num_labels ? bpi->extra->labels->label : NULL,
bpi_num_labels);
ribin = bpi;
written = true;
}
@ -2122,8 +2126,6 @@ static bool bmp_wrqueue_locrib(struct bmp *bmp, struct pullwr *pullwr)
/* loc-rib configured and path is selected */
if (CHECK_FLAG(flags, BMP_MON_LOC_RIB) &&
CHECK_FLAG(bpi->flags, BGP_PATH_SELECTED | BGP_PATH_MULTIPATH)) {
uint8_t bpi_num_labels = BGP_PATH_INFO_NUM_LABELS(bpi);
bmp_monitor(bmp, peer, 0, BMP_PEER_TYPE_LOC_RIB_INSTANCE, &bqe->p, prd,
bpi->attr, afi, safi, addpath_rx_id,
bpi->extra ? bpi->extra->bgp_rib_uptime : (time_t)(-1L),