mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 10:11:53 +00:00
Code Releases Activity

Table prune routines request export announcements directly

Browse Source
This commit is contained in:
Maria Matejka 2021-12-01 16:21:35 +00:00
parent 7092bdc0c9
commit 5f94d684d0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nest/rt-table.c
View File

@ -1498,8 +1498,6 @@ rte_recalculate(rtable_private *table, struct rt_import_hook *c, net *net, rte *
rte_announce(table, net, new_stored, old_stored, rte_announce(table, net, new_stored, old_stored,
net->routes, old_best_stored); net->routes, old_best_stored);
ev_send(req->list, c->export_announce_event);
if (!net->routes && if (!net->routes &&
(table->gc_counter++ >= table->config->gc_max_ops) && (table->gc_counter++ >= table->config->gc_max_ops) &&
(table->gc_time + table->config->gc_min_time <= current_time())) (table->gc_time + table->config->gc_min_time <= current_time()))
@ -1653,6 +1651,11 @@ rte_import(struct rt_import_request *req, const net_addr *n, rte *new, struct rt
/* And recalculate the best route */ /* And recalculate the best route */
rte_recalculate(tab, hook, nn, new, src); rte_recalculate(tab, hook, nn, new, src);
/* Schedule export announcement */
ev_send(req->list, hook->export_announce_event);
/* Done! */
RT_UNLOCK(tab); RT_UNLOCK(tab);
} }
@ -2318,6 +2321,7 @@ again:
{ {
FIB_ITERATE_PUT(fit); FIB_ITERATE_PUT(fit);
ev_send_loop(tab->loop, tab->prune_event); ev_send_loop(tab->loop, tab->prune_event);
ev_send_loop(tab->loop, tab->announce_event);
rt_unlock_table(tab); rt_unlock_table(tab);
return; return;
} }
@ -2371,6 +2375,7 @@ again:
if (EMPTY_LIST(tab->exports) && flushed_channels) if (EMPTY_LIST(tab->exports) && flushed_channels)
rt_export_cleanup(tab); rt_export_cleanup(tab);
ev_send_loop(tab->loop, tab->announce_event);
rt_unlock_table(tab); rt_unlock_table(tab);
} }