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 /res/res_stasis.c | |
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 'res/res_stasis.c')
-rw-r--r-- | res/res_stasis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_stasis.c b/res/res_stasis.c index 691462722..71a18a07f 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -585,7 +585,7 @@ static void control_unlink(struct stasis_app_control *control) ao2_cleanup(control); } -struct ast_bridge *stasis_app_bridge_create(const char *type) +struct ast_bridge *stasis_app_bridge_create(const char *type, const char *name) { struct ast_bridge *bridge; int capabilities; @@ -604,7 +604,7 @@ struct ast_bridge *stasis_app_bridge_create(const char *type) return NULL; } - bridge = ast_bridge_base_new(capabilities, flags); + bridge = ast_bridge_base_new(capabilities, flags, "Stasis", name); if (bridge) { if (!ao2_link(app_bridges, bridge)) { ast_bridge_destroy(bridge, 0); |