diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-12 22:25:52 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-12 22:25:52 +0000 |
| commit | e389d8f9183088fc1277df2de384b06ea0710cf4 (patch) | |
| tree | 27d42dce07c74f43fec87bd50e70d575e44d0e18 | |
| parent | 9240d9d28db9615c125eb3e7557311d0cb4e5f63 (diff) | |
Merged revisions 142929 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r142929 | jpeeler | 2008-09-12 17:24:13 -0500 (Fri, 12 Sep 2008) | 14 lines
Merged revisions 142927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r142927 | jpeeler | 2008-09-12 17:22:28 -0500 (Fri, 12 Sep 2008) | 6 lines
(closes issue #12965)
Reported by: rlsutton2
Prevents local channels from playing MOH at each other which was causing ast_generic_bridge to loop much faster.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@142935 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_local.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index b2ca3cfb3..7e2eaee30 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -203,6 +203,10 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra /* Recalculate outbound channel */ other = isoutbound ? p->owner : p->chan; + /* do not queue frame if generator is on both local channels */ + if (us && us->generator && other->generator) + return 0; + /* Set glare detection */ ast_set_flag(p, LOCAL_GLARE_DETECT); if (ast_test_flag(p, LOCAL_CANCEL_QUEUE)) { |