kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stasis: Convey transfer information to applications

Browse Source 
This fixes a class of issues where Stasis applications were not made
aware that their channels were being manipulated or replaced by
external entitiessuch as transfers, AMI commands, or dialplan
applications such as Bridge(). Inconsistent information such as
StasisEnd events with unknown channels as a result of masquerades has
also been corrected. To accomplish these fixes, several new fields
were added to blind and attended transfer messages as well as
StasisStart and BridgeAttendedTransfer Stasis events.

ASTERISK-23941 #close
Review: https://reviewboard.asterisk.org/r/3865/
Review: https://reviewboard.asterisk.org/r/3857/
Review: https://reviewboard.asterisk.org/r/3852/
Review: https://reviewboard.asterisk.org/r/3816/
Review: https://reviewboard.asterisk.org/r/3731/
Review: https://reviewboard.asterisk.org/r/3729/
Review: https://reviewboard.asterisk.org/r/3728/
........

Merged revisions 420325 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-08-07 15:30:19 +00:00
parent a8829490b6
commit 0ac7f96057
22 changed files with 1467 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
res/stasis/command.c
View File

@@ -93,3 +93,61 @@ void command_invoke(struct stasis_app_command *command,
command_complete(command, retval);
}
static void command_queue_prestart_destroy(void *obj)
{
/* Clean up the container */
ao2_cleanup(obj);
}
static const struct ast_datastore_info command_queue_prestart = {
.type = "stasis-command-prestart-queue",
.destroy = command_queue_prestart_destroy,
};
int command_prestart_queue_command(struct ast_channel *chan,
stasis_app_command_cb command_fn, void *data)
{
struct ast_datastore *datastore;
struct ao2_container *command_queue;
RAII_VAR(struct stasis_app_command *, command,
command_create(command_fn, data), ao2_cleanup);
if (!command) {
return -1;
}
datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL);
if (datastore) {
command_queue = datastore->data;
ao2_link(command_queue, command);
return 0;
}
command_queue = ao2_container_alloc_list(
AO2_ALLOC_OPT_LOCK_MUTEX, 0, NULL, NULL);
if (!command_queue) {
return -1;
}
datastore = ast_datastore_alloc(&command_queue_prestart, NULL);
if (!datastore) {
ao2_cleanup(command_queue);
return -1;
}
ast_channel_datastore_add(chan, datastore);
datastore->data = command_queue;
ao2_link(command_queue, command);
return 0;
}
struct ao2_container *command_prestart_get_container(struct ast_channel *chan)
{
struct ast_datastore *datastore = ast_channel_datastore_find(chan, &command_queue_prestart, NULL);
if (!datastore) {
return NULL;
}
return ao2_bump(datastore->data);
}