[asterisk-commits] jpeeler: branch 1.4 r142927 - /branches/1.4/channels/chan_local.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Sep 12 17:22:28 2008
New Revision: 142927

URL: http://svn.digium.com/view/asterisk?view=rev&rev=142927
Log:
(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.


Modified:
    branches/1.4/channels/chan_local.c

Modified: branches/1.4/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=142927&r1=142926&r2=142927
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Fri Sep 12 17:22:28 2008
@@ -167,6 +167,10 @@
 
 	/* 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);