diff options
author | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 19:50:32 +0000 |
---|---|---|
committer | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 19:50:32 +0000 |
commit | 4c91da64d0071b3518c929a74df9c76619295569 (patch) | |
tree | 1be36b13b3ee150d3da223191c1fb178db0cf02f /apps | |
parent | e21acba35a591a01e81b1054b4ada6b85db55242 (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.2@249952 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_echo.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/apps/app_echo.c b/apps/app_echo.c index 8c56cd534..8b0d21f06 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); } |