proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 02:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgp: fix handling of bgp_process_queue to allow for RNs added

Browse Source 
during callback.  Issue introduced in PR #939.

Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-08-28 18:34:45 -04:00
parent cfe8d15a80
commit ac021f4046
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bgpd/bgp_route.c
View File

@ -2201,18 +2201,20 @@ static wq_item_status bgp_process_wq(struct work_queue *wq, void *data)
struct bgp_process_queue *pqnode = data;
struct bgp *bgp = pqnode->bgp;
struct bgp_table *table;
struct bgp_node *rn, *nrn;
struct bgp_node *rn;
/* eoiu marker */
if (CHECK_FLAG(pqnode->flags, BGP_PROCESS_QUEUE_EOIU_MARKER)) {
bgp_process_main_one(bgp, NULL, 0, 0);
assert(STAILQ_FIRST(&pqnode->pqueue) == NULL); /* should always have dedicated wq call */
return WQ_SUCCESS;
}
STAILQ_FOREACH_SAFE(rn, &pqnode->pqueue, pq, nrn) {
while (!STAILQ_EMPTY(&pqnode->pqueue)) {
rn = STAILQ_FIRST(&pqnode->pqueue);
STAILQ_REMOVE_HEAD(&pqnode->pqueue, pq);
table = bgp_node_table(rn);
/* note, new RNs may be added as part of processing */
bgp_process_main_one(bgp, rn, table->afi, table->safi);
bgp_unlock_node(rn);