mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Merge commit '4364ee' into tmp-bad-learn

Browse Source
This commit is contained in:
Maria Matejka
2022-09-27 12:46:22 +02:00
parent 32a67c93eb 4364ee9b6f
commit 9be7aa9b45
27 changed files with 338 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sysdep/unix/krt.c
View File

@@ -286,7 +286,7 @@ static struct tbf rl_alien = TBF_DEFAULT_LOG_LIMITS;
static inline u32
krt_metric(rte *a)
{
eattr *ea = ea_find(a->attrs->eattrs, &ea_krt_metric);
eattr *ea = ea_find(a->attrs, &ea_krt_metric);
return ea ? ea->u.data : 0;
}
@@ -306,7 +306,7 @@ static void
krt_learn_announce_update(struct krt_proto *p, rte *e)
{
rte e0 = {
.attrs = rta_clone(e->attrs),
.attrs = ea_clone(e->attrs),
.src = p->p.main_source,
};
@@ -322,8 +322,7 @@ krt_learn_announce_delete(struct krt_proto *p, net_addr *n)
static struct rte_storage *
krt_store_async(struct krt_proto *p, net *n, rte *e)
{
ASSERT(!e->attrs->cached);
ea_set_attr_u32(&e->attrs->eattrs, &ea_gen_preference, 0, p->p.main_channel->preference);
ea_set_attr_u32(&e->attrs, &ea_gen_preference, 0, p->p.main_channel->preference);
e->src = p->p.main_source;
return rte_store(e, n, p->krt_table);
}
@@ -620,10 +619,10 @@ reject:
static int
krt_same_dest(rte *k, rte *e)
{
rta *ka = k->attrs, *ea = e->attrs;
ea_list *ka = k->attrs, *ea = e->attrs;
eattr *nhea_k = ea_find(ka->eattrs, &ea_gen_nexthop);
eattr *nhea_e = ea_find(ea->eattrs, &ea_gen_nexthop);
eattr *nhea_k = ea_find(ka, &ea_gen_nexthop);
eattr *nhea_e = ea_find(ea, &ea_gen_nexthop);
return (!nhea_k == !nhea_e) && adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
}