kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Resolve race conditions involving Stasis bridges."

Browse Source
This commit is contained in:
Matt Jordan
2015-06-19 10:11:36 -05:00
committed by Gerrit Code Review
parent 9668a1acb5 d7a1e84a1e
commit bd77ace25a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_stasis.c
View File

@@ -1280,6 +1280,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
/* Check to see if a bridge absorbed our hangup frame */
if (ast_check_hangup_locked(chan)) {
control_mark_done(control);
break;
}
@@ -1303,6 +1304,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
if (r < 0) {
ast_debug(3, "%s: Poll error\n",
ast_channel_uniqueid(chan));
control_mark_done(control);
break;
}
@@ -1323,6 +1325,7 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
/* Continue on in the dialplan */
ast_debug(3, "%s: Hangup (no more frames)\n",
ast_channel_uniqueid(chan));
control_mark_done(control);
break;
}
@@ -1331,13 +1334,14 @@ int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
/* Continue on in the dialplan */
ast_debug(3, "%s: Hangup\n",
ast_channel_uniqueid(chan));
control_mark_done(control);
break;
}
}
}
ast_channel_lock(chan);
needs_depart = ast_channel_is_bridged(chan);
needs_depart = (ast_channel_internal_bridge_channel(chan) != NULL);
ast_channel_unlock(chan);
if (needs_depart) {
ast_bridge_depart(chan);

4
res/stasis/control.c
View File

@@ -745,7 +745,7 @@ static int app_send_command_on_condition(struct stasis_app_control *control,
{
RAII_VAR(struct stasis_app_command *, command, NULL, ao2_cleanup);
if (control == NULL) {
if (control == NULL || control->is_done) {
return -1;
}
@@ -770,7 +770,7 @@ int stasis_app_send_command_async(struct stasis_app_control *control,
{
RAII_VAR(struct stasis_app_command *, command, NULL, ao2_cleanup);
if (control == NULL) {
if (control == NULL || control->is_done) {
return -1;
}