diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /channels/chan_gtalk.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
Reverting r403311. It's causing ARI tests to hang.
........
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
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 72c01ac8d..d6a094941 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1150,7 +1150,6 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i, return NULL; } - ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); ast_channel_tech_set(tmp, >alk_tech); @@ -1227,7 +1226,6 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i, ast_jb_configure(tmp, &global_jbconf); ast_channel_stage_snapshot_done(tmp); - ast_channel_unlock(tmp); if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) { ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp)); @@ -1421,9 +1419,7 @@ static int gtalk_newcall(struct gtalk *client, ikspak *pak) ast_format_cap_joint_copy(p->cap, p->peercap, p->jointcap); ast_mutex_unlock(&p->lock); - ast_channel_lock(chan); ast_setstate(chan, AST_STATE_RING); - ast_channel_unlock(chan); if (ast_format_cap_is_empty(p->jointcap)) { ast_log(LOG_WARNING, "Capabilities don't match : us - %s, peer - %s, combined - %s \n", ast_getformatname_multiple(s1, BUFSIZ, p->cap), ast_getformatname_multiple(s2, BUFSIZ, p->peercap), |