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 --- res/parking/parking_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res/parking/parking_bridge.c') diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c index 9bc13454f..bb9dbf30d 100644 --- a/res/parking/parking_bridge.c +++ b/res/parking/parking_bridge.c @@ -456,7 +456,7 @@ struct ast_bridge *bridge_parking_new(struct parking_lot *bridge_lot) bridge = bridge_alloc(sizeof(struct ast_bridge_parking), &ast_bridge_parking_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_SWAP_INHIBIT_FROM, "Parking", bridge_lot->name); bridge = ast_bridge_parking_init(bridge, bridge_lot); bridge = bridge_register(bridge); return bridge; -- cgit v1.2.3