From c9145b15e9e5140f4ea25c7101b02932d311a3d7 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 25 Sep 2012 00:09:46 +0000 Subject: [PATCH] Add missing checks that I neglected. The SIP technology and SIP info technology should be considered equal. (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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b4f568901f..f2b0f2e63f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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; }