ospfd: use IS_LSA_SELF() where appropriate
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index fa36a02..d5959eb 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2838,7 +2838,7 @@
OSPF_TIMER_ON (ospf->t_maxage, ospf_maxage_lsa_remover, 0);
/* Remove LSA from the LSDB */
- if (CHECK_FLAG (lsa->flags, OSPF_LSA_SELF))
+ if (IS_LSA_SELF (lsa))
if (IS_DEBUG_OSPF (lsa, LSA_FLOODING))
zlog_debug ("LSA[Type%d:%s]: LSA 0x%lx is self-originated: ",
lsa->data->type, inet_ntoa (lsa->data->id), (u_long)lsa);
@@ -3389,7 +3389,7 @@
/* This LSA is already checked. */
if (CHECK_FLAG (lsa->flags, OSPF_LSA_SELF_CHECKED))
- return CHECK_FLAG (lsa->flags, OSPF_LSA_SELF);
+ return IS_LSA_SELF (lsa);
/* Make sure LSA is self-checked. */
SET_FLAG (lsa->flags, OSPF_LSA_SELF_CHECKED);
@@ -3414,11 +3414,11 @@
{
/* to make it easier later */
SET_FLAG (lsa->flags, OSPF_LSA_SELF);
- return CHECK_FLAG (lsa->flags, OSPF_LSA_SELF);
+ return IS_LSA_SELF (lsa);
}
}
- return CHECK_FLAG (lsa->flags, OSPF_LSA_SELF);
+ return IS_LSA_SELF (lsa);
}
/* Get unique Link State ID. */
@@ -3541,6 +3541,7 @@
struct external_info *ei;
struct ospf_lsa *new = NULL;
assert (CHECK_FLAG (lsa->flags, OSPF_LSA_SELF));
+ assert (IS_LSA_SELF (lsa));
assert (lsa->lock > 0);
switch (lsa->data->type)
@@ -3589,7 +3590,7 @@
u_int16_t index, current_index;
assert (lsa->lock > 0);
- assert (CHECK_FLAG (lsa->flags, OSPF_LSA_SELF));
+ assert (IS_LSA_SELF (lsa));
if (lsa->refresh_list < 0)
{
@@ -3632,7 +3633,7 @@
ospf_refresher_unregister_lsa (struct ospf *ospf, struct ospf_lsa *lsa)
{
assert (lsa->lock > 0);
- assert (CHECK_FLAG (lsa->flags, OSPF_LSA_SELF));
+ assert (IS_LSA_SELF (lsa));
if (lsa->refresh_list >= 0)
{
struct list *refresh_list = ospf->lsa_refresh_queue.qs[lsa->refresh_list];