From b0bb03e916da4b4a37aa65b694e3aa1cecee8648 Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Tue, 17 Dec 2013 23:25:49 +0000 Subject: bridging: Give bridges a name and a known creator Bridges have two new optional properties, a creator and a name. Certain consumers of bridges will automatically provide bridges that they create with these properties. Examples include app_bridgewait, res_parking, app_confbridge, and app_agent_pool. In addition, a name may now be provided as an argument to the POST function for creating new bridges via ARI. (closes issue AFS-47) Review: https://reviewboard.asterisk.org/r/3070/ ........ Merged revisions 404042 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404043 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_confbridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apps/app_confbridge.c') diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 9688f2f46..300d2c7e1 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -1218,7 +1218,8 @@ static struct confbridge_conference *join_conference_bridge(const char *conferen /* Create an actual bridge that will do the audio mixing */ conference->bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_MULTIMIX, - AST_BRIDGE_FLAG_MASQUERADE_ONLY | AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY); + AST_BRIDGE_FLAG_MASQUERADE_ONLY | AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY, + app, conference_name); if (!conference->bridge) { ao2_ref(conference, -1); conference = NULL; -- cgit v1.2.3