diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-29 18:15:22 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-29 18:15:22 +0000 |
commit | f24c10d5f1f72ea49584674acad587660371d9ab (patch) | |
tree | 472df12323478d4f95be911b801dbf25520f6792 | |
parent | e98dda0b48eec9fd20b06ef4255cc0c45f59f62c (diff) |
Merged revisions 166861 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r166861 | mmichelson | 2008-12-29 12:04:52 -0600 (Mon, 29 Dec 2008) | 14 lines
Update app_queue to deal with the removal of AST_PBX_KEEPALIVE
When placing a call to a queue which ran a gosub on the member's
channel, Asterisk would crash every time, stemming from the fact
that the member's channel was being hung up unexpectedly when the
Gosub completed. The necessary change was pretty much copied and
pasted from app_dial's similar changes made last week.
I also took the opportunity to change a LOG_DEBUG message in
app_dial to use ast_debug. I am guessing this was due to a direct
merge from 1.4 that was not corrected to use trunk's preferred
syntax.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@166862 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_dial.c | 3 | ||||
-rw-r--r-- | apps/app_queue.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index d676fb5f5..c4ba19103 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1840,8 +1840,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags ast_pbx_run_args(peer, &args); } ast_free(gosub_args); - if (option_debug) - ast_log(LOG_DEBUG, "Gosub exited with status %d\n", res); + ast_debug(1, "Gosub exited with status %d\n", res); } else { ast_log(LOG_ERROR, "Could not Allocate string for Gosub arguments -- Gosub Call Aborted!\n"); } diff --git a/apps/app_queue.c b/apps/app_queue.c index 8870cff1e..9eb7128c3 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3803,9 +3803,12 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce if (gosub_args) { res = pbx_exec(peer, app, gosub_args); if (!res) { - ast_pbx_run(peer); + struct ast_pbx_args args; + memset(&args, 0, sizeof(args)); + args.no_hangup_chan = 1; + ast_pbx_run_args(peer, &args); } - free(gosub_args); + ast_free(gosub_args); if (option_debug) ast_log(LOG_DEBUG, "Gosub exited with status %d\n", res); } else { @@ -6536,7 +6539,7 @@ static int load_module(void) if (!con) ast_log(LOG_ERROR, "Queue virtual context 'app_queue_gosub_virtual_context' does not exist and unable to create\n"); else - ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_queue"); + ast_add_extension2(con, 1, "s", 1, NULL, NULL, "NoOp", ast_strdup(""), ast_free_ptr, "app_queue"); if (queue_persistent_members) reload_queue_members(); |