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

FSCORE-439 (always use brakets on if() in your next patch)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15027 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-09-30 23:28:49 +00:00
parent 07d223b30e
commit 160535da6d
1 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/switch_ivr_originate.c
View File

@ -229,19 +229,57 @@ static int check_per_channel_timeouts(originate_global_t *oglobals,
int max, int max,
time_t start) time_t start)
{ {
int x = 0,i; int x = 0,i,delayed_channels=0,active_channels=0;
uint32_t early_exit_time=0, delayed_min=0;
time_t elapsed = switch_epoch_time_now(NULL) - start; time_t elapsed = switch_epoch_time_now(NULL) - start;
if (oglobals->cancel_timeout > 0) { if (oglobals->cancel_timeout > 0) {
return 0; return 0;
} }
for (i = 0; i < max; i++) { for (i = 0; i < max; i++) {
if (originate_status[i].peer_channel && originate_status[i].per_channel_delay_start && elapsed > originate_status[i].per_channel_delay_start) { if (originate_status[i].peer_channel && switch_channel_get_state(originate_status[i].peer_channel) != CS_DESTROY && switch_channel_get_state(originate_status[i].peer_channel) != CS_REPORTING) {
switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE); if (originate_status[i].per_channel_delay_start) {
delayed_channels++;
} else {
active_channels++;
}
}
}
if (active_channels == 0 && delayed_channels) {
for (i = 0; i < max; i++) {
if ( originate_status[i].peer_channel && originate_status[i].per_channel_delay_start && (! delayed_min || delayed_min > originate_status[i].per_channel_delay_start) ) {
delayed_min = originate_status[i].per_channel_delay_start;
}
}
early_exit_time = delayed_min - elapsed;
}
for (i = 0; i < max; i++) {
if (originate_status[i].peer_channel && originate_status[i].per_channel_delay_start && (elapsed > originate_status[i].per_channel_delay_start || active_channels == 0) ) {
if (active_channels == 0) {
if (originate_status[i].per_channel_timelimit_sec) {
if (originate_status[i].per_channel_timelimit_sec > early_exit_time) /* IN theory this check is not needed ( should just be if !0 then -= with no else), if its not 0 it should always be greater.... */
originate_status[i].per_channel_timelimit_sec -= early_exit_time;
else
originate_status[i].per_channel_timelimit_sec = 1;
}
if (originate_status[i].per_channel_progress_timelimit_sec) {
if (originate_status[i].per_channel_progress_timelimit_sec > early_exit_time) /* IN theory this check is not needed ( should just be if !0 then -= with no else), if its not 0 it should always be greater.... */
originate_status[i].per_channel_progress_timelimit_sec -= early_exit_time;
else
originate_status[i].per_channel_progress_timelimit_sec = 1;
}
originate_status[i].per_channel_delay_start -= delayed_min;
} else {
originate_status[i].per_channel_delay_start = 0; originate_status[i].per_channel_delay_start = 0;
} }
if (! originate_status[i].per_channel_delay_start) {
switch_channel_clear_flag(originate_status[i].peer_channel, CF_BLOCK_STATE);
}
}
if (originate_status[i].peer_channel && switch_channel_up(originate_status[i].peer_channel)) { if (originate_status[i].peer_channel && switch_channel_up(originate_status[i].peer_channel)) {
if (originate_status[i].per_channel_progress_timelimit_sec && elapsed > originate_status[i].per_channel_progress_timelimit_sec && if (originate_status[i].per_channel_progress_timelimit_sec && elapsed > originate_status[i].per_channel_progress_timelimit_sec &&
!( !(
@ -1645,6 +1683,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Setting leg delay start to %d\n", switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Setting leg delay start to %d\n",
switch_channel_get_name(originate_status[i].peer_channel), val); switch_channel_get_name(originate_status[i].peer_channel), val);
originate_status[i].per_channel_delay_start = (uint32_t) val; originate_status[i].per_channel_delay_start = (uint32_t) val;
if (originate_status[i].per_channel_progress_timelimit_sec != 0) {
originate_status[i].per_channel_progress_timelimit_sec += originate_status[i].per_channel_delay_start;
}
if (originate_status[i].per_channel_timelimit_sec != 0) {
originate_status[i].per_channel_timelimit_sec += originate_status[i].per_channel_delay_start;
}
} }
} }
} }