kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 17:38:59 +00:00
Code Issues Projects Releases Wiki Activity

freetdm: do not dial until DIALING state handler

Browse Source 
add ftdm_declare.h to list of headers
This commit is contained in:
Moises Silva
2010-04-30 16:00:33 -04:00
parent aca82e20e9
commit 6e7f93d9cf
3 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1359,10 +1359,8 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open_by_group(uint32_t group_id, ftdm_dir
check->state == FTDM_CHANNEL_STATE_DOWN &&
FTDM_IS_VOICE_CHANNEL(check)
) {
ftdm_span_t* span = NULL;
ftdm_span_find(check->span_id, &span);
if (span && span->channel_request) {
status = span->channel_request(span, check->chan_id, direction, caller_data, ftdmchan);
if (check->span->channel_request) {
status = check->span->channel_request(check->span, check->chan_id, direction, caller_data, ftdmchan);
break;
}
@@ -1606,13 +1604,14 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_open(uint32_t span_id, uint32_t chan_id,
ftdm_channel_t *check;
ftdm_status_t status = FTDM_FAIL;
ftdm_span_t *span = NULL;
*ftdmchan = NULL;
ftdm_mutex_lock(globals.mutex);
ftdm_mutex_unlock(globals.mutex);
ftdm_span_find(span_id, &span);
if (!span || !ftdm_test_flag(span, FTDM_SPAN_CONFIGURED) || chan_id >= FTDM_MAX_CHANNELS_SPAN) {
ftdm_log(FTDM_LOG_CRIT, "SPAN NOT DEFINED!\n");
*ftdmchan = NULL;
ftdm_log(FTDM_LOG_CRIT, "Could not find span!\n");
goto done;
}