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

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

4
channels/chan_motif.c
View File

@@ -785,7 +785,6 @@ static struct ast_channel *jingle_new(struct jingle_endpoint *endpoint, struct j
if (!(chan = ast_channel_alloc(1, state, S_OR(title, ""), S_OR(cid_name, ""), "", "", "", linkedid, 0, "Motif/%s-%04lx", str, ast_random() & 0xffff))) {
return NULL;
}
ast_channel_lock(chan);
ast_channel_stage_snapshot(chan);
@@ -853,7 +852,6 @@ static struct ast_channel *jingle_new(struct jingle_endpoint *endpoint, struct j
ao2_unlock(endpoint);
ast_channel_stage_snapshot_done(chan);
ast_channel_unlock(chan);
return chan;
}
@@ -2414,9 +2412,7 @@ static void jingle_action_session_initiate(struct jingle_endpoint *endpoint, str
ao2_link(endpoint->state->sessions, session);
ast_channel_lock(chan);
ast_setstate(chan, AST_STATE_RING);
ast_channel_unlock(chan);
res = ast_pbx_start(chan);
switch (res) {