diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-15 18:09:30 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 14:39:09 +0200 |
| commit | 950775f6fa3d569a9d7cd05e33538d35e895d688 (patch) | |
| tree | 81b4b23d5695e209301b252d0d282b05a0d67ac1 /sysdep/unix | |
| parent | 4fe9881d625f10e44109a649e369a413bd98de71 (diff) | |
Route destination field merged with nexthop attribute; splitting flowspec validation result out.
As there is either a nexthop or another destination specification
(or othing in case of ROAs and Flowspec), it may be merged together.
This code is somehow quirky and should be replaced in future by better
implementation of nexthop.
Also flowspec validation result has its own attribute now as it doesn't
have anything to do with route nexthop.
Diffstat (limited to 'sysdep/unix')
| -rw-r--r-- | sysdep/unix/krt.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index 89e9e97e..a0789936 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -608,17 +608,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); } /* |