commit af177b245ef3f092ecd0ae75cb75c2d797a7b139
author Christian Franke <nobody@nowhere.ws> Mon Aug 15 13:36:59 2016 +0200
committer Paul Jakma <paul.jakma@hpe.com> Tue Oct 04 13:07:55 2016 +0100
tree 7306eac3fa1e2d9a897a33e3fb733b0a7dfed4e2
parent 4c7d7173baa9fe064349f5fe2e0bdcb367475499

isisd: warn if there is an MTU issue on circuits

Instead of later tripping over an assert, add a proper warning for
interfaces whose MTU is too low.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

isisd/isis_circuit.c

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index 85a682d..da0b57a 100644
--- a/isisd/isis_circuit.c
+++ b/isisd/isis_circuit.c
@@ -1229,7 +1229,8 @@
   if (circuit && circuit->area)
     return NULL;
   circuit = isis_csm_state_change (ISIS_ENABLE, circuit, area);
-  assert (circuit->state == C_STATE_CONF || circuit->state == C_STATE_UP);
+  if (circuit->state != C_STATE_CONF && circuit->state != C_STATE_UP)
+    return circuit;
   isis_circuit_if_bind (circuit, ifp);
   return circuit;
 }

isisd/isis_vty.c

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index f9b96a4..4148eb5 100644
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -86,9 +86,16 @@
   if (!area)
     area = isis_area_create (area_tag);
 
-  if (!circuit || !circuit->area)
+  if (!circuit || !circuit->area) {
     circuit = isis_circuit_create (area, ifp);
 
+    if (circuit->state != C_STATE_CONF && circuit->state != C_STATE_UP)
+      {
+        vty_out(vty, "Couldn't bring up interface, please check log.%s", VTY_NEWLINE);
+        return CMD_WARNING;
+      }
+  }
+
   bool ip = circuit->ip_router, ipv6 = circuit->ipv6_router;
   if (af[2] != '\0')
     ipv6 = true;