From 40fed194b6f1986a1f0d7a30023fb575a19621fe Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Wed, 13 Jan 2010 19:43:33 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.4@239838 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_features.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/res/res_features.c b/res/res_features.c index e5a6179e44..3a0edde811 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -581,6 +581,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); -- 2.47.2