FS-6500: freetdm: Add more enum compliance by defining proper enum values for FTDM_EN...

diff --git a/libs/freetdm/src/ftdm_state.c b/libs/freetdm/src/ftdm_state.c
index ade5038dc09b8b87cc1f7e58680c13e8c0f1c97a..f6bc0ef4c43e96f0d632b6ca3d833e36173aae59 100644 (file)
--- a/libs/freetdm/src/ftdm_state.c
+++ b/libs/freetdm/src/ftdm_state.c
@@ -149,7 +149,7 @@ static int ftdm_parse_state_map(ftdm_channel_t *ftdmchan, ftdm_channel_state_t s
                        continue;
                }
                
-               if (state_map->nodes[x].check_states[0] == FTDM_ANY_STATE) {
+               if (state_map->nodes[x].check_states[0] == FTDM_CHANNEL_STATE_ANY) {
                        proceed = 1;
                } else {
                        for(i = 0; i < FTDM_MAP_MAX; i++) {
@@ -166,7 +166,7 @@ static int ftdm_parse_state_map(ftdm_channel_t *ftdmchan, ftdm_channel_state_t s
                
                for(i = 0; i < FTDM_MAP_MAX; i++) {
                        ok = (state_map->nodes[x].type == ZSM_ACCEPTABLE);
-                       if (state_map->nodes[x].states[i] == FTDM_END) {
+                       if (state_map->nodes[x].states[i] == FTDM_CHANNEL_STATE_END) {
                                break;
                        }
                        if (state_map->nodes[x].states[i] == state) {

diff --git a/libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c b/libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c
index f3bd3b710f817ef5c906c6f0cc930c57ddaf4570..58b7789fe2db6989677bf01a74259f3f918db998 100755 (executable)
--- a/libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c
+++ b/libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c
@@ -579,50 +579,50 @@ static ftdm_state_map_t gsm_state_map = {
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
                },
                
                /* Outbound states */
@@ -630,29 +630,29 @@ static ftdm_state_map_t gsm_state_map = {
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_RINGING,  FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_RINGING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_RINGING,  FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END}
                },
 
 
@@ -660,29 +660,29 @@ static ftdm_state_map_t gsm_state_map = {
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
        }
 };

diff --git a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
index 548bde6f0c3e1a450fe5b7e3f1cc301717cd4119..1adad76988963a0626a94bc5f4474454e123574a 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
@@ -2157,107 +2157,107 @@ static ftdm_state_map_t isdn_state_map = {
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE},
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY},
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
 
                /****************************************/
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE},
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY},
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_CHANNEL_STATE_RING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
-                        FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                        FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
                },
        }
 };

diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
index 0be6c5dcd45c9b0d50d34dbbdba5b2435b081e74..be301f3da86842de6008e0d81032113ae8c30fba 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
+++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
@@ -748,179 +748,179 @@ static ftdm_state_map_t isdn_state_map = {
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE},
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY},
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
                         FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS,
-                        FTDM_CHANNEL_STATE_UP, FTDM_END}
+                        FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROCEED, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-                        FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                        FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RINGING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-                        FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                        FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-                        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
 
                /****************************************/
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE},
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY},
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_RING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DIALTONE, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_COLLECT, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROCEED, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS,
-                        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RINGING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END},
                        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
-                        FTDM_CHANNEL_STATE_UP, FTDM_END}
+                        FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
        }
 };

diff --git a/libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c b/libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c
index 55b9b8332a99aec07ace7afafbcfa707f1b10b5c..38f9c48e84a01cb96ffd884a4c0fa3d901b9ec7c 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c
+++ b/libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c
@@ -262,44 +262,44 @@ static ftdm_state_map_t pritap_state_map = {
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
                },
                
        }

diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index 50359c9841cd23300e05955a1a98ed49021ab4b7..026b7b17df4589722e465d649c20bcbf47052888 100755 (executable)
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -1323,62 +1323,62 @@ static ftdm_state_map_t r2_state_map = {
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_COLLECT, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_COLLECT, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
                },
                {
                        ZSD_INBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
                },
                
                /* Outbound states */
@@ -1386,57 +1386,57 @@ static ftdm_state_map_t r2_state_map = {
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END}
+                       {FTDM_CHANNEL_STATE_ANY, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESET, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DIALING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END}
+                       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
+                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
                },
 
                {
                        ZSD_OUTBOUND,
                        ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+                       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
                },
        }
 };

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
index 3cde670474a8f6fc328322147019dc8650f95a7b..c8b520783ebf4e1d6705233b462511ef5cf77577 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
@@ -66,214 +66,214 @@ ftdm_state_map_t sangoma_isdn_state_map = {
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_ANY_STATE, FTDM_END},
-               {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_RESTART, FTDM_END}
+               {FTDM_CHANNEL_STATE_ANY, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RESET, FTDM_END},
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+               {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+               {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_CANCEL, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+               {FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END},
+               {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END},
                {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_DIALING,
                 FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP,
-                FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+                FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-               {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_GET_CALLERID, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END}
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_GET_CALLERID, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_GET_CALLERID, FTDM_END},
-               {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END}
+               {FTDM_CHANNEL_STATE_GET_CALLERID, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_COLLECT, FTDM_END},
-               {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END}
+               {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END},
-               {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+               {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RING, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END}
+               {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_PROCEED, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_TRANSFER, FTDM_END}
+               {FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_TRANSFER, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RINGING, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+               {FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+               {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_UP, FTDM_END},
+               {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_UP, FTDM_END},
-               {FTDM_CHANNEL_STATE_TRANSFER, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+               {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TRANSFER, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
        },
 
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_TRANSFER, FTDM_END},
-               {FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_TERMINATING,FTDM_END},
+               {FTDM_CHANNEL_STATE_TRANSFER, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_TERMINATING,FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
+               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_INBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
        },      
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_ANY_STATE, FTDM_END},
-               {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
+               {FTDM_CHANNEL_STATE_ANY, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RESET, FTDM_END},
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+               {FTDM_CHANNEL_STATE_RESET, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+               {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_CANCEL, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+               {FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END},
+               {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END},
                {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_DIALING,
                 FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP,
-                FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+                FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-               {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_DIALING, FTDM_END},
+               {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END},
                {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
                 FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP,
-                FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+                FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_PROCEED, FTDM_END},
+               {FTDM_CHANNEL_STATE_PROCEED, FTDM_CHANNEL_STATE_END},
                {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-                FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+                FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+               {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_RINGING, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_END},
+               {FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_UP, FTDM_END},
+               {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_UP, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+               {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+               {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
+               {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
        },
        {
                ZSD_OUTBOUND,
                ZSM_UNACCEPTABLE,
-               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-               {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+               {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
+               {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
        }
        }
 };

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index 9a42dedc16d2ccc42bb89b688ec416d1357e0c70..030138658be9927ec082e7b3574e066d22bcf124 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -70,217 +70,217 @@ ftdm_state_map_t sangoma_ss7_state_map = {
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END},
+       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_DOWN,
         FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_COLLECT,
         FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_PROGRESS,
         FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_UP,
         FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_TERMINATING,
-        FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
+       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_TERMINATING,
         FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE,
-        FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_IDLE, FTDM_END}
+        FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_END}
        },
        {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_IDLE, FTDM_END},
-       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_COLLECT, FTDM_END}
+       {FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_END},
+       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END}
+        FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END},
+       {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_DOWN,
-        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_COLLECT, FTDM_END},
+       {FTDM_CHANNEL_STATE_COLLECT, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_RING, 
-        FTDM_CHANNEL_STATE_IDLE, FTDM_END}
+        FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_RING, FTDM_END},
+       {FTDM_CHANNEL_STATE_RING, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-        FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_END}
+        FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END}
        },
        {
         ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_RINGING, FTDM_END},
+       {FTDM_CHANNEL_STATE_RINGING, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
         FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
-        FTDM_CHANNEL_STATE_UP, FTDM_END},
+        FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
+       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END}
+        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
+       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-        FTDM_CHANNEL_STATE_UP, FTDM_END}
+        FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_UP, FTDM_END},
+       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+        FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_CANCEL, FTDM_END},
+       {FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_INBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
+       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+        FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
        /**************************************************************************/
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_END},
+       {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_DOWN,
         FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_DIALING,
         FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,
         FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_CANCEL,
         FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
+       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_TERMINATING,
         FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_HANGUP_COMPLETE,
-        FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_IDLE, FTDM_END}
+        FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_END}
        },
        {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_IDLE, FTDM_END},
-       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
+       {FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_END},
+       {FTDM_CHANNEL_STATE_RESTART, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
+       {FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END}
+        FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END},
+       {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+        FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_DIALING, FTDM_END},
+       {FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_TERMINATING,
         FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_PROGRESS,
-        FTDM_CHANNEL_STATE_PROGRESS_MEDIA ,FTDM_CHANNEL_STATE_UP, FTDM_END}
+        FTDM_CHANNEL_STATE_PROGRESS_MEDIA ,FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_END},
+       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END}
+        FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
+       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
         FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP,
-        FTDM_CHANNEL_STATE_UP, FTDM_END}
+        FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_UP, FTDM_END},
+       {FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+        FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_CANCEL, FTDM_END},
+       {FTDM_CHANNEL_STATE_CANCEL, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
+       {FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
+       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END}
+        FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END}
        },
    {
        ZSD_OUTBOUND,
        ZSM_UNACCEPTABLE,
-       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
+       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_END},
        {FTDM_CHANNEL_STATE_SUSPENDED, FTDM_CHANNEL_STATE_RESTART,
-        FTDM_CHANNEL_STATE_DOWN, FTDM_END}
+        FTDM_CHANNEL_STATE_DOWN, FTDM_CHANNEL_STATE_END}
        },
    }
 };

diff --git a/libs/freetdm/src/include/private/ftdm_state.h b/libs/freetdm/src/include/private/ftdm_state.h
index 43cef81f7936332841e94b71f11791fc22d498c5..b2a9ce2bdd3707b4d943baae2ab0f068293f74fe 100644 (file)
--- a/libs/freetdm/src/include/private/ftdm_state.h
+++ b/libs/freetdm/src/include/private/ftdm_state.h
@@ -49,6 +49,8 @@ extern "C" {
 #endif
 
 typedef enum {
+       FTDM_CHANNEL_STATE_ANY = -1,
+       FTDM_CHANNEL_STATE_END = -1,
        FTDM_CHANNEL_STATE_DOWN,
        FTDM_CHANNEL_STATE_HOLD,
        FTDM_CHANNEL_STATE_SUSPENDED,
@@ -77,6 +79,7 @@ typedef enum {
        FTDM_CHANNEL_STATE_RESET,
        FTDM_CHANNEL_STATE_INVALID
 } ftdm_channel_state_t;
+/* Purposely not adding ANY (-1) and END (-1) since FTDM_STR2ENUM_P works only on enums starting at zero */
 #define CHANNEL_STATE_STRINGS "DOWN", "HOLD", "SUSPENDED", "DIALTONE", "COLLECT", \
                "RING", "RINGING", "BUSY", "ATTN", "GENRING", "DIALING", "GET_CALLERID", "CALLWAITING", \
                "RESTART", "PROCEED", "PROGRESS", "PROGRESS_MEDIA", "UP", "TRANSFER", "IDLE", "TERMINATING", "CANCEL", \

diff --git a/libs/freetdm/src/include/private/ftdm_types.h b/libs/freetdm/src/include/private/ftdm_types.h
index 53183594ccdf6ee71dcea457a16b515485c81c9b..9e8aebe1579f2b960e5e7ab41623cee72ca7f01f 100755 (executable)
--- a/libs/freetdm/src/include/private/ftdm_types.h
+++ b/libs/freetdm/src/include/private/ftdm_types.h
@@ -66,9 +66,6 @@ extern "C" {
 #define FTDM_DEFAULT_DTMF_ON 250
 #define FTDM_DEFAULT_DTMF_OFF 50
 
-#define FTDM_END -1
-#define FTDM_ANY_STATE -1
-
 typedef enum {
        FTDM_ENDIAN_BIG = 1,
        FTDM_ENDIAN_LITTLE = -1