kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +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

61
res/stasis/app.c
View File

@@ -28,6 +28,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "app.h"
#include "control.h"
#include "messaging.h"
#include "asterisk/callerid.h"
@@ -699,14 +700,32 @@ static void bridge_blind_transfer_handler(void *data, struct stasis_subscription
struct stasis_message *message)
{
struct stasis_app *app = data;
struct ast_bridge_blob *blob = stasis_message_data(message);
struct ast_blind_transfer_message *transfer_msg = stasis_message_data(message);
struct ast_bridge_snapshot *bridge = transfer_msg->to_transferee.bridge_snapshot;
if (bridge_app_subscribed(app, blob->channel->uniqueid) ||
(blob->bridge && bridge_app_subscribed_involved(app, blob->bridge))) {
if (bridge_app_subscribed(app, transfer_msg->to_transferee.channel_snapshot->uniqueid) ||
(bridge && bridge_app_subscribed_involved(app, bridge))) {
stasis_publish(app->topic, message);
}
}
static void set_replacement_channel(struct ast_channel_snapshot *to_be_replaced,
struct ast_channel_snapshot *replacing)
{
struct stasis_app_control *control = stasis_app_control_find_by_channel_id(
to_be_replaced->uniqueid);
struct ast_channel *chan = ast_channel_get_by_name(replacing->uniqueid);
if (control && chan) {
ast_channel_lock(chan);
app_set_replace_channel_app(chan, app_name(control_app(control)));
app_set_replace_channel_snapshot(chan, to_be_replaced);
ast_channel_unlock(chan);
}
ast_channel_cleanup(chan);
ao2_cleanup(control);
}
static void bridge_attended_transfer_handler(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
@@ -751,6 +770,18 @@ static void bridge_attended_transfer_handler(void *data, struct stasis_subscript
if (subscribed) {
stasis_publish(app->topic, message);
}
if (transfer_msg->replace_channel) {
set_replacement_channel(transfer_msg->to_transferee.channel_snapshot,
transfer_msg->replace_channel);
}
if (transfer_msg->dest_type == AST_ATTENDED_TRANSFER_DEST_LINK) {
set_replacement_channel(transfer_msg->to_transferee.channel_snapshot,
transfer_msg->dest.links[0]);
set_replacement_channel(transfer_msg->to_transfer_target.channel_snapshot,
transfer_msg->dest.links[1]);
}
}
static void bridge_default_handler(void *data, struct stasis_subscription *sub,
@@ -1091,6 +1122,30 @@ int app_is_subscribed_channel_id(struct stasis_app *app, const char *channel_id)
return forwards != NULL;
}
int app_replace_channel_forwards(struct stasis_app *app, const char *old_id, struct ast_channel *new_chan)
{
RAII_VAR(struct app_forwards *, old_forwards, NULL, ao2_cleanup);
struct app_forwards *new_forwards;
old_forwards = ao2_find(app->forwards, old_id, OBJ_SEARCH_KEY | OBJ_UNLINK);
if (!old_forwards) {
return -1;
}
new_forwards = forwards_create_channel(app, new_chan);
if (!new_forwards) {
return -1;
}
new_forwards->interested = old_forwards->interested;
ao2_link_flags(app->forwards, new_forwards, 0);
ao2_cleanup(new_forwards);
/* Clean up old forwards */
forwards_unsubscribe(old_forwards);
return 0;
}
static void *channel_find(const struct stasis_app *app, const char *id)
{
return ast_channel_get_by_name(id);