From 6275abf53f55db43f49f59c2cc7b1ed35f26f098 Mon Sep 17 00:00:00 2001 From: file Date: Wed, 19 Sep 2007 13:49:47 +0000 Subject: Merged revisions 83074 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r83074 | file | 2007-09-19 10:47:59 -0300 (Wed, 19 Sep 2007) | 6 lines Protect the CDR record from modification by pbx_exec so that the application data contains the Queue data. (closes issue #10761) Reported by: snar Patches: app-queue-mixmonitor.patch uploaded by snar (license 245) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@83075 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_queue.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/app_queue.c b/apps/app_queue.c index 9c11f1427..d5f1e48ac 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2882,8 +2882,12 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce snprintf(mixmonargs, sizeof(mixmonargs)-1, "%s|b%s", tmpid2, monitor_options); ast_debug(1, "Arguments being passed to MixMonitor: %s\n", mixmonargs); - + /* We purposely lock the CDR so that pbx_exec does not update the application data */ + if (qe->chan->cdr) + ast_set_flag(qe->chan->cdr, AST_CDR_FLAG_LOCKED); ret = pbx_exec(qe->chan, mixmonapp, mixmonargs); + if (qe->chan->cdr) + ast_clear_flag(qe->chan->cdr, AST_CDR_FLAG_LOCKED); } else ast_log(LOG_WARNING, "Asked to run MixMonitor on this call, but cannot find the MixMonitor app!\n"); -- cgit v1.2.3