sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "pbx: deadlock when outgoing dialed channel hangs up too quickly" into 16

This commit is contained in:
Friendly Automation 2019-10-14 06:49:46 -05:00 committed by Gerrit Code Review
parent 7895389a57 a66848c92f
commit e7e03e0e2e
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/pbx.c
View File

@ -7604,6 +7604,7 @@ static void *pbx_outgoing_exec(void *data)
{
RAII_VAR(struct pbx_outgoing *, outgoing, data, ao2_cleanup);
enum ast_dial_result res;
struct ast_channel *chan;
res = ast_dial_run(outgoing->dial, NULL, 0);
@ -7624,36 +7625,37 @@ static void *pbx_outgoing_exec(void *data)
return NULL;
}
/* We steal the channel so we get ownership of when it is hung up */
chan = ast_dial_answered_steal(outgoing->dial);
if (!ast_strlen_zero(outgoing->app)) {
struct ast_app *app = pbx_findapp(outgoing->app);
if (app) {
ast_verb(4, "Launching %s(%s) on %s\n", outgoing->app, S_OR(outgoing->appdata, ""),
ast_channel_name(ast_dial_answered(outgoing->dial)));
pbx_exec(ast_dial_answered(outgoing->dial), app, outgoing->appdata);
ast_channel_name(chan));
pbx_exec(chan, app, outgoing->appdata);
} else {
ast_log(LOG_WARNING, "No such application '%s'\n", outgoing->app);
}
} else {
struct ast_channel *answered = ast_dial_answered(outgoing->dial);
ast_hangup(chan);
} else {
if (!ast_strlen_zero(outgoing->context)) {
ast_channel_context_set(answered, outgoing->context);
ast_channel_context_set(chan, outgoing->context);
}
if (!ast_strlen_zero(outgoing->exten)) {
ast_channel_exten_set(answered, outgoing->exten);
ast_channel_exten_set(chan, outgoing->exten);
}
if (outgoing->priority > 0) {
ast_channel_priority_set(answered, outgoing->priority);
ast_channel_priority_set(chan, outgoing->priority);
}
if (ast_pbx_run(answered)) {
ast_log(LOG_ERROR, "Failed to start PBX on %s\n", ast_channel_name(answered));
} else {
/* PBX will have taken care of hanging up, so we steal the answered channel so dial doesn't do it */
ast_dial_answered_steal(outgoing->dial);
if (ast_pbx_run(chan)) {
ast_log(LOG_ERROR, "Failed to start PBX on %s\n", ast_channel_name(chan));
ast_hangup(chan);
}
}