[ospfd] trivial cleanup of nsm_timer_set

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.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index e3805c82af0c3304688811b52729e78c1d082721..e6d04f32d1f3573adf5c545b00b0f0f8f4b9a328 100644 (file)
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -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>
 

diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 73ed088f0a0fee5d71e220916492c0eb37933081..8c7c11a8b3431c2c101b861db55142880a1fe216 100644 (file)
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -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);