Merge branch 'master' of git://git.freeswitch.org/freeswitch

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c

diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
index f788de3f71fe72e1a05529cdb5e31d5341b25196,fb061f44f7b73becbb42273aca5043214297d617..f2270a0daaa4d91044aba5503ef797877af0e7ab
--- 1/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
--- 2/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
@@@ -1001,13 -1006,16 +1003,16 @@@ static void handle_call_start(ftdm_span
                        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, "ZCHAN STATE UP -> Changed to TERMINATING %d:%d\n", event->span+1,event->chan+1);
+                               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, "ZCHAN STATE HANGUP -> Changed to HANGUP COMPLETE %d:%d\n", event->span+1,event->chan+1);
+                               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));
++                      } 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);
                        } else {
-                               ftdm_log(FTDM_LOG_CRIT, "ZCHAN STATE INVALID %s on IN CALL %d:%d\n", ftdm_channel_state2str(ftdmchan->state),event->span+1,event->chan+1);
+                               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_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
                        ftdmchan = NULL;
@@@ -1917,13 -1923,17 +1920,17 @@@ static int sigmod_ss7box_isup_exec_cmd(
  
  static void ftdm_cli_span_state_cmd(ftdm_span_t *span, char *state)
  {
-       int j;
 -      unsigned j;
++      unsigned int j;
        int cnt=0;
+       ftdm_channel_state_t state_e = ftdm_str2ftdm_channel_state(state);
+       if (state_e == FTDM_CHANNEL_STATE_INVALID) {
+               ftdm_log(FTDM_LOG_CRIT, "Checking for channels not in the INVALID state is probably not waht you want\n");
+       }
        for(j = 1; j <= span->chan_count; j++) {
-               if (span->channels[j]->state != FTDM_CHANNEL_STATE_DOWN) {
+               if (span->channels[j]->state != state_e) {
                        ftdm_channel_t *ftdmchan = span->channels[j];
                        ftdm_log(FTDM_LOG_CRIT, "Channel %i s%dc%d State=%s\n",
-                               j,ftdmchan->physical_span_id-1,ftdmchan->physical_chan_id-1,ftdm_channel_state2str(ftdmchan->state));
+                               j, ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1, ftdm_channel_state2str(ftdmchan->state));
                        cnt++;
                }
        }