Merged revisions 373179 via svnmerge from

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