lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / isisd / isis_csm.c

diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c
index a283260d92aa590d93896f1d8e1d9fc423506afe..e50f57ae1d2f9624c7802f04e1288a15d8d05f7a 100644 (file)
--- a/isisd/isis_csm.c
+++ b/isisd/isis_csm.c
@@ -47,6 +47,7 @@
 #include "isisd/isisd.h"
 #include "isisd/isis_csm.h"
 #include "isisd/isis_events.h"
+#include "isisd/isis_errors.h"
 
 extern struct isis *isis;
 
@@ -86,13 +87,6 @@ isis_csm_state_change(int event, struct isis_circuit *circuit, void *arg)
                case IF_UP_FROM_Z:
                        circuit = isis_circuit_new();
                        isis_circuit_if_add(circuit, (struct interface *)arg);
-                       if (!circuit->circuit_id) {
-                               isis_circuit_if_del(circuit,
-                                                   (struct interface *)arg);
-                               isis_circuit_del(circuit);
-                               circuit = NULL;
-                               break;
-                       }
                        listnode_add(isis->init_circ_list, circuit);
                        circuit->state = C_STATE_INIT;
                        break;
@@ -143,13 +137,13 @@ isis_csm_state_change(int event, struct isis_circuit *circuit, void *arg)
                        break;
                case IF_UP_FROM_Z:
                        isis_circuit_if_add(circuit, (struct interface *)arg);
-                       if (!circuit->circuit_id)
-                               break;
                        if (isis_circuit_up(circuit) != ISIS_OK) {
-                               zlog_err(
+                               flog_err(
+                                       EC_ISIS_CONFIG,
                                        "Could not bring up %s because of invalid config.",
                                        circuit->interface->name);
-                               zlog_err(
+                               flog_err(
+                                       EC_ISIS_CONFIG,
                                        "Clearing config for %s. Please re-examine it.",
                                        circuit->interface->name);
                                if (circuit->ip_router) {