Merged revisions 287685 via svnmerge from
authorAlec L Davis <sivad.a@paradise.net.nz>
Mon, 20 Sep 2010 23:42:56 +0000 (23:42 +0000)
committerAlec L Davis <sivad.a@paradise.net.nz>
Mon, 20 Sep 2010 23:42:56 +0000 (23:42 +0000)
commitc65de13046d69742a1778b66b7b969618bc1d635
tree5230819044745fe5f78151c6d89d37ab955655ba
parentf92fd39b5c43db4564047c0573029fb3f3f781c8
Merged revisions 287685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r287685 | alecdavis | 2010-09-21 11:16:45 +1200 (Tue, 21 Sep 2010) | 18 lines

  ast_channel_masquerade: Avoid recursive masquerades.

  Check all 4 combinations of (original/clonechan) * (masq/masqr).

  Initially original->masq and clonechan->masqr were only checked.

  It's possible with multiple masq's planned - and not yet executed, that
   the 'original' chan could already have another masq'd into it - thus original->masqr
  would be set, that masqr would lost.
  Likewise for the clonechan->masq.

  (closes issue #16057;#17363)
  Reported by: amorsen;davidw,alecdavis
  Patches:
        based on bug16057.diff4.txt uploaded by alecdavis (license 585)
  Tested by: ramonpeek, davidw, alecdavis
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287756 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c