diff options
author | paul <paul> | 2006-07-10 07:45:13 +0000 |
---|---|---|
committer | paul <paul> | 2006-07-10 07:45:13 +0000 |
commit | 94b0635027f0b4f5214dc998efe74773c0677492 (patch) | |
tree | fa1938d6dc4fd7e721f8df3b7f8298f460d438f5 /zebra/kernel_null.c | |
parent | d6540cce83db645447b9ecf60c9a9d2599c65238 (diff) | |
download | quagga-94b0635027f0b4f5214dc998efe74773c0677492.tar.bz2 quagga-94b0635027f0b4f5214dc998efe74773c0677492.tar.xz |
[ospfd] cleanup NSM neighbour delete through a new Deleted NSM state
2006-07-07 Paul Jakma <paul.jakma@sun.com>
* ospf_nsm.h: Add a NSM_Deleted neighbour state, to act as dummy
state indicating the neighbour is to be deleted.
* ospf_nsm.c: (general) Use the NSM_Deleted state to delete
neighbours, thus allowing code to be slightly more obvious
in its flow.
(nsm_timer_set) Add NSM_Deleted. Add another timer the code
missed.
(nsm_kill_nbr) No need for special case call to nsm_change_state
anymore.
Make the assert and error-handling for same case more readable
(Andrew Schorr)
Remove the call to ospf_nbr_delete, nsm_change_state can do
this generally now via NSM_Deleted.
(struct ... NSM) Add the dummy NSM_Deleted state, the 3 events
that can lead to nsm_kill_nbr all now transition the NBR to
NSM_Deleted and the general change_state function can be left
to do the work.
(ospf_nsm_event) Special casing of events and early-return can
be removed now.
On transition into Deleted, delete the nbr.
* ospf_dump.c: (ospf_nsm_state_msg) Add Deleted.
Diffstat (limited to 'zebra/kernel_null.c')
0 files changed, 0 insertions, 0 deletions