[asterisk-commits] jpeeler: branch 1.6.1 r142935 - in /branches/1.6.1: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Sep 12 17:25:52 2008
New Revision: 142935

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


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_local.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_local.c?view=diff&rev=142935&r1=142934&r2=142935
==============================================================================
--- branches/1.6.1/channels/chan_local.c (original)
+++ branches/1.6.1/channels/chan_local.c Fri Sep 12 17:25:52 2008
@@ -202,6 +202,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);