diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2024-01-27 17:38:06 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2024-01-27 17:38:06 +0100 |
| commit | f40e2bc270d3635be518ae80251ce0b5c519c6f4 (patch) | |
| tree | b1122bd3b91456656222ad4da849862a9f9c3fb9 /nest/route.h | |
| parent | 472be46f7ab211f38e7662543f1436df30dca753 (diff) | |
Nest: Fix bug in recursive routes with MPLS-labeled nexthops
When a recursive route with MPLS-labeled nexthop was exported to kernel
and read back, the nexthop_same() failed due to different labels_orig
field and kernel protocol reinstalled it unnecessarily.
For comparing hext hops, route cache has to distinguish ones with
different labels_orig, but KRT has to ignore that, so we need two
nexthop compare functions.
Thanks to Marcel Menzel for the bugreport.
Diffstat (limited to 'nest/route.h')
| -rw-r--r-- | nest/route.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nest/route.h b/nest/route.h index d26a4b8c..e6f6c64a 100644 --- a/nest/route.h +++ b/nest/route.h @@ -694,6 +694,9 @@ static inline size_t nexthop_size(const struct nexthop *nh) int nexthop__same(struct nexthop *x, struct nexthop *y); /* Compare multipath nexthops */ static inline int nexthop_same(struct nexthop *x, struct nexthop *y) { return (x == y) || nexthop__same(x, y); } +int nexthop_equal_(struct nexthop *x, struct nexthop *y); /* Compare multipath nexthops, ignore labels_orig */ +static inline int nexthop_equal(struct nexthop *x, struct nexthop *y) +{ return (x == y) || nexthop_equal_(x, y); } struct nexthop *nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, linpool *lp); struct nexthop *nexthop_sort(struct nexthop *x); static inline void nexthop_link(struct rta *a, const struct nexthop *from) |