kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add another return value to dial_exec_full that indicates execution is going to continuing at a new extension/context/priority and to just let it slide. (issue #8598 reported by jon)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@50295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-01-10 04:51:06 +00:00
parent 4e779b5b43
commit ef53c893c3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/app_dial.c
View File

@@ -1470,7 +1470,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
ast_pbx_start(peer); ast_pbx_start(peer);
hanguptree(outgoing, NULL); hanguptree(outgoing, NULL);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return 0; return 1;
} }
if (ast_test_flag(&opts, OPT_CALLEE_MACRO) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_MACRO])) { if (ast_test_flag(&opts, OPT_CALLEE_MACRO) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_MACRO])) {
@@ -1649,8 +1649,12 @@ out:
static int dial_exec(struct ast_channel *chan, void *data) static int dial_exec(struct ast_channel *chan, void *data)
{ {
struct ast_flags peerflags; struct ast_flags peerflags;
int res = 0;
memset(&peerflags, 0, sizeof(peerflags)); memset(&peerflags, 0, sizeof(peerflags));
return dial_exec_full(chan, data, &peerflags); res = dial_exec_full(chan, data, &peerflags);
return (res >= 0 ? 0 : -1);
} }
static int retrydial_exec(struct ast_channel *chan, void *data) static int retrydial_exec(struct ast_channel *chan, void *data)
@@ -1719,7 +1723,10 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
if (ast_test_flag(chan, AST_FLAG_MOH)) if (ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_stop(chan); ast_moh_stop(chan);
if ((res = dial_exec_full(chan, dialdata, &peerflags)) == 0) { res = dial_exec_full(chan, dialdata, &peerflags);
if (res == 1) {
break;
} else if (res == 0) {
if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) { if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) {
if (!(res = ast_streamfile(chan, announce, chan->language))) if (!(res = ast_streamfile(chan, announce, chan->language)))
res = ast_waitstream(chan, AST_DIGIT_ANY); res = ast_waitstream(chan, AST_DIGIT_ANY);
@@ -1755,7 +1762,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
ast_moh_stop(chan); ast_moh_stop(chan);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return loops ? res : 0; return loops ? (res >= 0 ? 0 : -1) : 0;
} }