[asterisk-commits] alecdavis: branch 1.6.0 r249846 - /branches/1.6.0/apps/app_echo.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Tue Mar  2 03:16:02 2010
New Revision: 249846

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249846
Log:
fixes ability to exit echo app

when called from a ISDN channel, null frames prevent '#' exit.
Now only echo back VOICE and DTMF frames

(closes issue #16880)
Reported by: alecdavis
Patches: 
      based on echo_exit_1-6-1.diff.txt uploaded by alecdavis (license 585)
Tested by: alecdavis


Modified:
    branches/1.6.0/apps/app_echo.c

Modified: branches/1.6.0/apps/app_echo.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_echo.c?view=diff&rev=249846&r1=249845&r2=249846
==============================================================================
--- branches/1.6.0/apps/app_echo.c (original)
+++ branches/1.6.0/apps/app_echo.c Tue Mar  2 03:16:02 2010
@@ -54,18 +54,26 @@
 
 	while (ast_waitfor(chan, -1) > -1) {
 		struct ast_frame *f = ast_read(chan);
-		if (!f)
+		if (!f) {
 			break;
-		f->delivery.tv_sec = 0;
-		f->delivery.tv_usec = 0;
-		if (ast_write(chan, f)) {
-			ast_frfree(f);
-			goto end;
 		}
-		if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
-			res = 0;
-			ast_frfree(f);
-			goto end;
+		switch (f->frametype) {
+		case AST_FRAME_VOICE:
+		case AST_FRAME_DTMF:
+			f->delivery.tv_sec = 0;
+			f->delivery.tv_usec = 0;
+			if (ast_write(chan, f)) {
+				ast_frfree(f);
+				goto end;
+			}
+			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
+				res = 0;
+				ast_frfree(f);
+				goto end;
+			}
+			break;
+		default:
+			break;
 		}
 		ast_frfree(f);
 	}