diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-12 22:22:28 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-12 22:22:28 +0000 |
| commit | 962df782f27894f7c28b1cff079a65fd969f9ec4 (patch) | |
| tree | d5e8836e700349123a68f35ccb261996ee5ffc6f /channels | |
| parent | 3d74fe145cd118d1e92a9306dc15f32da3b91401 (diff) | |
(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.4@142927 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 783e973e0..1c4eaf56b 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -168,6 +168,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)) { |