[asterisk-commits] rmudgett: branch 1.8 r414269 - /branches/1.8/channels/chan_local.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed May 21 17:01:26 2014
New Revision: 414269

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414269
Log:
chan_local: Only block media frames when a generator is on both ends of a local channel.

The fix for ASTERISK-12292 was a bit too aggressive.  You could have
generators pointed at each other on local channels but need to get other
kinds of frames such as DTMF or CONNECTED_LINE frames accross.

Modified:
    branches/1.8/channels/chan_local.c

Modified: branches/1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_local.c?view=diff&rev=414269&r1=414268&r2=414269
==============================================================================
--- branches/1.8/channels/chan_local.c (original)
+++ branches/1.8/channels/chan_local.c Wed May 21 17:01:26 2014
@@ -427,8 +427,11 @@
 		return 0;
 	}
 
-	/* do not queue frame if generator is on both local channels */
-	if (us && us->generator && other->generator) {
+	/* do not queue media frames if a generator is on both local channels */
+	if (us
+		&& (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_VIDEO)
+		&& us->generator
+		&& other->generator) {
 		return 0;
 	}