diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-05-29 12:16:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-29 12:16:24 -0400 |
| commit | d3aead43ef008c4cea0016a7975c733d68edb758 (patch) | |
| tree | 22dc927a1d5d644ad3f16d767d7e2c4f2203b05a | |
| parent | 923799172bd0d42d580c237cb8a2779530dd3556 (diff) | |
| parent | 3566cdb820aef8ba09e933f86ef55847c5b66f48 (diff) | |
Merge pull request #16105 from FRRouting/mergify/bp/stable/9.1/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 c2125951ec..9676e6c982 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)) |