]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
revert ability to exit echo app
authorAlec L Davis <sivad.a@paradise.net.nz>
Tue, 2 Mar 2010 19:45:27 +0000 (19:45 +0000)
committerAlec L Davis <sivad.a@paradise.net.nz>
Tue, 2 Mar 2010 19:45:27 +0000 (19:45 +0000)
caused a regression, as only supported VOICE, not VIDEO etc.

(issue #16880)

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

apps/app_echo.c

index 46b393aaefc44f0b503601d15456e6f69056000d..76c701cd70266b1d289629bad290bd42d37605b3 100644 (file)
@@ -57,23 +57,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);
        }