[asterisk-commits] jpeeler: branch 1.4 r239838 - /branches/1.4/res/res_features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Jan 13 13:43:33 2010
New Revision: 239838

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239838
Log:
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 )

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_features.c?view=diff&rev=239838&r1=239837&r2=239838
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Wed Jan 13 13:43:33 2010
@@ -580,6 +580,11 @@
 
 	/* 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))) {