#include "prefix.h"
#include "stream.h"
-#include "isisd/dict.h"
#include "isisd/isis_constants.h"
#include "isisd/isis_common.h"
#include "isisd/isis_flags.h"
#include "isisd/isisd.h"
#include "isisd/isis_csm.h"
#include "isisd/isis_events.h"
+#include "isisd/isis_errors.h"
extern struct isis *isis;
-static const char *csm_statestr[] = {"C_STATE_NA", "C_STATE_INIT",
+static const char *const csm_statestr[] = {"C_STATE_NA", "C_STATE_INIT",
"C_STATE_CONF", "C_STATE_UP"};
#define STATE2STR(S) csm_statestr[S]
-static const char *csm_eventstr[] = {
+static const char *const csm_eventstr[] = {
"NO_STATE", "ISIS_ENABLE", "IF_UP_FROM_Z",
"ISIS_DISABLE", "IF_DOWN_FROM_Z",
};
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;
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) {