kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 00:41:41 +00:00
Code Issues Projects Releases Wiki Activity

ftmod_libpri: ignore missing call_data in on_hangup() and use the call handle passed in the pevent structure (still needs more love...)

Browse Source 
Signed-off-by: Stefan Knoblich <s.knoblich@axsentis.de>
This commit is contained in:
Stefan Knoblich 2011-04-29 01:58:42 +02:00
parent e56cbeef41
commit 360ed43a04
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
View File

@ -854,7 +854,7 @@ static int on_hangup(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
{ {
ftdm_span_t *span = spri->span; ftdm_span_t *span = spri->span;
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->hangup.channel); ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->hangup.channel);
q931_call *call = NULL; /* q931_call *call = NULL; */
if (!chan) { if (!chan) {
ftdm_log(FTDM_LOG_CRIT, "-- Hangup on channel %d:%d %s but it's not in use?\n", ftdm_span_get_id(spri->span), pevent->hangup.channel); ftdm_log(FTDM_LOG_CRIT, "-- Hangup on channel %d:%d %s but it's not in use?\n", ftdm_span_get_id(spri->span), pevent->hangup.channel);
@ -868,22 +868,25 @@ static int on_hangup(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
goto done; goto done;
} }
/*
* Make sure we can really tear-down a call, simply ignore the missing call_data and
* use the call handle from the event
*
if (!chan->call_data) { if (!chan->call_data) {
ftdm_log_chan(chan, FTDM_LOG_DEBUG, "Ignoring remote hangup in state %s with no call data\n", ftdm_channel_get_state_str(chan)); ftdm_log_chan(chan, FTDM_LOG_DEBUG, "Ignoring remote hangup in state %s with no call data\n", ftdm_channel_get_state_str(chan));
goto done; goto done;
} }
call = (q931_call *)chan->call_data; call = (q931_call *)chan->call_data;
*/
ftdm_log(FTDM_LOG_DEBUG, "-- Hangup on channel %d:%d\n", ftdm_span_get_id(spri->span), pevent->hangup.channel); ftdm_log(FTDM_LOG_DEBUG, "-- Hangup on channel %d:%d\n", ftdm_span_get_id(spri->span), pevent->hangup.channel);
pri_release(spri->pri, call, 0); pri_release(spri->pri, pevent->hangup.call, 0);
pri_destroycall(spri->pri, call); pri_destroycall(spri->pri, pevent->hangup.call);
chan->caller_data.hangup_cause = pevent->hangup.cause; chan->caller_data.hangup_cause = pevent->hangup.cause;
chan->call_data = NULL; chan->call_data = NULL;
ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING); ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_TERMINATING);
done: done:
ftdm_channel_unlock(chan); ftdm_channel_unlock(chan);
return 0; return 0;