[svn-commits] rmudgett: branch 11 r414270 - in /branches/11: ./ channels/chan_local.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed May 21 17:05:53 2014
New Revision: 414270

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

Merged revisions 414269 from http://svn.asterisk.org/svn/asterisk/branches/1.8

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

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_local.c?view=diff&rev=414270&r1=414269&r2=414270
==============================================================================
--- branches/11/channels/chan_local.c (original)
+++ branches/11/channels/chan_local.c Wed May 21 17:05:53 2014
@@ -429,8 +429,11 @@
 		return 0;
 	}
 
-	/* do not queue frame if generator is on both local channels */
-	if (us && ast_channel_generator(us) && ast_channel_generator(other)) {
+	/* 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)
+		&& ast_channel_generator(us)
+		&& ast_channel_generator(other)) {
 		return 0;
 	}