]> 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:11:28 +0000 (00:11 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 25 Sep 2012 00:11:28 +0000 (00:11 +0000)
(closes issue ASTERISK-20409)
Reported by: michele cicciotti privatewave
........

Merged revisions 373532 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

channels/chan_sip.c

index dc4938a90b9c2c727260593f2d26cf7f86bc233e..381ce447bd99f7dc8c67daf7545d1bfb6b8b3e03 100644 (file)
@@ -30318,7 +30318,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;
        }
 
@@ -30373,7 +30374,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;
        }
 
@@ -30419,7 +30421,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;
        }