kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-07 13:35:00 +00:00
Code Issues Projects Releases Wiki Activity

OPENZAP-238: [freetdm] Fix state transition on hangup after a raw call is placed

Browse Source
This commit is contained in:
Moises Silva 2014-08-06 23:27:10 -04:00
parent 160576f86b
commit 0267ab566d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/freetdm/src/ftmod/ftmod_gsm/ftmod_gsm.c
View File

@ -392,7 +392,6 @@ void on_wat_con_sts(unsigned char span_id, uint8_t call_id, wat_con_status_t *st
void on_wat_rel_ind(unsigned char span_id, uint8_t call_id, wat_rel_event_t *rel_event) void on_wat_rel_ind(unsigned char span_id, uint8_t call_id, wat_rel_event_t *rel_event)
{ {
ftdm_span_t *span = NULL; ftdm_span_t *span = NULL;
//ftdm_status_t ftdm_status = FTDM_FAIL;
ftdm_gsm_span_data_t *gsm_data = NULL; ftdm_gsm_span_data_t *gsm_data = NULL;
ftdm_log(FTDM_LOG_INFO, "s%d: Call hangup (id:%d) cause:%d\n", span_id, call_id, rel_event->cause); ftdm_log(FTDM_LOG_INFO, "s%d: Call hangup (id:%d) cause:%d\n", span_id, call_id, rel_event->cause);
@ -401,14 +400,17 @@ void on_wat_rel_ind(unsigned char span_id, uint8_t call_id, wat_rel_event_t *rel
return; return;
} }
if (gsm_data->bchan->state == FTDM_CHANNEL_STATE_HANGUP || if (gsm_data->bchan->state == FTDM_CHANNEL_STATE_DOWN) {
gsm_data->bchan->state == FTDM_CHANNEL_STATE_DOWN) { /* This is most likely due to a call to enable call
/* this might be due to a call to enable call forwarding, * forwarding, which does not run the state machine */
* which does not run the state machine */ ftdm_clear_flag(gsm_data->bchan, FTDM_CHANNEL_INUSE);
return; return;
} }
ftdm_set_state(gsm_data->bchan, FTDM_CHANNEL_STATE_HANGUP); if (gsm_data->bchan->state > FTDM_CHANNEL_STATE_DOWN &&
gsm_data->bchan->state < FTDM_CHANNEL_STATE_HANGUP) {
ftdm_set_state(gsm_data->bchan, FTDM_CHANNEL_STATE_HANGUP);
}
} }
void on_wat_rel_cfm(unsigned char span_id, uint8_t call_id) void on_wat_rel_cfm(unsigned char span_id, uint8_t call_id)