diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-06-08 11:47:49 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-06-08 11:47:49 +0200 |
| commit | cae5979871ee7aa341334f8b1af6bafc60ee9692 (patch) | |
| tree | 490f68c9c5d856ab560f2194fe350cd68039cccd /sysdep/unix | |
| parent | 8fd3811d9d29d73570e03147eb024a4e5fde199b (diff) | |
| parent | 950775f6fa3d569a9d7cd05e33538d35e895d688 (diff) | |
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.
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 5bcaa99b..6e55d8f5 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -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); } /* |