dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Add support for allowing a native bridge to happen when the L option is enabled. The RTP bridging could already handle this, it just needed to be enabled in the main bridging code. 

(issue #10647)
Reported by: samdell3


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103314 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2008-02-11 16:17:15 +00:00
parent ae87ed1abb
commit 5dfa4987a0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_iax2.c
View File

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

1
main/channel.c
View File

@ -4238,7 +4238,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
pbx_builtin_setvar_helper(c0, "BRIDGEPVTCALLID", c1->tech->get_pvt_uniqueid(c1));
if (c0->tech->bridge &&
(config->timelimit == 0) &&
(c0->tech->bridge == c1->tech->bridge) &&
!nativefailed && !c0->monitor && !c1->monitor &&
!c0->audiohooks && !c1->audiohooks &&