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

This commit is contained in:
Moises Silva 2010-12-17 20:28:32 -05:00
commit 6fe762727a

View File

@ -515,23 +515,17 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
switch (ftdm_channel_get_state(chan)) { switch (ftdm_channel_get_state(chan)) {
case FTDM_CHANNEL_STATE_DOWN: case FTDM_CHANNEL_STATE_DOWN:
{ {
ftdm_channel_t *chtmp = chan;
chan->call_data = NULL; chan->call_data = NULL;
ftdm_channel_done(chan);
/* if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) {
* Close channel completely, BRI PTMP will thank us ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n",
*/ ftdm_channel_get_span_id(chan),
if (ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) { ftdm_channel_get_id(chan));
ftdm_channel_t *chtmp = chan; } else {
if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) { ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n", ftdm_channel_get_span_id(chan),
ftdm_channel_get_span_id(chan), ftdm_channel_get_id(chan));
ftdm_channel_get_id(chan));
} else {
ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
ftdm_channel_get_span_id(chan),
ftdm_channel_get_id(chan));
}
} }
} }
break; break;