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

Merge branch 'master' into FS-4558

This commit is contained in:
Raymond Chandler 2012-09-04 20:04:50 -04:00
parent c3aeed6409 76dd6db3a2
commit 5a8fcfb552
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/languages/mod_managed/managed/swig.cs
View File

@ -23352,6 +23352,7 @@ public enum switch_channel_flag_t {
CF_TRACKED, CF_TRACKED,
CF_TRACKABLE, CF_TRACKABLE,
CF_NO_CDR, CF_NO_CDR,
CF_EARLY_OK,
CF_FLAG_MAX CF_FLAG_MAX
} }
@ -25245,6 +25246,7 @@ public enum switch_core_session_message_types_t {
SWITCH_MESSAGE_INDICATE_JITTER_BUFFER, SWITCH_MESSAGE_INDICATE_JITTER_BUFFER,
SWITCH_MESSAGE_INDICATE_RECOVERY_REFRESH, SWITCH_MESSAGE_INDICATE_RECOVERY_REFRESH,
SWITCH_MESSAGE_INDICATE_SIGNAL_DATA, SWITCH_MESSAGE_INDICATE_SIGNAL_DATA,
SWITCH_MESSAGE_INDICATE_MESSAGE,
SWITCH_MESSAGE_INDICATE_INFO, SWITCH_MESSAGE_INDICATE_INFO,
SWITCH_MESSAGE_INDICATE_AUDIO_DATA, SWITCH_MESSAGE_INDICATE_AUDIO_DATA,
SWITCH_MESSAGE_INDICATE_BLIND_TRANSFER_RESPONSE, SWITCH_MESSAGE_INDICATE_BLIND_TRANSFER_RESPONSE,

7
src/switch_ivr_originate.c
View File

@ -703,6 +703,13 @@ static uint8_t check_channel_status(originate_global_t *oglobals, originate_stat
switch_channel_clear_flag(originate_status[i].peer_channel, CF_EARLY_OK); switch_channel_clear_flag(originate_status[i].peer_channel, CF_EARLY_OK);
} }
if (caller_channel && switch_channel_test_flag(caller_channel, CF_EARLY_OK)) {
if (!oglobals->early_ok) {
oglobals->early_ok = 1;
}
switch_channel_clear_flag(caller_channel, CF_EARLY_OK);
}
state = switch_channel_get_state(originate_status[i].peer_channel); state = switch_channel_get_state(originate_status[i].peer_channel);
if (state >= CS_HANGUP || state == CS_RESET || switch_channel_test_flag(originate_status[i].peer_channel, CF_TRANSFER) || if (state >= CS_HANGUP || state == CS_RESET || switch_channel_test_flag(originate_status[i].peer_channel, CF_TRANSFER) ||
switch_channel_test_flag(originate_status[i].peer_channel, CF_REDIRECT) || switch_channel_test_flag(originate_status[i].peer_channel, CF_REDIRECT) ||