isisd: use an enum for circuit states

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/isisd/isis_circuit.h b/isisd/isis_circuit.h
index cbe4040b64d6cbaa66dd4822af9f7e2cc119aeb2..d4c7baea1a1770f82683ac4b223b53525ca902a5 100644 (file)
--- a/isisd/isis_circuit.h
+++ b/isisd/isis_circuit.h
@@ -31,6 +31,7 @@
 
 #include "isis_constants.h"
 #include "isis_common.h"
+#include "isis_csm.h"
 
 DECLARE_HOOK(isis_if_new_hook, (struct interface *ifp), (ifp));
 
@@ -77,7 +78,7 @@ struct isis_circuit_arg {
 };
 
 struct isis_circuit {
-       int state;
+       enum isis_circuit_state state;
        uint8_t circuit_id;       /* l1/l2 bcast CircuitID */
        time_t last_uptime;
        struct isis *isis;

diff --git a/isisd/isis_csm.c b/isisd/isis_csm.c
index 736d8d63f93c34efc0b58662740fb91d245bcffe..6214a6b8cc3fc48c36cce5f6ad697734e994a37e 100644 (file)
--- a/isisd/isis_csm.c
+++ b/isisd/isis_csm.c
@@ -63,7 +63,7 @@ static const char *const csm_eventstr[] = {
 struct isis_circuit *
 isis_csm_state_change(int event, struct isis_circuit *circuit, void *arg)
 {
-       int old_state;
+       enum isis_circuit_state old_state;
        struct isis *isis = NULL;
        struct isis_area *area = NULL;
 
@@ -197,9 +197,6 @@ isis_csm_state_change(int event, struct isis_circuit *circuit, void *arg)
                        break;
                }
                break;
-
-       default:
-               zlog_warn("Invalid circuit state %d", old_state);
        }
 
        if (IS_DEBUG_EVENTS)

diff --git a/isisd/isis_csm.h b/isisd/isis_csm.h
index 53a5f9d5d09d1090a17234c96b455e8441b17a60..9da06fb1a6008603c0eaa1a671b9ab0983e71c29 100644 (file)
--- a/isisd/isis_csm.h
+++ b/isisd/isis_csm.h
@@ -27,10 +27,12 @@
 /*
  * Circuit states
  */
-#define C_STATE_NA   0
-#define C_STATE_INIT 1         /* Connected to interface */
-#define C_STATE_CONF 2         /* Configured for ISIS    */
-#define C_STATE_UP   3         /* CONN | CONF            */
+enum isis_circuit_state {
+       C_STATE_NA,
+       C_STATE_INIT, /* Connected to interface */
+       C_STATE_CONF, /* Configured for ISIS    */
+       C_STATE_UP,   /* CONN | CONF            */
+};
 
 /*
  * Circuit events