aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-13 19:52:36 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-13 19:52:36 +0000
commit4d3251514547ad0f0dd36deb5f5ac7ef63fe0023 (patch)
tree94b821fa6c36abeb5e6b3ff04d727b6f1e2c0b0f
parent30138650b0974d64f5944f1c79635ead31894e53 (diff)
Merged revisions 239839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines Merged revisions 239838 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines Fix regression for timed out parked call returning to caller This issue seems to have been exposed by the fix in 160390 whereby using a masquerade prevented a crash. The new channel used in the masquerade was not copying the macro information from the old channel. (closes issue #15459) Reported by: djrodman Patches: patch_15459.txt uploaded by mnick (license ) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@239842 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/features.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index 9dda36de6..bb000dd0f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -640,6 +640,11 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
/* Setup the extensions and such */
set_c_e_p(chan, rchan->context, rchan->exten, rchan->priority);
+ /* Setup the macro extension and such */
+ ast_copy_string(chan->macrocontext,rchan->macrocontext,sizeof(chan->macrocontext));
+ ast_copy_string(chan->macroexten,rchan->macroexten,sizeof(chan->macroexten));
+ chan->macropriority = rchan->macropriority;
+
/* Make the masq execute */
if ((f = ast_read(chan)))
ast_frfree(f);