diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2021-06-10 13:59:06 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2021-06-10 13:59:06 +0200 |
| commit | 95b3f03d89101fa812a8e4648f5745e2d532037b (patch) | |
| tree | e60163d3e73f82be60239746686f959e8e5f6f57 /ospf6d/ospf6_spf.c | |
| parent | ospf6d: Fix coverity Possible null deref (diff) | |
| download | frr-95b3f03d89101fa812a8e4648f5745e2d532037b.tar.xz frr-95b3f03d89101fa812a8e4648f5745e2d532037b.zip | |
ospf6d: Rename ospf6_is_router_abr to more accurately reflect what it does
The ospf6_is_router_abr is checking to see if ospfv3 is an abr router
and also setting values. Let's rename it too `ospf6_check_and_set_router_abr`
to more accurately reflect what it is doing.
Additionally fix coverity #1505176 where we were not checking the return
value of ospf6_is_router_abr like we did every other time. In this
case we don't care about the return value so indicate that we do not.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ospf6d/ospf6_spf.c')
| -rw-r--r-- | ospf6d/ospf6_spf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index b0a8f01bc..f995dd939 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -605,7 +605,7 @@ static int ospf6_spf_calculation_thread(struct thread *t) monotime(&start); ospf6->ts_spf = start; - if (ospf6_is_router_abr(ospf6)) + if (ospf6_check_and_set_router_abr(ospf6)) ospf6_abr_range_reset_cost(ospf6); for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, node, oa)) { @@ -645,7 +645,7 @@ static int ospf6_spf_calculation_thread(struct thread *t) /* External LSA calculation */ ospf6_ase_calculate_timer_add(ospf6); - if (ospf6_is_router_abr(ospf6)) + if (ospf6_check_and_set_router_abr(ospf6)) ospf6_abr_defaults_to_stub(ospf6); monotime(&end); |