diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-27 00:00:33 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-27 00:00:33 +0000 |
| commit | c7e57134d9212f54e556b967a10bc3672e731230 (patch) | |
| tree | 2367fb7acfcafb685cf15abd7140a1c703b0ffd9 /main | |
| parent | 8a41efaf1b745beb69f6a2281de7bdc707d564b4 (diff) | |
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.2@243392 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 209b1672d..be3d0692d 100644 --- a/main/features.c +++ b/main/features.c @@ -3441,8 +3441,12 @@ static int park_exec_full(struct ast_channel *chan, void *data, struct ast_parki } 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 ((parkinglot->parkedcalltransfers == AST_FEATURE_FLAG_BYCALLEE) || (parkinglot->parkedcalltransfers == AST_FEATURE_FLAG_BYBOTH)) { |