From 4b50339e4c38d868a9458f717648659e2d0ca39a Mon Sep 17 00:00:00 2001 From: tilghman Date: Wed, 30 Dec 2009 22:00:37 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@236984 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_local.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_local.c b/channels/chan_local.c index 724c721f8..b674a1560 100644 --- 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); } -- cgit v1.2.3