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

fix edge case endless loop that can get a channel stuck

This commit is contained in:
Anthony Minessale 2012-01-11 12:05:16 -06:00
parent cfa926d781
commit 19d49e2075
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/switch_channel.c
View File

@ -1383,7 +1383,7 @@ SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, sw
switch_assert(channel);
for (;;) {
if ((channel->state == channel->running_state && channel->running_state == want_state) ||
if ((channel->state < CS_HANGUP && channel->state == channel->running_state && channel->running_state == want_state) ||
(other_channel && switch_channel_down_nosig(other_channel)) || switch_channel_down_nosig(channel)) {
break;
}

12
src/switch_ivr_bridge.c
View File

@ -776,17 +776,17 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
state = switch_channel_get_state(other_channel);
running_state = switch_channel_get_running_state(other_channel);
if (state == running_state) {
if (switch_channel_down_nosig(other_channel) || switch_channel_down_nosig(channel)) {
break;
}
if (state < CS_HANGUP && state == running_state) {
if (--loops < 1) {
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
switch_channel_hangup(other_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
}
if (switch_channel_down_nosig(other_channel) || switch_channel_down_nosig(channel)) {
break;
}
if (running_state == CS_RESET) {
switch_channel_set_state(other_channel, CS_SOFT_EXECUTE);
}
@ -803,7 +803,7 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
} else {
loops = max;
}
switch_yield(20000);
}