freetdm: fix boost glare invalid state transition

         show physical status in ftdm list command
         update list of events

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 6247c885fd99570e07eb30b174eb0987587000ee..710fdd614d2c7e3f30e5f5cdbfe688f3976497e0 100644 (file)
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -3295,6 +3295,8 @@ SWITCH_STANDARD_API(ft_function)
                int j;
                for (j = 0 ; j < FTDM_MAX_SPANS_INTERFACE; j++) {
                        if (SPAN_CONFIG[j].span) {
+                               ftdm_channel_t *fchan;
+                               ftdm_alarm_flag_t alarmbits = FTDM_ALARM_NONE;
                                const char *flags = "none";
                                ftdm_signaling_status_t sigstatus;
 
@@ -3303,12 +3305,17 @@ SWITCH_STANDARD_API(ft_function)
                                } else if (SPAN_CONFIG[j].analog_options & ANALOG_OPTION_CALL_SWAP) {
                                        flags = "call swap";
                                }
+                               fchan = ftdm_span_get_channel(SPAN_CONFIG[j].span, 1);
+                               if (fchan) {
+                                       ftdm_channel_get_alarms(fchan, &alarmbits);
+                               }
                                
                                if ((FTDM_SUCCESS == ftdm_span_get_sig_status(SPAN_CONFIG[j].span, &sigstatus))) {
                                        stream->write_function(stream,
                                                                                   "+OK\n"
                                                                                   "span: %u (%s)\n"
                                                                                   "type: %s\n"         
+                                                                                  "physical_status: %s\n"
                                                                                   "signaling_status: %s\n"
                                                                                   "chan_count: %u\n"
                                                                                   "dialplan: %s\n"
@@ -3320,6 +3327,7 @@ SWITCH_STANDARD_API(ft_function)
                                                                                   j,
                                                                                   ftdm_span_get_name(SPAN_CONFIG[j].span),
                                                                                   SPAN_CONFIG[j].type,
+                                                                                  alarmbits ? "alarmed" : "ok",
                                                                                   ftdm_signaling_status2str(sigstatus),
                                                                                   ftdm_span_get_chan_count(SPAN_CONFIG[j].span),
                                                                                   SPAN_CONFIG[j].dialplan,
@@ -3334,6 +3342,7 @@ SWITCH_STANDARD_API(ft_function)
                                                                                   "+OK\n"
                                                                                   "span: %u (%s)\n"
                                                                                   "type: %s\n"
+                                                                                  "physical_status: %s\n"
                                                                                   "chan_count: %u\n"
                                                                                   "dialplan: %s\n"
                                                                                   "context: %s\n"
@@ -3344,6 +3353,7 @@ SWITCH_STANDARD_API(ft_function)
                                                                                   j,
                                                                                   ftdm_span_get_name(SPAN_CONFIG[j].span),
                                                                                   SPAN_CONFIG[j].type,
+                                                                                  alarmbits ? "alarmed" : "ok",
                                                                                   ftdm_span_get_chan_count(SPAN_CONFIG[j].span),
                                                                                   SPAN_CONFIG[j].dialplan,
                                                                                   SPAN_CONFIG[j].context,

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
index 856541dbe3c1a8bc5d2047337ee135e0b1dba9d8..7699d71bc759ad77ac8b5aa324978cdbf6ef40fe 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
@@ -266,12 +266,12 @@ static ftdm_channel_t *find_ftdmchan(ftdm_span_t *span, sangomabc_short_event_t
                                break;
                        } else {
                                ftdmchan = NULL;
-                               ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d ~ %d:%d is already in use.\n",
+                               ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d ~ %d:%d is already in use in state %s\n",
                                                span->channels[i]->span_id,
                                                span->channels[i]->chan_id,
                                                span->channels[i]->physical_span_id,
-                                               span->channels[i]->physical_chan_id
-                                               );
+                                               span->channels[i]->physical_chan_id,
+                                               ftdm_channel_state2str(span->channels[i]->state));
                                break;
                        }
                }
@@ -1001,26 +1001,41 @@ static void handle_call_start(ftdm_span_t *span, sangomabc_connection_t *mcon, s
                        if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
                                ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
                                ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
-                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE UP -> Changed to TERMINATING\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
+                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d: FTDMCHAN STATE UP -> Changed to TERMINATING\n", 
+                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
                                ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
                        } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP ||  ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
-                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE HANGUP -> Changed to HANGUP COMPLETE\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
+                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d: FTDMCHAN STATE HANGUP -> Changed to HANGUP COMPLETE\n", 
+                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
                                ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
                        } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
-                       ftdm_log(FTDM_LOG_WARNING, "s%dc%d:Collision, hanging up incoming call\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-                               ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
+                               ftdm_log(FTDM_LOG_WARNING, "s%dc%d: Collision, hanging up incoming call\n", 
+                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
+                               /* dont hangup the outgoing call, the other side will send a call start nack too
+                                * and there we will move to terminating. If we move to terminating here. We used to move
+                                * to terminating here, but that introduces a problem in handle_call_start_nack where
+                                * when receiving call start nack we move the channel from DOWN to TERMINATING ( cuz we already
+                                * hangup here ) and the channel gets stuck in terminating forever. So at this point we're trusting
+                                * the other side to send the call start nack ( or proceed with the call )
+                                * ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
+                                */
                        } else {
-                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE INVALID %s on IN CALL\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event), ftdm_channel_state2str(ftdmchan->state));
+                               ftdm_log(FTDM_LOG_ERROR, "s%dc%d: rejecting incoming call in channel state %s\n", 
+                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event), 
+                                               ftdm_channel_state2str(ftdmchan->state));
                        }
                        ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
                        ftdmchan = NULL;
+               } else {
+                       ftdm_log(FTDM_LOG_CRIT, "s%dc%d: incoming call in invalid channel (channel not found)!\n", 
+                                       BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
                }
-               ftdm_log(FTDM_LOG_CRIT, "s%dc%d:START CANT FIND CHAN\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
                goto error;
        }
 
        if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
-               ftdm_log(FTDM_LOG_CRIT, "s%dc%d:START CANT OPEN CHAN\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
+               ftdm_log(FTDM_LOG_ERROR, "s%dc%d: failed to open channel on incoming call, rejecting!\n", 
+                       BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
                goto error;
        }
        
@@ -1271,7 +1286,7 @@ static int parse_sangoma_event(ftdm_span_t *span, sangomabc_connection_t *mcon,
 
        /* process all pending state changes for that channel before
         * processing the new boost event */
-       ftdmchan = event_process_states(span, event);
+    ftdmchan = event_process_states(span, event);
 
     switch(event->event_id) {
     case SIGBOOST_EVENT_CALL_START:

diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index c5498a04e6e6cf2cb6eca64cfd6a7ffd1f663854..b61a835b0fbf85b25f53579c316042543fc3600c 100644 (file)
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -292,9 +292,9 @@ typedef enum {
        FTDM_SIGEVENT_SIGSTATUS_CHANGED, /*!< Signaling protocol status changed (ie: D-chan up), see new status in raw_data ftdm_sigmsg_t member */
        FTDM_SIGEVENT_INVALID
 } ftdm_signal_event_t;
-#define SIGNAL_STRINGS "START", "STOP", "TRANSFER", "ANSWER", "UP", "FLASH", "PROGRESS", \
-               "PROGRESS_MEDIA", "NOTIFY", "TONE_DETECTED", "ALARM_TRAP", "ALARM_CLEAR", "MISC", \
-               "COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGLINK_CHANGED", "INVALID"
+#define SIGNAL_STRINGS "START", "STOP", "ANSWER", "UP", "FLASH", "PROGRESS", \
+               "PROGRESS_MEDIA", "TONE_DETECTED", "ALARM_TRAP", "ALARM_CLEAR", \
+               "COLLECTED_DIGIT", "ADD_CALL", "RESTART", "SIGSTATUS_CHANGED", "INVALID"
 
 /*! \brief Move from string to ftdm_signal_event_t and viceversa */
 FTDM_STR2ENUM_P(ftdm_str2ftdm_signal_event, ftdm_signal_event2str, ftdm_signal_event_t)

diff --git a/libs/freetdm/src/include/ftdm_declare.h b/libs/freetdm/src/include/ftdm_declare.h
index b12852d854f237861efe7d98ba2bac6d35c78735..3f8849d4c1a04cd25686a037677b29704dfeeb89 100644 (file)
--- a/libs/freetdm/src/include/ftdm_declare.h
+++ b/libs/freetdm/src/include/ftdm_declare.h
@@ -119,8 +119,21 @@ typedef int ftdm_socket_t;
 #include <stdarg.h>
 #endif
 
+/*! 
+ * \brief FreeTDM channel.
+ *        This is the basic data structure used to place calls and I/O operations
+ */
 typedef struct ftdm_channel ftdm_channel_t;
+
+/*! 
+ * \brief FreeTDM span.
+ *        Channel and signaling configuration container.
+ *        This is a logical span structure, a span may ( or may note ) contain channels
+ *        of other physical spans, depending on configuration (freetdm.conf) or if you
+ *        are not using configuration depends on how you call ftdm_span_add_channel
+ */
 typedef struct ftdm_span ftdm_span_t;
+
 typedef struct ftdm_event ftdm_event_t;
 typedef struct ftdm_conf_node ftdm_conf_node_t;
 typedef struct ftdm_group ftdm_group_t;

diff --git a/libs/freetdm/src/include/private/libteletone.h b/libs/freetdm/src/include/private/libteletone.h
index 18b95e7f3c7c02c00d8d62405ee964ff34df4f84..7453be51d800315af98220cfb195ca387303cbe6 100644 (file)
--- a/libs/freetdm/src/include/private/libteletone.h
+++ b/libs/freetdm/src/include/private/libteletone.h
@@ -136,8 +136,8 @@ typedef __int16 int16_t;
 #endif
 #endif
 
-#include <libteletone_generate.h>
-#include <libteletone_detect.h>
+#include "libteletone_generate.h"
+#include "libteletone_detect.h"
 
 #ifdef HAVE_STRING_H
 #include <string.h>

diff --git a/libs/freetdm/src/include/private/libteletone_detect.h b/libs/freetdm/src/include/private/libteletone_detect.h
index dc14356e3eb80ee68e8c650b30ef92ba06ecba18..b2d43d15f53b3faa5cb0c5b9af3e8b9c328b5898 100644 (file)
--- a/libs/freetdm/src/include/private/libteletone_detect.h
+++ b/libs/freetdm/src/include/private/libteletone_detect.h
@@ -63,7 +63,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include <libteletone.h>
+#include "libteletone.h"
 
        /*! \file libteletone_detect.h
          \brief Tone Detection Routines

diff --git a/libs/freetdm/src/include/private/libteletone_generate.h b/libs/freetdm/src/include/private/libteletone_generate.h
index fce19e72559a50c172efbd57cfa79829c6a1a26a..2d47abdc7d08dfdcff1c303fe36fd1005b59f8a5 100644 (file)
--- a/libs/freetdm/src/include/private/libteletone_generate.h
+++ b/libs/freetdm/src/include/private/libteletone_generate.h
@@ -81,7 +81,7 @@ extern float powf (float, float);
 #endif
 #include <assert.h>
 #include <stdarg.h>
-#include <libteletone.h>
+#include "libteletone.h"
 
 #define TELETONE_VOL_DB_MAX 0
 #define TELETONE_VOL_DB_MIN -63