mirror of
https://gitlab.labs.nic.cz/labs/bird.git
synced 2024-05-11 16:54:54 +00:00
Merge commit '950775f6fa3d569a9d7cd05e33538d35e895d688' into haugesund
There were quite a lot of conflicts in flowspec validation code which ultimately led to some code being a bit rewritten, not only adapted from this or that branch, yet it is still in a limit of a merge.
This commit is contained in:
@@ -618,17 +618,10 @@ krt_same_dest(rte *k, rte *e)
|
||||
{
|
||||
rta *ka = k->attrs, *ea = e->attrs;
|
||||
|
||||
if (ka->dest != ea->dest)
|
||||
return 0;
|
||||
|
||||
if (ka->dest != RTD_UNICAST)
|
||||
return 1;
|
||||
|
||||
eattr *nhea_k = ea_find(ka->eattrs, &ea_gen_nexthop);
|
||||
eattr *nhea_e = ea_find(ea->eattrs, &ea_gen_nexthop);
|
||||
|
||||
ASSUME(nhea_k && nhea_e);
|
||||
return adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
|
||||
return (!nhea_k == !nhea_e) && adata_same(nhea_k->u.ptr, nhea_e->u.ptr);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user