From: Automerge script <automerge@asterisk.org>
Date: Tue, 25 Sep 2012 00:22:04 +0000 (+0000)
Subject: Merged revisions 373533 via svnmerge from
X-Git-Tag: 10.10.0-digiumphones-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef7b6d6adc9e82824ab3f716dc7e6d6875cb28f8;p=thirdparty%2Fasterisk.git

Merged revisions 373533 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r373533 | file | 2012-09-24 19:11:28 -0500 (Mon, 24 Sep 2012) | 5 lines

  Add missing checks that I neglected. The SIP technology and SIP info technology should be considered equal.
  ........

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


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d9270851b1..9331438e6a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -30487,7 +30487,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;
 	}
 
@@ -30542,7 +30543,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;
 	}
 
@@ -30588,7 +30590,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;
 	}