proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-01 12:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ospfd] trivial cleanup of nsm_timer_set

Browse Source 
2006-07-02 Paul Jakma <paul.jakma@sun.com>

	* ospf_nsm.c: (nsm_timer_set) ls_req timer should be OFF in
	  early states.
	  Compact several identical sections.
	  Set inactivity timer to OFF for Down, for documentary purposes.
This commit is contained in:
Paul Jakma 2006-07-04 13:46:14 +00:00
parent ba0beb4a84
commit e55dd53bca
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ospfd/ChangeLog
View File

@ -7,6 +7,10 @@
next_state if the NSM tables do not indicate next_state is
conditional, log warning if one tries - existing code
appears fine though.
(nsm_timer_set) ls_req timer should be OFF in early states.
Compact several identical sections.
Set inactivity timer to OFF for Down, for documentary
purposes.
2006-06-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

15
ospfd/ospf_nsm.c
View File

@ -103,24 +103,21 @@ nsm_timer_set (struct ospf_neighbor *nbr)
switch (nbr->state)
{
case NSM_Down:
OSPF_NSM_TIMER_OFF (nbr->t_db_desc);
OSPF_NSM_TIMER_OFF (nbr->t_ls_upd);
break;
/* This is here for documentation purposes, don't actually get here
* as Down neighbours are deleted typically, see nsm_kill_nbr
*/
OSPF_NSM_TIMER_OFF (nbr->t_inactivity);
case NSM_Attempt:
OSPF_NSM_TIMER_OFF (nbr->t_db_desc);
OSPF_NSM_TIMER_OFF (nbr->t_ls_upd);
break;
case NSM_Init:
OSPF_NSM_TIMER_OFF (nbr->t_db_desc);
OSPF_NSM_TIMER_OFF (nbr->t_ls_upd);
break;
case NSM_TwoWay:
OSPF_NSM_TIMER_OFF (nbr->t_db_desc);
OSPF_NSM_TIMER_OFF (nbr->t_ls_upd);
OSPF_NSM_TIMER_OFF (nbr->t_ls_req);
break;
case NSM_ExStart:
OSPF_NSM_TIMER_ON (nbr->t_db_desc, ospf_db_desc_timer, nbr->v_db_desc);
OSPF_NSM_TIMER_OFF (nbr->t_ls_upd);
OSPF_NSM_TIMER_OFF (nbr->t_ls_req);
break;
case NSM_Exchange:
OSPF_NSM_TIMER_ON (nbr->t_ls_upd, ospf_ls_upd_timer, nbr->v_ls_upd);