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

Merge pull request #1236 from donaldsharp/interface_startup

Browse Source 
zebra: Do not allow same rib_dest_t be queued multiple times to meta …
This commit is contained in:
Renato Westphal 2017-09-28 22:04:02 -03:00 committed by GitHub
commit c00ad29fc4
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/rib.h
View File

@ -135,6 +135,8 @@ typedef struct rib_dest_t_ {
} rib_dest_t; } rib_dest_t;
#define RIB_ROUTE_QUEUED(x) (1 << (x)) #define RIB_ROUTE_QUEUED(x) (1 << (x))
// If MQ_SIZE is modified this value needs to be updated.
#define RIB_ROUTE_ANY_QUEUED 0x1F
/* /*
* The maximum qindex that can be used. * The maximum qindex that can be used.

9
zebra/zebra_rib.c
View File

@ -2500,6 +2500,15 @@ static void rib_update_table(struct route_table *table,
* the trigger event. * the trigger event.
*/ */
for (rn = route_top(table); rn; rn = srcdest_route_next(rn)) { for (rn = route_top(table); rn; rn = srcdest_route_next(rn)) {
/*
* If we are looking at a route node and the node
* has already been queued we don't
* need to queue it up again
*/
if (rn->info
&& CHECK_FLAG(rib_dest_from_rnode(rn)->flags,
RIB_ROUTE_ANY_QUEUED))
continue;
switch (event) { switch (event) {
case RIB_UPDATE_IF_CHANGE: case RIB_UPDATE_IF_CHANGE:
/* Examine all routes that won't get processed by the /* Examine all routes that won't get processed by the