matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

isisd: initialize circuit to match area is_type

Browse source 
New circuits should be initialized to match the is_type
of their area. Also add an additional check to make sure
that no IIHs are sent for levels which are not enabled.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Christian Franke 2015-11-10 18:04:48 +01:00 committed by Donald Sharp
parent c354c01464
commit ddfdbd32b4
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
isisd/isis_circuit.c
View file

@ -122,13 +122,13 @@ isis_circuit_configure (struct isis_circuit *circuit, struct isis_area *area)
circuit->area = area; circuit->area = area;
/* /*
* The level for the circuit is same as for the area, unless configured * Whenever the is-type of an area is changed, the is-type of each circuit
* otherwise. * in that area is updated to a non-empty subset of the area is-type.
* Inversely, when configuring a new circuit, this property should be
* ensured as well.
*/ */
if (area->is_type != IS_LEVEL_1_AND_2 && area->is_type != circuit->is_type) if (area->is_type != IS_LEVEL_1_AND_2)
zlog_warn ("circut %s is_type %d mismatch with area %s is_type %d", circuit->is_type = area->is_type;
circuit->interface->name, circuit->is_type,
circuit->area->area_tag, area->is_type);
/* /*
* Add the circuit into area * Add the circuit into area

14
isisd/isis_pdu.c
View file

@ -2420,6 +2420,13 @@ send_lan_l1_hello (struct thread *thread)
assert (circuit); assert (circuit);
circuit->u.bc.t_send_lan_hello[0] = NULL; circuit->u.bc.t_send_lan_hello[0] = NULL;
if (!(circuit->area->is_type & IS_LEVEL_1))
{
zlog_warn ("ISIS-Hello (%s): Trying to send L1 IIH in L2-only area",
circuit->area->area_tag);
return 1;
}
if (circuit->u.bc.run_dr_elect[0]) if (circuit->u.bc.run_dr_elect[0])
retval = isis_dr_elect (circuit, 1); retval = isis_dr_elect (circuit, 1);
@ -2443,6 +2450,13 @@ send_lan_l2_hello (struct thread *thread)
assert (circuit); assert (circuit);
circuit->u.bc.t_send_lan_hello[1] = NULL; circuit->u.bc.t_send_lan_hello[1] = NULL;
if (!(circuit->area->is_type & IS_LEVEL_2))
{
zlog_warn ("ISIS-Hello (%s): Trying to send L2 IIH in L1 area",
circuit->area->area_tag);
return 1;
}
if (circuit->u.bc.run_dr_elect[1]) if (circuit->u.bc.run_dr_elect[1])
retval = isis_dr_elect (circuit, 2); retval = isis_dr_elect (circuit, 2);