summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2009-12-30 21:59:18 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2009-12-30 21:59:18 +0000
commit7a016557320b7341a4fee067f98dd0ec42592514 (patch)
treeac1f3e81c2538b7024c7261cc2632f4eb821e956
parent7283d2b59ba9da353d928be0e78077804150cdf4 (diff)
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/trunk@236982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_local.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 00c058da1..b86c48c8b 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -257,7 +257,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);
}