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: bmp, handle imported bgp instances in bmp_process

Browse source 
Modify the bmp_process() function to export the route update information
to all BMP instances importing it.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2024-09-20 13:47:17 +02:00
parent f8a6933111
commit ee605d80ab
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
bgpd/bgp_bmp.c
View file

@ -54,6 +54,7 @@ static int bmp_route_update_bgpbmp(struct bmp_targets *bt, afi_t afi, safi_t saf
struct bgp_dest *bn, struct bgp_path_info *old_route, struct bgp_dest *bn, struct bgp_path_info *old_route,
struct bgp_path_info *new_route); struct bgp_path_info *new_route);
static void bmp_send_all_bgp(struct peer *peer, bool down); static void bmp_send_all_bgp(struct peer *peer, bool down);
static struct bmp_imported_bgp *bmp_imported_bgp_find(struct bmp_targets *bt, char *name);
DEFINE_MGROUP(BMP, "BMP (BGP Monitoring Protocol)"); DEFINE_MGROUP(BMP, "BMP (BGP Monitoring Protocol)");
@ -1681,9 +1682,12 @@ bmp_process_one(struct bmp_targets *bt, struct bmp_qhash_head *updhash,
static int bmp_process(struct bgp *bgp, afi_t afi, safi_t safi, static int bmp_process(struct bgp *bgp, afi_t afi, safi_t safi,
struct bgp_dest *bn, struct peer *peer, bool withdraw) struct bgp_dest *bn, struct peer *peer, bool withdraw)
{ {
struct bmp_bgp *bmpbgp = bmp_bgp_find(peer->bgp); struct bmp_bgp *bmpbgp;
struct bmp_targets *bt; struct bmp_targets *bt;
struct bmp *bmp; struct bmp *bmp;
struct bgp *bgp_vrf;
struct listnode *node;
struct bmp_queue_entry *last_item;
if (frrtrace_enabled(frr_bgp, bmp_process)) { if (frrtrace_enabled(frr_bgp, bmp_process)) {
char pfxprint[PREFIX2STR_BUFFER]; char pfxprint[PREFIX2STR_BUFFER];
@ -1693,31 +1697,34 @@ static int bmp_process(struct bgp *bgp, afi_t afi, safi_t safi,
withdraw); withdraw);
} }
if (!bmpbgp) for (ALL_LIST_ELEMENTS_RO(bm->bgp, node, bgp_vrf)) {
return 0; bmpbgp = bmp_bgp_find(bgp_vrf);
if (!bmpbgp)
frr_each(bmp_targets, &bmpbgp->targets, bt) {
/* check if any monitoring is enabled (ignoring loc-rib since it
* uses another hook & queue
*/
if (!CHECK_FLAG(bt->afimon[afi][safi], ~BMP_MON_LOC_RIB))
continue; continue;
frr_each (bmp_targets, &bmpbgp->targets, bt) {
/* check if any monitoring is enabled (ignoring loc-rib since it
* uses another hook & queue
*/
if (!CHECK_FLAG(bt->afimon[afi][safi], ~BMP_MON_LOC_RIB))
continue;
struct bmp_queue_entry *last_item = if (bgp_vrf != peer->bgp && !bmp_imported_bgp_find(bt, peer->bgp->name))
bmp_process_one(bt, &bt->updhash, &bt->updlist, bgp, continue;
afi, safi, bn, peer);
/* if bmp_process_one returns NULL last_item = bmp_process_one(bt, &bt->updhash, &bt->updlist, bgp, afi, safi,
* we don't have anything to do next bn, peer);
*/ /* if bmp_process_one returns NULL
if (!last_item) * we don't have anything to do next
continue; */
if (!last_item)
continue;
frr_each(bmp_session, &bt->sessions, bmp) { frr_each (bmp_session, &bt->sessions, bmp) {
if (!bmp->queuepos) if (!bmp->queuepos)
bmp->queuepos = last_item; bmp->queuepos = last_item;
pullwr_bump(bmp->pullwr); pullwr_bump(bmp->pullwr);
}
} }
} }
return 0; return 0;