From a671c82ec2d834829205fd9e1eef8aff6db58956 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Fri, 9 Jan 2009 00:45:37 +0000 Subject: [PATCH] Merged revisions 167935 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r167935 | twilson | 2009-01-08 18:13:12 -0600 (Thu, 08 Jan 2009) | 2 lines Set peer context and exten values so MACRO_EXTEN and MACRO_CONTEXT will be set ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@167972 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/app_dial.c b/apps/app_dial.c index ad73c15918..39c4bd1e2c 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1783,6 +1783,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags theapp = pbx_findapp("Macro"); if (theapp && !res) { /* XXX why check res here ? */ + /* Set peer->exten and peer->context so that MACRO_EXTEN and MACRO_CONTEXT get set */ + ast_copy_string(peer->context, chan->context, sizeof(peer->context)); + ast_copy_string(peer->exten, chan->exten, sizeof(peer->exten)); + replace_macro_delimiter(opt_args[OPT_ARG_CALLEE_MACRO]); res = pbx_exec(peer, theapp, opt_args[OPT_ARG_CALLEE_MACRO]); ast_debug(1, "Macro exited with status %d\n", res);