[asterisk-commits] jrose: branch 11 r372754 - in /branches/11: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Sep 10 12:33:22 2012
New Revision: 372754

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372754
Log:
Masquerade: Retain parkinglot settings made by CHANNEL function.

Prior to this patch, the user would have a parkinglot set on a channel that
was parked and when the channel was retrieved, any attempt by that channel
to park would simply use the default. This patch makes parkinglot values
set in this way be retained through the masquerade.

(closes issue AST-990)
Reported by: Nick Huskinson
Patches:
    masquerade_parkinglot_patch.diff Uploaded by Jonathan Rose (license 6182)
........

Merged revisions 372736 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 372737 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    branches/11/   (props changed)
    branches/11/main/channel.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: branches/11/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/channel.c?view=diff&rev=372754&r1=372753&r2=372754
==============================================================================
--- branches/11/main/channel.c (original)
+++ branches/11/main/channel.c Mon Sep 10 12:33:22 2012
@@ -6985,6 +6985,10 @@
 
 	/* Keep the same language.  */
 	ast_channel_language_set(original, ast_channel_language(clonechan));
+
+	/* Keep the same parkinglot. */
+	ast_channel_parkinglot_set(original, ast_channel_parkinglot(clonechan));
+
 	/* Copy the FD's other than the generator fd */
 	for (x = 0; x < AST_MAX_FDS; x++) {
 		if (x != AST_GENERATOR_FD)