Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

KRT: Fix setting default preference

Browse source 
Changes in commit eb937358 broke setting of channel preference for alien
routes learned during scan. The preference was set only for async routes.
Move common attribute processing part of functions krt_learn_async() and
krt_learn_async() to a separate function to have only one place for such
changes.
This commit is contained in:
Alexander Zubkov 2022-09-21 17:07:11 +02:00 committed by Maria Matejka
parent c73343de67
commit 0f2be469f8
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sysdep/unix/krt.c
View file

@ -318,6 +318,15 @@ krt_learn_announce_delete(struct krt_proto *p, net *n)
rte_update(&p->p, n->n.addr, NULL); rte_update(&p->p, n->n.addr, NULL);
} }
static void
krt_learn_alien_attr(struct channel *c, rte *e)
{
ASSERT(!e->attrs->cached);
e->attrs->pref = c->preference;
e->attrs = rta_lookup(e->attrs);
}
/* Called when alien route is discovered during scan */ /* Called when alien route is discovered during scan */
static void static void
krt_learn_scan(struct krt_proto *p, rte *e) krt_learn_scan(struct krt_proto *p, rte *e)
@ -326,7 +335,7 @@ krt_learn_scan(struct krt_proto *p, rte *e)
net *n = net_get(p->krt_table, n0->n.addr); net *n = net_get(p->krt_table, n0->n.addr);
rte *m, **mm; rte *m, **mm;
e->attrs = rta_lookup(e->attrs); krt_learn_alien_attr(p->p.main_channel, e);
for(mm=&n->routes; m = *mm; mm=&m->next) for(mm=&n->routes; m = *mm; mm=&m->next)
if (krt_same_key(m, e)) if (krt_same_key(m, e))
@ -438,10 +447,7 @@ krt_learn_async(struct krt_proto *p, rte *e, int new)
net *n = net_get(p->krt_table, n0->n.addr); net *n = net_get(p->krt_table, n0->n.addr);
rte *g, **gg, *best, **bestp, *old_best; rte *g, **gg, *best, **bestp, *old_best;
ASSERT(!e->attrs->cached); krt_learn_alien_attr(p->p.main_channel, e);
e->attrs->pref = p->p.main_channel->preference;
e->attrs = rta_lookup(e->attrs);
old_best = n->routes; old_best = n->routes;
for(gg=&n->routes; g = *gg; gg = &g->next) for(gg=&n->routes; g = *gg; gg = &g->next)