diff options
author | Alec L Davis <sivad.a@paradise.net.nz> | 2010-03-02 19:39:58 +0000 |
---|---|---|
committer | Alec L Davis <sivad.a@paradise.net.nz> | 2010-03-02 19:39:58 +0000 |
commit | 2866c664b82904776eb9f9acbfe2c6d6e38dfa4e (patch) | |
tree | 9b34985411c5646cd7b5e164ded6b66a77ddc466 | |
parent | 78fdaa68654e8b185f4b23bfa817fea70e582f16 (diff) |
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/trunk@249947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | apps/app_echo.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/apps/app_echo.c b/apps/app_echo.c index 5414ee37e..1c7211060 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -62,26 +62,17 @@ static int echo_exec(struct ast_channel *chan, const char *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) { - if (f->subclass.integer == '#') { - 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.integer == '#')) { + res = 0; + ast_frfree(f); + goto end; + } ast_frfree(f); } end: |