kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-01 04:29:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't use ast_channel_lock_both() here, it only exists in one of my branches.

Browse Source 
This is theoretically a potential deadlock, but it's the way it was before so
I'm going to leave it this way for now.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-09-18 16:10:48 +00:00
parent a9c2f441d3
commit 96f4079dac
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_zap.c
+4 -2
View File
@@ -3474,7 +3474,8 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
if (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))
return AST_BRIDGE_FAILED_NOWARN;
ast_channel_lock_both(c0, c1);
ast_channel_lock(c0);
ast_channel_lock(c1);
p0 = c0->tech_pvt;
p1 = c1->tech_pvt;
@@ -3640,7 +3641,8 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann
/* Here's our main loop... Start by locking things, looking for private parts,
and then balking if anything is wrong */
ast_channel_lock_both(c0, c1);
ast_channel_lock(c0);
ast_channel_lock(c1);
p0 = c0->tech_pvt;
p1 = c1->tech_pvt;