proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ospfd] CID #15, remove redundant NULL check in ism_change_state

Browse Source 
2006-05-12 Paul Jakma <paul.jakma@sun.com>

	* ospf_ism.c: (ism_change_state) NULL check on oi->area is
	  useless, it's always valid. Only possibility where it
 	  couldn't be is if there is a race between abr_task and
	  cleaning up oi's, in which case a NULL check here isn't going
	  to do anything. Fixes CID #15.
This commit is contained in:
Paul Jakma 2006-05-12 23:07:27 +00:00
parent bfd7c7dc06
commit deb1561c18
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ospfd/ChangeLog
View File

@ -16,6 +16,11 @@
* ospf_ia.c: (ospf_update_router_route) ospf->backbone could be
NULL when passed to ospf_find_asbr_route_through_area,
check for NULL first, CID #14.
* ospf_ism.c: (ism_change_state) NULL check on oi->area is
useless, it's always valid. Only possibility where it
couldn't be is if there is a race between abr_task and
cleaning up oi's, in which case a NULL check here isn't going
to do anything. Fixes CID #15.
2006-05-11 Paul Jakma <paul.jakma@sun.com>

19
ospfd/ospf_ism.c
View File

@ -569,19 +569,16 @@ ism_change_state (struct ospf_interface *oi, int state)
ospf_check_abr_status (oi->ospf);
/* Originate router-LSA. */
if (oi->area)
if (state == ISM_Down)
{
if (state == ISM_Down)
{
if (oi->area->act_ints > 0)
oi->area->act_ints--;
}
else if (old_state == ISM_Down)
oi->area->act_ints++;
/* schedule router-LSA originate. */
ospf_router_lsa_timer_add (oi->area);
if (oi->area->act_ints > 0)
oi->area->act_ints--;
}
else if (old_state == ISM_Down)
oi->area->act_ints++;
/* schedule router-LSA originate. */
ospf_router_lsa_timer_add (oi->area);
/* Originate network-LSA. */
if (old_state != ISM_DR && state == ISM_DR)