diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2024-06-02 21:12:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-02 21:12:26 +0300 |
| commit | 493025375239f8ba718ae6b8598ebb3a187aef58 (patch) | |
| tree | cf75c92d025cfa46d3d4a4d4a678a9ebe0a8d0c5 | |
| parent | f98915a0a012160117d05360dae26c56229b4d5f (diff) | |
| parent | a8a33a501070c570c3daaebd9f600a53e553a30c (diff) | |
Merge pull request #16104 from FRRouting/mergify/bp/stable/10.0/pr-16098
ospf6d: OSPFv3 route change comparision fixed for ASBR-only change (backport #16098)
| -rw-r--r-- | ospf6d/ospf6_abr.c | 7 | ||||
| -rw-r--r-- | ospf6d/ospf6_route.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c index f4202a4a29..ef780af15b 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -1350,9 +1350,10 @@ void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa) * does not match with the new entry then add the new route */ if (old_entry_updated == false) { - if ((old == NULL) || (old->type != route->type) - || (old->path.type != route->path.type) - || (old->path.cost != route->path.cost)) + if ((old == NULL) || (old->type != route->type) || + (old->path.type != route->path.type) || + (old->path.cost != route->path.cost) || + (old->path.router_bits != route->path.router_bits)) add_route = true; } diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h index 2c1d17efc3..c9486bc1cc 100644 --- a/ospf6d/ospf6_route.h +++ b/ospf6d/ospf6_route.h @@ -287,6 +287,7 @@ extern const char *const ospf6_path_type_substr[OSPF6_PATH_TYPE_MAX]; prefix_same(&(ra)->prefix, &(rb)->prefix) && \ (ra)->path.type == (rb)->path.type && \ (ra)->path.cost == (rb)->path.cost && \ + (ra)->path.router_bits == (rb)->path.router_bits && \ (ra)->path.u.cost_e2 == (rb)->path.u.cost_e2 && \ listcount(ra->paths) == listcount(rb->paths) && \ ospf6_route_cmp_nexthops(ra, rb)) |