diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 23:55:49 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 23:55:49 +0000 |
commit | 8bedd6a9fcc24cd9357f5a8659feff125b28522e (patch) | |
tree | 1e0bbe3d1ad62ae978c9a2e12892900ffcf49d33 | |
parent | a5ef1424b3b0b1e25d1badceed58a2afc2a50123 (diff) |
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.4@243390 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | res/res_features.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c index 3a0edde81..e8937d54c 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -2579,8 +2579,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)) { |