summaryrefslogtreecommitdiff
path: root/main/bridge_basic.c
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2013-12-17 23:25:49 +0000
committerJonathan Rose <jrose@digium.com>2013-12-17 23:25:49 +0000
commitb0bb03e916da4b4a37aa65b694e3aa1cecee8648 (patch)
tree697d4ba1137ca3b28fc79d1c976b2e342274c1fe /main/bridge_basic.c
parent91d0f305061a6111d9996750c04d54daa67b67bb (diff)
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
Diffstat (limited to 'main/bridge_basic.c')
-rw-r--r--main/bridge_basic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/bridge_basic.c b/main/bridge_basic.c
index eaec68995..317c574a6 100644
--- a/main/bridge_basic.c
+++ b/main/bridge_basic.c
@@ -3239,7 +3239,7 @@ struct ast_bridge *ast_bridge_basic_new(void)
bridge = bridge_alloc(sizeof(struct ast_bridge), &ast_bridge_basic_v_table);
bridge = bridge_base_init(bridge,
AST_BRIDGE_CAPABILITY_NATIVE | AST_BRIDGE_CAPABILITY_1TO1MIX
- | AST_BRIDGE_CAPABILITY_MULTIMIX, NORMAL_FLAGS);
+ | AST_BRIDGE_CAPABILITY_MULTIMIX, NORMAL_FLAGS, NULL, NULL);
bridge = bridge_basic_personality_alloc(bridge);
bridge = bridge_register(bridge);
return bridge;