From 3797639e84a319671ff167306f371394ba9b629a Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Mon, 5 Aug 2013 20:18:54 +0000 Subject: bridge features: Dial and Queue add features instead of replace them. Dial and Queue would previously apply a new set of features whenever bridging. These options would be based purely on the options supplied to the dial/queue applications. This patch changes the function those applications use to bridge calls so that the features will be added to the set of existing features for each channel rather than having them override the existing features. (closes issue ASTERISK-22209) Reported by: Jonathan Rose Review: https://reviewboard.asterisk.org/r/2713/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396245 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/features.c') diff --git a/main/features.c b/main/features.c index 043ed591f..e2d668426 100644 --- a/main/features.c +++ b/main/features.c @@ -953,10 +953,10 @@ static int pre_bridge_setup(struct ast_channel *chan, struct ast_channel *peer, res = 0; ast_channel_lock(chan); - res |= ast_bridge_features_ds_set(chan, &config->features_caller); + res |= ast_bridge_features_ds_append(chan, &config->features_caller); ast_channel_unlock(chan); ast_channel_lock(peer); - res |= ast_bridge_features_ds_set(peer, &config->features_callee); + res |= ast_bridge_features_ds_append(peer, &config->features_callee); ast_channel_unlock(peer); if (res) { -- cgit v1.2.3