diff options
| author | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 09:11:56 +0000 |
|---|---|---|
| committer | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 09:11:56 +0000 |
| commit | 722a7fa23906711ad60d38f722f34714d79e0d0f (patch) | |
| tree | 3bf862a0b5801a6041e30c51787b3d17bea42a96 | |
| parent | ef59905125d3b8ee4339bbd8ebebc63f07a9c2c4 (diff) | |
fixes ability to exit echo app
when called from a ISDN channel, null frames prevent '#' exit.
Now only echo back VOICE and DTMF frames
(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: http://svn.digium.com/svn/asterisk/branches/1.4@249845 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_echo.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/apps/app_echo.c b/apps/app_echo.c index 14f7c6d65..d75d34dc1 100644 --- a/apps/app_echo.c +++ b/apps/app_echo.c @@ -65,18 +65,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); } |