mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-03-22 06:17:04 +00:00
Merge commit '0f2be469' into thread-next
This commit is contained in:
commit
d2d83c4777
@ -302,6 +302,12 @@ krt_uptodate(rte *a, rte *b)
|
|||||||
return (a->attrs == b->attrs);
|
return (a->attrs == b->attrs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
krt_learn_alien_attr(struct channel *c, rte *e)
|
||||||
|
{
|
||||||
|
ea_set_attr_u32(&e->attrs, &ea_gen_preference, 0, c->preference);
|
||||||
|
}
|
||||||
|
|
||||||
/* 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)
|
||||||
@ -311,7 +317,7 @@ krt_learn_scan(struct krt_proto *p, rte *e)
|
|||||||
.src = rt_get_source(&p->p, krt_metric(e)),
|
.src = rt_get_source(&p->p, krt_metric(e)),
|
||||||
};
|
};
|
||||||
|
|
||||||
ea_set_attr_u32(&e0.attrs, &ea_gen_preference, 0, p->p.main_channel->preference);
|
krt_learn_alien_attr(p->p.main_channel, &e0);
|
||||||
|
|
||||||
rte_update(p->p.main_channel, e->net, &e0, e0.src);
|
rte_update(p->p.main_channel, e->net, &e0, e0.src);
|
||||||
rt_unlock_source(e0.src);
|
rt_unlock_source(e0.src);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user