From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 12 Sep 2008 22:22:28 +0000 (+0000)
Subject: (closes issue #12965)
X-Git-Tag: 1.4.23-rc1~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca37a647542b7c3499f49790dbe1cbbfef6beb9a;p=thirdparty%2Fasterisk.git

(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: https://origsvn.digium.com/svn/asterisk/branches/1.4@142927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 783e973e03..1c4eaf56b9 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)) {