[asterisk-commits] kmoore: trunk r360036 - in /trunk: ./ apps/app_echo.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Mar 20 15:42:34 2012
New Revision: 360036

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=360036
Log:
Prevent Echo() from relaying control, null, and modem frames

Echo()'s description states that it echoes audio, video, and DTMF except for #
while it actually echoes any frame that it receives other than DTMF #.  This
was causing frame storms in the test suite in some circumstances where Echo()
was attached to both ends of a pair of local channels and control frames
were being periodically generated.  Echo()'s behavior and description have
been modifed so that it only echoes media and non-# DTMF frames.
........

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

Merged revisions 360034 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/apps/app_echo.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_echo.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_echo.c?view=diff&rev=360036&r1=360035&r2=360036
==============================================================================
--- trunk/apps/app_echo.c (original)
+++ trunk/apps/app_echo.c Tue Mar 20 15:42:34 2012
@@ -40,12 +40,13 @@
 /*** DOCUMENTATION
 	<application name="Echo" language="en_US">
 		<synopsis>
-			Echo audio, video, DTMF back to the calling party
+			Echo media, DTMF back to the calling party
 		</synopsis>
 		<syntax />
 		<description>
-			<para>Echos back any audio, video or DTMF frames read from the calling 
-			channel back to itself. Note: If '#' detected application exits</para>
+			<para>Echos back any media or DTMF frames read from the calling 
+			channel back to itself. This will not echo CONTROL, MODEM, or NULL
+			frames. Note: If '#' detected application exits.</para>
 			<para>This application does not automatically answer and should be
 			preceeded by an application such as Answer() or Progress().</para>
 		</description>
@@ -70,7 +71,10 @@
 		}
 		f->delivery.tv_sec = 0;
 		f->delivery.tv_usec = 0;
-		if (ast_write(chan, f)) {
+		if (f->frametype != AST_FRAME_CONTROL
+			&& f->frametype != AST_FRAME_MODEM
+			&& f->frametype != AST_FRAME_NULL
+			&& ast_write(chan, f)) {
 			ast_frfree(f);
 			goto end;
 		}