kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 04:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes ability to exit echo app

Browse Source 
when called from a ISDN channel, null frames prevent '#' exit.
Now only echo back VOICE and DTMF frames

(closes 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@249846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alec L Davis
2010-03-02 09:16:02 +00:00
parent 28f650fc27
commit 0f9cce8464
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/app_echo.c
View File

@@ -54,18 +54,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);
}