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 1a8abe9f001c55b4ecb2a3c03a951d185cf5d829..46b393aaefc44f0b503601d15456e6f69056000d 100644 (file)
--- 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);
        }