diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-15 16:24:13 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-15 16:24:13 +0000 |
commit | f57c5ee638396872568157c94a42e23285773c22 (patch) | |
tree | f4a8304c07be0c7fe4808421e0e17e507d4d268f /apps/app_dial.c | |
parent | 475d84f9d5bae9927b52ac2a324a13aa1ec58729 (diff) |
Merged revisions 54623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r54623 | file | 2007-02-15 11:19:39 -0500 (Thu, 15 Feb 2007) | 10 lines
Merged revisions 54622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r54622 | file | 2007-02-15 11:14:40 -0500 (Thu, 15 Feb 2007) | 2 lines
Use a separate variable to indicate execution should continue instead of the return value. (issue #8842 reported by pluto70)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@54624 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 29acff81d..47fdc5b79 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1167,7 +1167,7 @@ static int setup_privacy_args(struct privacy_args *pa, return 1; /* success */ } -static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags) +static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags, int *continue_exec) { int res = -1; /* default: error */ struct ast_module_user *u; @@ -1268,6 +1268,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags res = -1; /* reset default */ } + if (continue_exec) + *continue_exec = 0; + /* If a channel group has been specified, get it for use when we create peer channels */ outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP"); @@ -1533,7 +1536,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags peer->priority++; ast_pbx_start(peer); hanguptree(outgoing, NULL); - res = 1; + if (continue_exec) + *continue_exec = 1; + res = 0; goto done; } @@ -1708,12 +1713,10 @@ done: static int dial_exec(struct ast_channel *chan, void *data) { struct ast_flags peerflags; - int res = 0; memset(&peerflags, 0, sizeof(peerflags)); - res = dial_exec_full(chan, data, &peerflags); - return (res >= 0 ? 0 : -1); + return dial_exec_full(chan, data, &peerflags, NULL); } static int retrydial_exec(struct ast_channel *chan, void *data) @@ -1769,14 +1772,16 @@ static int retrydial_exec(struct ast_channel *chan, void *data) res = 0; while (loops) { + int continue_exec; + chan->data = "Retrying"; if (ast_test_flag(chan, AST_FLAG_MOH)) ast_moh_stop(chan); - res = dial_exec_full(chan, dialdata, &peerflags); - if (res == 1) { + res = dial_exec_full(chan, dialdata, &peerflags, &continue_exec); + if (continue_exec) break; - } else if (res == 0) { + if (res == 0) { if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) { if (!(res = ast_streamfile(chan, announce, chan->language))) res = ast_waitstream(chan, AST_DIGIT_ANY); @@ -1814,7 +1819,6 @@ static int retrydial_exec(struct ast_channel *chan, void *data) if (ast_test_flag(chan, AST_FLAG_MOH)) ast_moh_stop(chan); - done: ast_module_user_remove(u); return res; |