aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-09 00:37:01 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-09 00:37:01 +0000
commit61a7113046152bdaabf31e22f4777fc2470063b6 (patch)
tree0bbbbc6819b4764e11bcd70b7175debf87a14c82
parent47138e0b8084f4aa51dab193058ae686749e689d (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@167971 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_dial.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c
index c4ba19103..c775e5862 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1747,6 +1747,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);