commit 515812ddbbb6a41298261688c8ccd0df8e900f17
author David Lamparter <equinox@opensourcerouting.org> Thu Aug 11 16:59:08 2016 +0200
committer Paul Jakma <paul.jakma@hpe.com> Tue Oct 04 13:07:55 2016 +0100
tree 520c4a03130356863365f19f9c19f293e6fdd3d1
parent f263413f762058d887aa7b2b6c502bd84af3c923

isisd: fix isis_circuit_create()

Between the awkwardly managed CSM and the tacked-on IPv6 support, the
simplified logic to setup a circuit wasn't quite right.

Note that the API essentially allows creating a circuit without enabling
either IPv4 or IPv6.  This wasn't possible before and probably breaks
isisd in 'interesting' ways.  The CLI won't do this, so it's only an
issue when adding on other configuration mechanisms.

Reported-by: Martin Winter <mwinter@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

isisd/isis_vty.c

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index 3f21856..3ce06b8 100644
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -72,17 +72,13 @@
 
   /* Prevent more than one area per circuit */
   circuit = circuit_scan_by_ifp (ifp);
-  if (circuit)
+  if (circuit && circuit->area)
     {
-      if (circuit->ip_router == 1)
+      if (strcmp (circuit->area->area_tag, area_tag))
         {
-          if (strcmp (circuit->area->area_tag, area_tag))
-            {
-              vty_out (vty, "ISIS circuit is already defined on %s%s",
-                       circuit->area->area_tag, VTY_NEWLINE);
-              return CMD_ERR_NOTHING_TODO;
-            }
-          return CMD_SUCCESS;
+          vty_out (vty, "ISIS circuit is already defined on %s%s",
+                   circuit->area->area_tag, VTY_NEWLINE);
+          return CMD_ERR_NOTHING_TODO;
         }
     }
 
@@ -90,7 +86,7 @@
   if (!area)
     area = isis_area_create (area_tag);
 
-  if (!circuit)
+  if (!circuit || !circuit->area)
     circuit = isis_circuit_create (area, ifp);
 
   bool ip = circuit->ip_router, ipv6 = circuit->ipv6_router;