]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Add missing checks that I neglected. The SIP technology and SIP info technology shoul...
authorJoshua Colp <jcolp@digium.com>
Tue, 25 Sep 2012 00:09:46 +0000 (00:09 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 25 Sep 2012 00:09:46 +0000 (00:09 +0000)
(closes issue ASTERISK-20409)
Reported by: michele cicciotti privatewave

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

channels/chan_sip.c

index b4f568901f54e49f1df1bcbbd48b9117c624be0f..f2b0f2e63fcd6f9f3cf519a219d729e51d61a3b0 100644 (file)
@@ -29368,7 +29368,8 @@ static enum ast_rtp_glue_result sip_get_rtp_peer(struct ast_channel *chan, struc
 
        if (!(opp_chan = ast_bridged_channel(chan))) {
                return AST_RTP_GLUE_RESULT_FORBID;
-       } else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+       } else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+                  (!(opp = opp_chan->tech_pvt))) {
                return AST_RTP_GLUE_RESULT_FORBID;
        }
 
@@ -29423,7 +29424,8 @@ static enum ast_rtp_glue_result sip_get_vrtp_peer(struct ast_channel *chan, stru
 
        if (!(opp_chan = ast_bridged_channel(chan))) {
                return AST_RTP_GLUE_RESULT_FORBID;
-       } else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+       } else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+                  (!(opp = opp_chan->tech_pvt))) {
                return AST_RTP_GLUE_RESULT_FORBID;
        }
 
@@ -29469,7 +29471,8 @@ static enum ast_rtp_glue_result sip_get_trtp_peer(struct ast_channel *chan, stru
 
        if (!(opp_chan = ast_bridged_channel(chan))) {
                return AST_RTP_GLUE_RESULT_FORBID;
-       } else if ((opp_chan->tech != &sip_tech) || (!(opp = opp_chan->tech_pvt))) {
+       } else if (((opp_chan->tech != &sip_tech) && (opp_chan->tech != &sip_tech_info)) ||
+                  (!(opp = opp_chan->tech_pvt))) {
                return AST_RTP_GLUE_RESULT_FORBID;
        }