Merged revisions 236982 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r236982 | tilghman | 2009-12-30 15:59:18 -0600 (Wed, 30 Dec 2009) | 16 lines

  Merged revisions 236981 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r236981 | tilghman | 2009-12-30 15:57:10 -0600 (Wed, 30 Dec 2009) | 9 lines

    Don't queue frames to channels that have no means to process them.
    (closes issue #15609)
     Reported by: aragon
     Patches:
           20091230__issue16521__1.4__chan_local_only.diff.txt uploaded by tilghman (license 14)
     Tested by: aragon

    Review: https://reviewboard.asterisk.org/r/452/
  ........
................

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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 724c721f8f01ce66c59cda9c3e276e05d9de3693..b674a15605621627a88b488f2dc21f6dc0ae8cad 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -251,7 +251,9 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
        }
 
        if (other) {
-               ast_queue_frame(other, f);
+               if (other->pbx || other->_bridge) {
+                       ast_queue_frame(other, f);
+               } /* else the frame won't go anywhere */
                ast_channel_unlock(other);
        }