proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 15:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Another great little fix from LIU Xin.

Browse Source
This commit is contained in:
hasso 2004-09-17 07:59:57 +00:00
parent 2852de1c90
commit bf731011ef
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/ChangeLog
View File

@ -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> 2004-09-15 Laurent Rabret <laurent.rabret at francetelecom.com>
* isis_pdu.c: Fix error in same subnet comparison. The previous * isis_pdu.c: Fix error in same subnet comparison. The previous

8
isisd/isis_circuit.c
View File

@ -531,14 +531,10 @@ isis_circuit_up (struct isis_circuit *circuit)
/* dr election will commence in... */ /* dr election will commence in... */
if (circuit->circuit_is_type & IS_LEVEL_1) if (circuit->circuit_is_type & IS_LEVEL_1)
THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[0], isis_run_dr_l1, THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[0], isis_run_dr_l1,
circuit, circuit, 2 * circuit->hello_interval[0]);
2 * circuit->hello_multiplier[0] *
circuit->hello_interval[0]);
if (circuit->circuit_is_type & IS_LEVEL_2) if (circuit->circuit_is_type & IS_LEVEL_2)
THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[1], isis_run_dr_l2, THREAD_TIMER_ON (master, circuit->u.bc.t_run_dr[1], isis_run_dr_l2,
circuit, circuit, 2 * circuit->hello_interval[1]);
2 * circuit->hello_multiplier[1] *
circuit->hello_interval[1]);
} }
else else
{ {