[asterisk-commits] file: branch 10 r373533 - in /branches/10: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Sep 24 19:11:28 2012
New Revision: 373533

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373533
Log:
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

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_sip.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_sip.c?view=diff&rev=373533&r1=373532&r2=373533
==============================================================================
--- branches/10/channels/chan_sip.c (original)
+++ branches/10/channels/chan_sip.c Mon Sep 24 19:11:28 2012
@@ -30318,7 +30318,8 @@
 
 	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 @@
 
 	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 @@
 
 	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;
 	}