diff options
| -rw-r--r-- | isisd/ChangeLog | 5 | ||||
| -rw-r--r-- | isisd/isis_circuit.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/isisd/ChangeLog b/isisd/ChangeLog index abaa7e82..1464c338 100644 --- a/isisd/ChangeLog +++ b/isisd/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 LIU Xin <lx at ns.6test.edu.cn> + + * isis_circuit.c: According to RFC1142 the first DIS election will be + started 2 * HelloTimer seconds after the initialization. + 2004-09-15 Laurent Rabret <laurent.rabret at francetelecom.com> * isis_pdu.c: Fix error in same subnet comparison. The previous diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index eb83e986..4f66346d 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -531,14 +531,10 @@ isis_circuit_up (struct isis_circuit *circuit) /* dr election will commence in... */ if (circuit->circuit_is_type & IS_LEVEL_1) THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[0], isis_run_dr_l1, - circuit, - 2 * circuit->hello_multiplier[0] * - circuit->hello_interval[0]); + circuit, 2 * circuit->hello_interval[0]); if (circuit->circuit_is_type & IS_LEVEL_2) THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[1], isis_run_dr_l2, - circuit, - 2 * circuit->hello_multiplier[1] * - circuit->hello_interval[1]); + circuit, 2 * circuit->hello_interval[1]); } else { |