mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-14 02:17:04 +00:00
Code Releases Activity

KRT: Fix route learning

Browse Source 
This is a reimplementation of commit 0f2be469f897b6d9f925563bbf522438c83522ea
by Alexander Zubkov. In the master branch, changes in commit eb937358
broke setting of channel preference for alien routes learned during
scan. The preference was set only for async routes.

The original solution is extended here to accomodate for v3 specifics.
This commit is contained in:
Maria Matejka 2022-09-27 12:17:05 +02:00
parent 69d1ffde4c
commit 57a34d466e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysdep/unix/krt.c
View File

@ -313,14 +313,22 @@ krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
rte_update(p->p.main_channel, n, NULL, p->p.main_source);
}
static struct rte_storage *
krt_store_async(struct krt_proto *p, net *n, rte *e)
{
ASSERT(!e->attrs->cached);
e->attrs->pref = p->p.main_channel->preference;
e->src = p->p.main_source;
return rte_store(e, n, p->krt_table);
}
/* Called when alien route is discovered during scan */
static void
krt_learn_scan(struct krt_proto *p, rte *e)
{
net *n = net_get(p->krt_table, e->net);
struct rte_storage *m, **mm;
struct rte_storage *ee = rte_store(e, n, p->krt_table);
struct rte_storage *ee = krt_store_async(p, n, e);
for(mm = &n->routes; m = *mm; mm = &m->next)
if (krt_same_key(&m->rte, e))
@ -431,11 +439,7 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
{
net *n = net_get(p->krt_table, e->net);
struct rte_storage *g, **gg, *best, **bestp, *old_best;
ASSERT(!e->attrs->cached);
e->attrs->pref = p->p.main_channel->preference;
struct rte_storage *ee = rte_store(e, n, p->krt_table);
struct rte_storage *ee = krt_store_async(p, n, e);
old_best = n->routes;
for(gg=&n->routes; g = *gg; gg = &g->next)