diff options
author | Scott Griepentrog <sgriepentrog@digium.com> | 2014-03-07 15:47:55 +0000 |
---|---|---|
committer | Scott Griepentrog <sgriepentrog@digium.com> | 2014-03-07 15:47:55 +0000 |
commit | 80ef9a21b9d91ff0bafc304923bc29effa230b00 (patch) | |
tree | a67db39a4c17a4b01a87201ef37ffdc43189c119 /res/parking | |
parent | d3ac8b8a0e70049af7b5552c4dfd8adc2cc5df11 (diff) |
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/parking')
-rw-r--r-- | res/parking/parking_applications.c | 2 | ||||
-rw-r--r-- | res/parking/parking_bridge.c | 2 | ||||
-rw-r--r-- | res/parking/parking_bridge_features.c | 2 | ||||
-rw-r--r-- | res/parking/parking_tests.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c index 2d481e421..85075bc5a 100644 --- a/res/parking/parking_applications.c +++ b/res/parking/parking_applications.c @@ -704,7 +704,7 @@ static void announce_to_dial(char *dial_string, char *announce_string, int parki snprintf(buf, sizeof(buf), "%d", parkingspace); oh.vars = ast_variable_new("_PARKEDAT", buf, ""); - dchan = __ast_request_and_dial(dial_tech, cap_slin, NULL, dial_string, 30000, + dchan = __ast_request_and_dial(dial_tech, cap_slin, NULL, NULL, dial_string, 30000, &outstate, parkee_snapshot->caller_number, parkee_snapshot->caller_name, diff --git a/res/parking/parking_bridge.c b/res/parking/parking_bridge.c index bb9dbf30d..448d4ed5d 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, "Parking", bridge_lot->name); + | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM, "Parking", bridge_lot->name, NULL); bridge = ast_bridge_parking_init(bridge, bridge_lot); bridge = bridge_register(bridge); return bridge; diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c index bf211a2bd..e9f814151 100644 --- a/res/parking/parking_bridge_features.c +++ b/res/parking/parking_bridge_features.c @@ -200,7 +200,7 @@ static struct ast_channel *park_local_transfer(struct ast_channel *parker, const snprintf(destination, sizeof(destination), "%s@%s", exten, context); /* Now we request that chan_local prepare to call the destination */ - parkee = ast_request("Local", ast_channel_nativeformats(parker), parker, destination, + parkee = ast_request("Local", ast_channel_nativeformats(parker), NULL, parker, destination, &cause); if (!parkee) { return NULL; diff --git a/res/parking/parking_tests.c b/res/parking/parking_tests.c index f6767769a..ea7fd31d1 100644 --- a/res/parking/parking_tests.c +++ b/res/parking/parking_tests.c @@ -54,7 +54,7 @@ static const struct ast_party_caller alice_callerid = { static struct ast_channel *create_alice_channel(void) { struct ast_channel *alice = ast_channel_alloc(0, AST_STATE_DOWN, - "100", "Alice", "100", "100", "default", NULL, 0, + "100", "Alice", "100", "100", "default", NULL, NULL, 0, CHANNEL_TECH_NAME "/Alice"); if (!alice) { |