Add support for allowing a native bridge to happen when the L option is enabled....

(issue #10647)
Reported by: samdell3

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103314 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 990ab41..c82c88f 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -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);

diff --git a/main/channel.c b/main/channel.c
index 446c0d4..d6710cc 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -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 &&