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

Merged revisions 54622 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@54623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-02-15 16:19:39 +00:00
parent dadf652e26
commit bddfe6fea7
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/app_dial.c
View File

@@ -770,7 +770,7 @@ static int valid_priv_reply(struct ast_flags *opts, int res)
return 0;
}
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;
struct ast_module_user *u;
@@ -1052,6 +1052,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
}
}
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");
@@ -1475,7 +1478,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;
}
@@ -1668,12 +1673,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)
@@ -1729,14 +1732,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);
@@ -1774,7 +1779,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;