isis: fix double-adding a circuit to the area

isis_circuit_enable can be called for an already enabled circuit. In this
case we would add the circuit to the area multiple times.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 4fa28a4ad91a2d92fc13c670e59c170245c682d3..896bbc2cb05042371f9c981e2b3c611e7cad7645 100644 (file)
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -78,12 +78,14 @@ DEFINE_HOOK(isis_circuit_del_hook, (struct isis_circuit *circuit), (circuit));
 
 static void isis_circuit_enable(struct isis_circuit *circuit)
 {
-       struct isis_area *area;
+       struct isis_area *area = circuit->area;
        struct interface *ifp = circuit->interface;
 
-       area = isis_area_lookup(circuit->tag, ifp->vrf_id);
-       if (area)
-               isis_area_add_circuit(area, circuit);
+       if (!area) {
+               area = isis_area_lookup(circuit->tag, ifp->vrf_id);
+               if (area)
+                       isis_area_add_circuit(area, circuit);
+       }
 
        if (if_is_operative(ifp))
                isis_csm_state_change(IF_UP_FROM_Z, circuit, ifp);