From: Jonathan Rose Date: Mon, 10 Sep 2012 17:41:57 +0000 (+0000) Subject: Masquerade: Retain parkinglot settings made by CHANNEL function. X-Git-Tag: 13.0.0-beta1~2556 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=595cd83d03ba868c9875247cf56271051400199d;p=thirdparty%2Fasterisk.git 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 ........ Merged revisions 372754 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372755 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/channel.c b/main/channel.c index 66d7ef5882..0faf165f16 100644 --- a/main/channel.c +++ b/main/channel.c @@ -6988,6 +6988,10 @@ int ast_do_masquerade(struct ast_channel *original) /* 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)