Skip to content
Snippets Groups Projects
Commit 9257e857 authored by Alec L Davis's avatar Alec L Davis
Browse files

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: 
      echo_exit.diff.txt uploaded by alecdavis (license 585)
Tested by: alecdavis



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@249801 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 5dbe86a3
No related branches found
No related tags found
No related merge requests found
......@@ -62,17 +62,26 @@ static int echo_exec(struct ast_channel *chan, const char *data)
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.integer == '#')) {
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) {
if (f->subclass.integer == '#') {
res = 0;
ast_frfree(f);
goto end;
}
}
break;
default:
break;
}
ast_frfree(f);
}
end:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment