From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Tue, 2 Mar 2010 09:16:02 +0000 (+0000)
Subject: fixes ability to exit echo app
X-Git-Tag: 1.6.0.26-rc1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f9cce846497375063693be27a203af9a2a347d8;p=thirdparty%2Fasterisk.git

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@249846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_echo.c b/apps/app_echo.c
index 1a8abe9f00..46b393aaef 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -54,18 +54,26 @@ static int echo_exec(struct ast_channel *chan, void *data)
 
 	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);
 	}