kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 115669 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r115669 | bbryant | 2008-05-12 10:17:32 -0500 (Mon, 12 May 2008) | 3 lines

A small change to fix iax2 native bridging.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Brett Bryant
2008-05-12 15:18:10 +00:00
parent 77705a0808
commit c9d6041a8b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_iax2.c
View File

@@ -3759,8 +3759,11 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
struct timeval waittimer = {0, 0}, tv; struct timeval waittimer = {0, 0}, tv;
/* We currently do not support native bridging if a timeoutms value has been provided */ /* We currently do not support native bridging if a timeoutms value has been provided */
if (timeoutms) if (timeoutms > 0) {
return AST_BRIDGE_FAILED; return AST_BRIDGE_FAILED;
}
timeoutms = 0;
lock_both(callno0, callno1); lock_both(callno0, callno1);
if (!iaxs[callno0] || !iaxs[callno1]) { if (!iaxs[callno0] || !iaxs[callno1]) {