diff --git a/src/common/capwap_dfa.c b/src/common/capwap_dfa.c index 3725b0e..a26d21e 100644 --- a/src/common/capwap_dfa.c +++ b/src/common/capwap_dfa.c @@ -5,51 +5,19 @@ static char* l_nameofstate[] = { "START", /* CAPWAP_START_STATE */ - "START_TO_IDLE", /* CAPWAP_START_TO_IDLE_STATE */ "IDLE", /* CAPWAP_IDLE_STATE */ - "IDLE_TO_DISCOVERY", /* CAPWAP_IDLE_TO_DISCOVERY_STATE */ - "IDLE_TO_DTLS_SETUP", /* CAPWAP_IDLE_TO_DTLS_SETUP_STATE */ "DISCOVERY", /* CAPWAP_DISCOVERY_STATE */ - "DISCOVERY_TO_IDLE", /* CAPWAP_DISCOVERY_TO_IDLE_STATE */ - "DISCOVERY_TO_SULKING", /* CAPWAP_DISCOVERY_TO_SULKING_STATE */ - "DISCOVERY_TO_DTLS_SETUP", /* CAPWAP_DISCOVERY_TO_DTLS_SETUP_STATE */ "SULKING", /* CAPWAP_SULKING_STATE */ - "SULKING_TO_IDLE", /* CAPWAP_SULKING_TO_IDLE_STATE */ - "DTLS_SETUP", /* CAPWAP_DTLS_SETUP_STATE */ - "DTLS_SETUP_TO_IDLE", /* CAPWAP_DTLS_SETUP_TO_IDLE_STATE */ - "DTLS_SETUP_TO_SULKING", /* CAPWAP_DTLS_SETUP_TO_SULKING_STATE */ - "DTLS_SETUP_TO_AUTHORIZE", /* CAPWAP_DTLS_SETUP_TO_AUTHORIZE_STATE */ - "AUTHORIZE", /* CAPWAP_AUTHORIZE_STATE */ - "AUTHORIZE_TO_DTLS_SETUP", /* CAPWAP_AUTHORIZE_TO_DTLS_SETUP_STATE */ - "AUTHORIZE_TO_DTLS_CONNECT", /* CAPWAP_AUTHORIZE_TO_DTLS_CONNECT_STATE */ - "AUTHORIZE_TO_DTLS_TEARDOWN", /* CAPWAP_AUTHORIZE_TO_DTLS_TEARDOWN_STATE */ "DTLS_CONNECT", /* CAPWAP_DTLS_CONNECT_STATE */ - "DTLS_CONNECT_TO_DTLS_TEARDOWN", /* CAPWAP_DTLS_CONNECT_TO_DTLS_TEARDOWN_STATE */ - "DTLS_CONNECT_TO_JOIN", /* CAPWAP_DTLS_CONNECT_TO_JOIN_STATE */ "DTLS_TEARDOWN", /* CAPWAP_DTLS_TEARDOWN_STATE */ - "DTLS_TEARDOWN_TO_IDLE", /* CAPWAP_DTLS_TEARDOWN_TO_IDLE_STATE */ - "DTLS_TEARDOWN_TO_SULKING", /* CAPWAP_DTLS_TEARDOWN_TO_SULKING_STATE */ - "DTLS_TEARDOWN_TO_DEAD", /* CAPWAP_DTLS_TEARDOWN_TO_DEAD_STATE */ "JOIN", /* CAPWAP_JOIN_STATE */ - "POST_JOIN", /* CAPWAP_POSTJOIN_STATE */ - "JOIN_TO_DTLS_TEARDOWN", /* CAPWAP_JOIN_TO_DTLS_TEARDOWN_STATE */ - "JOIN_TO_IMAGE_DATA", /* CAPWAP_JOIN_TO_IMAGE_DATA_STATE */ - "JOIN_TO_CONFIGURE", /* CAPWAP_JOIN_TO_CONFIGURE_STATE */ + "POST_JOIN", /* CAPWAP_POSTJOIN_STATE */ "IMAGE_DATA", /* CAPWAP_IMAGE_DATA_STATE */ - "IMAGE_DATA_TO_RESET", /* CAPWAP_IMAGE_DATA_TO_RESET_STATE */ - "IMAGE_DATA_TO_DTLS_TEARDOWN", /* CAPWAP_IMAGE_DATA_TO_DTLS_TEARDOWN_STATE */ "CONFIGURE", /* CAPWAP_CONFIGURE_STATE */ - "CONFIGURE_TO_RESET", /* CAPWAP_CONFIGURE_TO_RESET_STATE */ - "CONFIGURE_TO_DTLS_TEARDOWN", /* CAPWAP_CONFIGURE_TO_DTLS_TEARDOWN_STATE */ - "CONFIGURE_TO_DATA_CHECK", /* CAPWAP_CONFIGURE_TO_DATA_CHECK_STATE */ "RESET", /* CAPWAP_RESET_STATE */ - "RESET_TO_DTLS_TEARDOWN", /* CAPWAP_RESET_TO_DTLS_TEARDOWN_STATE */ "DATA_CHECK", /* CAPWAP_DATA_CHECK_STATE */ - "DATA_CHECK_TO_DTLS_TEARDOWN", /* CAPWAP_DATA_CHECK_TO_DTLS_TEARDOWN_STATE */ "DATA_CHECK_TO_RUN", /* CAPWAP_DATA_CHECK_TO_RUN_STATE */ "RUN", /* CAPWAP_RUN_STATE */ - "RUN_TO_DTLS_TEARDOWN", /* CAPWAP_RUN_TO_DTLS_TEARDOWN_STATE */ - "RUN_TO_RESET", /* CAPWAP_RUN_TO_RESET_STATE */ "DEAD" /* CAPWAP_DEAD_STATE */ }; @@ -62,10 +30,4 @@ char* capwap_dfa_getname(int state) { return l_nameofstate[state]; } -#else - -char* capwap_dfa_getname(int state) { - return ""; -} - #endif diff --git a/src/common/capwap_dfa.h b/src/common/capwap_dfa.h index 9a251e7..28a9ab0 100644 --- a/src/common/capwap_dfa.h +++ b/src/common/capwap_dfa.h @@ -3,55 +3,27 @@ #define CAPWAP_UNDEF_STATE -1 #define CAPWAP_START_STATE 0 -#define CAPWAP_START_TO_IDLE_STATE 1 -#define CAPWAP_IDLE_STATE 2 -#define CAPWAP_IDLE_TO_DISCOVERY_STATE 3 -#define CAPWAP_IDLE_TO_DTLS_SETUP_STATE 4 -#define CAPWAP_DISCOVERY_STATE 5 -#define CAPWAP_DISCOVERY_TO_IDLE_STATE 6 -#define CAPWAP_DISCOVERY_TO_SULKING_STATE 7 -#define CAPWAP_DISCOVERY_TO_DTLS_SETUP_STATE 8 -#define CAPWAP_SULKING_STATE 9 -#define CAPWAP_SULKING_TO_IDLE_STATE 10 -#define CAPWAP_DTLS_SETUP_STATE 11 -#define CAPWAP_DTLS_SETUP_TO_IDLE_STATE 12 -#define CAPWAP_DTLS_SETUP_TO_SULKING_STATE 13 -#define CAPWAP_DTLS_SETUP_TO_AUTHORIZE_STATE 14 -#define CAPWAP_AUTHORIZE_STATE 15 -#define CAPWAP_AUTHORIZE_TO_DTLS_SETUP_STATE 16 -#define CAPWAP_AUTHORIZE_TO_DTLS_CONNECT_STATE 17 -#define CAPWAP_AUTHORIZE_TO_DTLS_TEARDOWN_STATE 18 -#define CAPWAP_DTLS_CONNECT_STATE 19 -#define CAPWAP_DTLS_CONNECT_TO_DTLS_TEARDOWN_STATE 20 -#define CAPWAP_DTLS_CONNECT_TO_JOIN_STATE 21 -#define CAPWAP_DTLS_TEARDOWN_STATE 22 -#define CAPWAP_DTLS_TEARDOWN_TO_IDLE_STATE 23 -#define CAPWAP_DTLS_TEARDOWN_TO_SULKING_STATE 24 -#define CAPWAP_DTLS_TEARDOWN_TO_DEAD_STATE 25 -#define CAPWAP_JOIN_STATE 26 -#define CAPWAP_POSTJOIN_STATE 27 -#define CAPWAP_JOIN_TO_DTLS_TEARDOWN_STATE 28 -#define CAPWAP_JOIN_TO_IMAGE_DATA_STATE 29 -#define CAPWAP_JOIN_TO_CONFIGURE_STATE 30 -#define CAPWAP_IMAGE_DATA_STATE 31 -#define CAPWAP_IMAGE_DATA_TO_RESET_STATE 32 -#define CAPWAP_IMAGE_DATA_TO_DTLS_TEARDOWN_STATE 33 -#define CAPWAP_CONFIGURE_STATE 34 -#define CAPWAP_CONFIGURE_TO_RESET_STATE 35 -#define CAPWAP_CONFIGURE_TO_DTLS_TEARDOWN_STATE 36 -#define CAPWAP_CONFIGURE_TO_DATA_CHECK_STATE 37 -#define CAPWAP_RESET_STATE 38 -#define CAPWAP_RESET_TO_DTLS_TEARDOWN_STATE 39 -#define CAPWAP_DATA_CHECK_STATE 40 -#define CAPWAP_DATA_CHECK_TO_DTLS_TEARDOWN_STATE 41 -#define CAPWAP_DATA_CHECK_TO_RUN_STATE 42 -#define CAPWAP_RUN_STATE 43 -#define CAPWAP_RUN_TO_DTLS_TEARDOWN_STATE 44 -#define CAPWAP_RUN_TO_RESET_STATE 45 -#define CAPWAP_DEAD_STATE 46 -#define CAPWAP_LAST_STATE 46 +#define CAPWAP_IDLE_STATE 1 +#define CAPWAP_DISCOVERY_STATE 2 +#define CAPWAP_SULKING_STATE 3 +#define CAPWAP_DTLS_CONNECT_STATE 4 +#define CAPWAP_DTLS_TEARDOWN_STATE 5 +#define CAPWAP_JOIN_STATE 6 +#define CAPWAP_POSTJOIN_STATE 7 +#define CAPWAP_IMAGE_DATA_STATE 8 +#define CAPWAP_CONFIGURE_STATE 9 +#define CAPWAP_RESET_STATE 10 +#define CAPWAP_DATA_CHECK_STATE 11 +#define CAPWAP_DATA_CHECK_TO_RUN_STATE 12 +#define CAPWAP_RUN_STATE 13 +#define CAPWAP_DEAD_STATE 14 +#define CAPWAP_LAST_STATE 14 /* */ +#ifdef DEBUG char* capwap_dfa_getname(int state); +#else +#define capwap_dfa_getname(x) "" +#endif #endif /* __CAPWAP_DFA_HEADER__ */