kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting r403311. It's causing ARI tests to hang.

Browse Source 
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-12-05 22:10:20 +00:00
parent fc70db3a81
commit 1212906351
57 changed files with 31 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/stasis_bridges.c
View File

@@ -397,9 +397,7 @@ struct stasis_message *ast_bridge_blob_create(
}
if (chan) {
ast_channel_lock(chan);
obj->channel = ast_channel_snapshot_create(chan);
ast_channel_unlock(chan);
if (obj->channel == NULL) {
return NULL;
}
@@ -581,9 +579,7 @@ static int bridge_channel_snapshot_pair_init(struct ast_bridge_channel_pair *pai
}
}
ast_channel_lock(pair->channel);
snapshot_pair->channel_snapshot = ast_channel_snapshot_create(pair->channel);
ast_channel_unlock(pair->channel);
if (!snapshot_pair->channel_snapshot) {
return -1;
}
@@ -919,9 +915,7 @@ void ast_bridge_publish_attended_transfer_link(int is_external, enum ast_transfe
transfer_msg->dest_type = AST_ATTENDED_TRANSFER_DEST_LINK;
for (i = 0; i < 2; ++i) {
ast_channel_lock(locals[i]);
transfer_msg->dest.links[i] = ast_channel_snapshot_create(locals[i]);
ast_channel_unlock(locals[i]);
if (!transfer_msg->dest.links[i]) {
return;
}