summaryrefslogtreecommitdiff
path: root/include/asterisk/bridge_basic.h
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2013-08-05 20:18:54 +0000
committerJonathan Rose <jrose@digium.com>2013-08-05 20:18:54 +0000
commit3797639e84a319671ff167306f371394ba9b629a (patch)
tree1ccc3d73d873ff5478a2d72e93520c07682cbffa /include/asterisk/bridge_basic.h
parent80c9ad102e9d42f4918a4c33a712e60c24d89507 (diff)
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
Diffstat (limited to 'include/asterisk/bridge_basic.h')
-rw-r--r--include/asterisk/bridge_basic.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/asterisk/bridge_basic.h b/include/asterisk/bridge_basic.h
index 4db142946..d04876235 100644
--- a/include/asterisk/bridge_basic.h
+++ b/include/asterisk/bridge_basic.h
@@ -89,6 +89,22 @@ struct ast_flags *ast_bridge_features_ds_get(struct ast_channel *chan);
int ast_bridge_features_ds_set(struct ast_channel *chan, struct ast_flags *flags);
/*!
+ * \brief Append basic bridge DTMF feature flags on the channel.
+ * \since 12.0.0
+ *
+ * \param chan Channel to append DTMF features datastore.
+ * \param flags Builtin DTMF feature flags. (ast_bridge_config flags)
+ *
+ * \note The channel must be locked before calling this function.
+ * \note This function differs from ast_bridge_features_ds_set only in that it won't
+ * remove features already set on the channel.
+ *
+ * \retval 0 on success.
+ * \retval -1 on error.
+ */
+int ast_bridge_features_ds_append(struct ast_channel *chan, struct ast_flags *flags);
+
+/*!
* \brief Setup DTMF feature hooks using the channel features datastore property.
* \since 12.0.0
*