diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2006-07-04 13:50:44 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2006-07-04 13:50:44 +0000 |
| commit | d1b1cd8fb9309d89f10b95d59fb5b1420248895d (patch) | |
| tree | bd88ec34a464f7d2ea3427982e1516fb45683f57 /ospfd/ChangeLog | |
| parent | e55dd53bca98a032a583950320cc1367a0685bee (diff) | |
[ospfd] Clear adjacency state for NSM changes down to TwoWay/ExStart
2006-07-02 Paul Jakma <paul.jakma@sun.com>
* ospf_nsm.c: (nsm_clear_adj) clear adjacency related state for a
neighbour, needed for some state changes from > ExStart down
to ExStart or less, which need not go through nsm_reset_nbr.
(nsm_reset_nbr) move code to former. Should be static.
(ospf_nsm_event) Remove long dead code.
Use nsm_clear_adj for state changes that take down
adjacencies to TwoWay/ExStart.
(nsm_kill_nbr) Oops, action function shouldn't try return
1 for error.
Diffstat (limited to 'ospfd/ChangeLog')
| -rw-r--r-- | ospfd/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index e6d04f32..e22b7a42 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -3,14 +3,23 @@ * ospf_nsm.c: (nsm_should_adj) New function, just consolidate the 10.4 adjacency check from nsm_twoway_received/nsm_adj_ok. (nsm_twoway_received/nsm_adj_ok) Use former. + (nsm_clear_adj) clear adjacency related state for a + neighbour, needed for some state changes from > ExStart down + to ExStart or less, which need not go through nsm_reset_nbr. + (nsm_reset_nbr) move code to former. Should be static. (ospf_nsm_event) Don't allow action functions to change next_state if the NSM tables do not indicate next_state is conditional, log warning if one tries - existing code appears fine though. + Remove long dead code. + Use nsm_clear_adj for state changes that take down + adjacencies to TwoWay/ExStart. (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. + (nsm_kill_nbr) Oops, action function shouldn't try return + 1 for error. 2006-06-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu> |