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.0@167971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2009-01-09 00:37:01 +00:00
parent 31d37012e0
commit 7970bef2d2

View File

@@ -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);