From cac44eb6e1109f5e5398033beeb2bd8f2e56d6e0 Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 27 Jan 2010 00:01:32 +0000 Subject: Merged revisions 243391 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r243391 | dvossel | 2010-01-26 17:56:57 -0600 (Tue, 26 Jan 2010) | 15 lines Merged revisions 243390 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243390 | dvossel | 2010-01-26 17:55:49 -0600 (Tue, 26 Jan 2010) | 9 lines fixes bug with channel receiving wrong privileges after call parking (closes issue #16429) Reported by: Yasuhiro Konishi Patches: features.c.diff uploaded by Yasuhiro Konishi (license 947) Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@243394 f38db490-d61c-443f-a65b-d21fe96a405b --- main/features.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main/features.c b/main/features.c index bb000dd0f..dd9093960 100644 --- a/main/features.c +++ b/main/features.c @@ -3074,8 +3074,12 @@ static int park_exec(struct ast_channel *chan, void *data) } ast_channel_unlock(peer); + /* When the datastores for both caller and callee are created, both the callee and caller channels + * use the features_caller flag variable to represent themselves. With that said, the config.features_callee + * flags should be copied from the datastore's caller feature flags regardless if peer was a callee + * or caller. */ if (dialfeatures) { - ast_copy_flags(&(config.features_callee), dialfeatures->is_caller ? &(dialfeatures->features_caller) : &(dialfeatures->features_callee), AST_FLAGS_ALL); + ast_copy_flags(&(config.features_callee), &(dialfeatures->features_caller), AST_FLAGS_ALL); } if ((parkedcalltransfers == AST_FEATURE_FLAG_BYCALLEE) || (parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH)) { -- cgit v1.2.3