Another great little fix from LIU Xin.

diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index abaa7e827e288353efe8bbf091850c5800f64d5d..1464c3383d759f1ade43035a444d594f531cc121 100644 (file)
--- 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 eb83e98696dbaeb6a88759d905c30572bebed6a1..4f66346d7dedf858046bdeb26503272bb7879c22 100644 (file)
--- 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
     {