]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Masquerade: Retain parkinglot settings made by CHANNEL function.
authorJonathan Rose <jrose@digium.com>
Mon, 10 Sep 2012 17:14:46 +0000 (17:14 +0000)
committerJonathan Rose <jrose@digium.com>
Mon, 10 Sep 2012 17:14:46 +0000 (17:14 +0000)
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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@372737 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/channel.c

index a2d586c9eec0cd61d459b87f801e8101e8913629..93e9fc0f46088607418f7a470742181df24c0023 100644 (file)
@@ -6898,6 +6898,10 @@ int ast_do_masquerade(struct ast_channel *original)
 
        /* Keep the same language.  */
        ast_string_field_set(original, language, clonechan->language);
+
+       /* Keep the same parkinglot. */
+       ast_string_field_set(original, parkinglot, clonechan->parkinglot);
+
        /* Copy the FD's other than the generator fd */
        for (x = 0; x < AST_MAX_FDS; x++) {
                if (x != AST_GENERATOR_FD)