Merged revisions 373179 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r373179 | file | 2012-09-19 12:05:47 -0500 (Wed, 19 Sep 2012) | 13 lines

  Fix a regression where direct media was not permitted for calls using SIP INFO DTMF.

  A change was committed to fix direct media ACL support. This change wrongly assumed that
  only a single channel technology structure exists for chan_sip. This is in fact false as
  a second exists for calls using SIP INFO DTMF. The code which performs direct media ACL
  checking now checks for both the non-INFO DTMF and INFO DTMF channel technology structures.

  (closes issue ASTERISK-20409)
  Reported by: michele cicciotti privatewave
  ........

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

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 42fb38904364dcf9d7d9376e1225ce88803bd9bf..78db9a5719ace71cfbacb0071dc70c7d79d3888e 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -30355,7 +30355,8 @@ static struct ast_udptl *sip_get_udptl_peer(struct ast_channel *chan)
 
        if (!(opp_chan = ast_bridged_channel(chan))) {
                return NULL;
-       } 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 NULL;
        }