proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 17:18:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: use IS_LSA_SELF() where appropriate

Browse Source
This commit is contained in:
Denis Ovsienko 2011-10-24 18:17:09 +04:00 committed by Paul Jakma
parent afcb767922
commit ce3cdcfbed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ospfd/ospf_lsa.c
View File

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