diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-12-17 23:25:49 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-12-17 23:25:49 +0000 |
| commit | b0bb03e916da4b4a37aa65b694e3aa1cecee8648 (patch) | |
| tree | 697d4ba1137ca3b28fc79d1c976b2e342274c1fe /apps | |
| parent | 91d0f305061a6111d9996750c04d54daa67b67bb (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 'apps')
| -rw-r--r-- | apps/app_agent_pool.c | 3 | ||||
| -rw-r--r-- | apps/app_bridgewait.c | 3 | ||||
| -rw-r--r-- | apps/app_confbridge.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_agent_pool.c b/apps/app_agent_pool.c index c968153e6..2b0d1f8b8 100644 --- a/apps/app_agent_pool.c +++ b/apps/app_agent_pool.c @@ -1366,7 +1366,8 @@ static struct ast_bridge *bridge_agent_hold_new(void) bridge = bridge_alloc(sizeof(struct ast_bridge), &bridge_agent_hold_v_table); bridge = bridge_base_init(bridge, AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM - | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED); + | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED, + "AgentPool", NULL); bridge = bridge_register(bridge); return bridge; } diff --git a/apps/app_bridgewait.c b/apps/app_bridgewait.c index 8e615f05f..aa83e0b70 100644 --- a/apps/app_bridgewait.c +++ b/apps/app_bridgewait.c @@ -360,7 +360,8 @@ static struct wait_bridge_wrapper *get_wait_bridge_wrapper(const char *bridge_na bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM - | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_DISSOLVE_EMPTY); + | AST_BRIDGE_FLAG_TRANSFER_PROHIBITED | AST_BRIDGE_FLAG_DISSOLVE_EMPTY, + APP_NAME, bridge_name); if (!bridge) { return NULL; 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; |