kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into netborder

This commit is contained in:
Moises Silva 2010-11-23 16:52:43 -05:00
parent e1e8417fde c059649f8f
commit 72710484b5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/freetdm/src/ftdm_io.c
View File

@ -2349,8 +2349,6 @@ static void close_dtmf_debug(ftdm_channel_t *ftdmchan)
static ftdm_status_t ftdm_channel_clear_vars(ftdm_channel_t *ftdmchan); static ftdm_status_t ftdm_channel_clear_vars(ftdm_channel_t *ftdmchan);
FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan) FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan)
{ {
ftdm_sigmsg_t sigmsg;
ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "Null channel can't be done!\n"); ftdm_assert_return(ftdmchan != NULL, FTDM_FAIL, "Null channel can't be done!\n");
ftdm_mutex_lock(ftdmchan->mutex); ftdm_mutex_lock(ftdmchan->mutex);
@ -2389,12 +2387,15 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_done(ftdm_channel_t *ftdmchan)
ftdm_log(FTDM_LOG_DEBUG, "channel done %u:%u\n", ftdmchan->span_id, ftdmchan->chan_id); ftdm_log(FTDM_LOG_DEBUG, "channel done %u:%u\n", ftdmchan->span_id, ftdmchan->chan_id);
memset(&sigmsg, 0, sizeof(sigmsg)); if (FTDM_IS_VOICE_CHANNEL(ftdmchan)) {
sigmsg.span_id = ftdmchan->span_id; ftdm_sigmsg_t sigmsg;
sigmsg.chan_id = ftdmchan->chan_id; memset(&sigmsg, 0, sizeof(sigmsg));
sigmsg.channel = ftdmchan; sigmsg.span_id = ftdmchan->span_id;
sigmsg.event_id = FTDM_SIGEVENT_RELEASED; sigmsg.chan_id = ftdmchan->chan_id;
ftdm_span_send_signal(ftdmchan->span, &sigmsg); sigmsg.channel = ftdmchan;
sigmsg.event_id = FTDM_SIGEVENT_RELEASED;
ftdm_span_send_signal(ftdmchan->span, &sigmsg);
}
ftdm_mutex_unlock(ftdmchan->mutex); ftdm_mutex_unlock(ftdmchan->mutex);