diff options
| author | paul <paul> | 2006-07-04 13:46:14 +0000 |
|---|---|---|
| committer | paul <paul> | 2006-07-04 13:46:14 +0000 |
| commit | a73e6ad2964c4b828fc3dd853563a0887eb5cd8f (patch) | |
| tree | 377d65903c9f5362bb65e492c54ce24070dd1f97 /ospfd/ospf_nsm.c | |
| parent | 43f8207b4b5f785f0c93826538d559de0c8f7703 (diff) | |
| download | quagga-a73e6ad2964c4b828fc3dd853563a0887eb5cd8f.tar.bz2 quagga-a73e6ad2964c4b828fc3dd853563a0887eb5cd8f.tar.xz | |
[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.
Diffstat (limited to 'ospfd/ospf_nsm.c')
| -rw-r--r-- | ospfd/ospf_nsm.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index 73ed088f..8c7c11a8 100644 --- 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); |