From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Tue, 2 Mar 2010 19:50:32 +0000 (+0000)
Subject: revert ability to exit echo app
X-Git-Tag: 1.6.2.6-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=031cc7b9ebdaaa544b873c846c8ccb73fd07b1ff;p=thirdparty%2Fasterisk.git

revert ability to exit echo app

caused a regression, as only supported VOICE, not VIDEO etc.

(issue #16880)



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

diff --git a/apps/app_echo.c b/apps/app_echo.c
index 8c56cd5348..8b0d21f06d 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -62,23 +62,16 @@ static int echo_exec(struct ast_channel *chan, void *data)
 		if (!f) {
 			break;
 		}
-		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;
+		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;
 		}
 		ast_frfree(f);
 	}