aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-02 19:45:27 +0000
committeralecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-02 19:45:27 +0000
commit74589da0e800b5898429f105669f3b567438030c (patch)
tree55a4360fb456dd424fe0e8519b308ee2b82a910e
parent726b50e7fb6c32f2809f9fb2f4fcfea2d6e29346 (diff)
revert ability to exit echo app
caused a regression, as only supported VOICE, not VIDEO etc. (issue #16880) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@249948 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_echo.c27
1 files changed, 10 insertions, 17 deletions
diff --git a/apps/app_echo.c b/apps/app_echo.c
index 46b393aae..76c701cd7 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -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);
}