diff options
| author | hasso <hasso> | 2004-09-20 14:55:29 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2004-09-20 14:55:29 +0000 |
| commit | a211d65dfda5ae4028ec7bb524f85f3f4bae24c2 (patch) | |
| tree | a166f2d4d75c55a6eaf3439c91488a2d34eeab16 /isisd/isis_events.c | |
| parent | 12a5cae75ef639e416d82b88d887c5d77d279aa3 (diff) | |
| download | quagga-a211d65dfda5ae4028ec7bb524f85f3f4bae24c2.tar.bz2 quagga-a211d65dfda5ae4028ec7bb524f85f3f4bae24c2.tar.xz | |
2004-09-20 LIU Xin <lx at ns.6test.edu.cn>
* isis_dr.c, isis_events.c: Remove hello multiplier usage while scheduling
DIS election.
* isis_pdu.c: Don't call isis_event_dis_status_change() whenever
l[1|2]_desig_is is different from hdr.lan_id.
Diffstat (limited to 'isisd/isis_events.c')
| -rw-r--r-- | isisd/isis_events.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/isisd/isis_events.c b/isisd/isis_events.c index 16c69910..4f843887 100644 --- a/isisd/isis_events.c +++ b/isisd/isis_events.c @@ -146,8 +146,6 @@ isis_event_area_addr_change (struct isis_area *area) void circuit_commence_level (struct isis_circuit *circuit, int level) { - uint32_t interval; - if (level == 1) { THREAD_TIMER_ON (master, circuit->t_send_psnp[0], send_l1_psnp, circuit, @@ -155,11 +153,8 @@ circuit_commence_level (struct isis_circuit *circuit, int level) if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - interval = - circuit->hello_multiplier[0] * (circuit->hello_interval[0]); - THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[0], isis_run_dr_l1, - circuit, interval); + circuit, 2 * circuit->hello_interval[1]); THREAD_TIMER_ON (master, circuit->u.bc.t_send_lan_hello[0], send_lan_l1_hello, circuit, @@ -176,11 +171,8 @@ circuit_commence_level (struct isis_circuit *circuit, int level) if (circuit->circ_type == CIRCUIT_T_BROADCAST) { - interval = - circuit->hello_multiplier[1] * (circuit->hello_interval[1]); - THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[1], isis_run_dr_l2, - circuit, interval); + circuit, 2 * circuit->hello_interval[1]); THREAD_TIMER_ON (master, circuit->u.bc.t_send_lan_hello[1], send_lan_l2_hello, circuit, |