diff options
| author | Acee <aceelindem@gmail.com> | 2024-05-28 10:02:27 -0400 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2024-05-29 13:01:18 +0000 |
| commit | 95f96bb80bc0b65bfc12e98879b83f4afe846693 (patch) | |
| tree | 78d40bfa99c3f142cd454466c898039d0785c852 | |
| parent | 7636c65f5e0b71be6d4bd090a60dcf0314b7226a (diff) | |
ospf6d: OSPFv3 route change comparision fixed for ASBR-only change
When a router route already exists in the area border routers table
as an ABR and it solely changes its ABR or ASBR status, the change
was missed and border route is not updated. This fixes the comparison
for the router_bits in the ospf6_path structure.
This fixes issue https://github.com/FRRouting/frr/issues/16053 although
the actual problem is not the computing router (r2) and not the OSPFv3
redistribution (r3).
Signed-off-by: Acee <aceelindem@gmail.com>
(cherry picked from commit 772688d2d3c03d8eeeb711c2fe3735c9e0885498)
| -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 e9c42bb80c..b5d0ed2e70 100644 --- a/ospf6d/ospf6_abr.c +++ b/ospf6d/ospf6_abr.c @@ -1356,9 +1356,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 c8411c015f..506ebebeb0 100644 --- a/ospf6d/ospf6_route.h +++ b/ospf6d/ospf6_route.h @@ -302,6 +302,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) == 0) |