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

Check if PBX was started and fix F and F(x) action logic in Dial application.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@369258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-06-22 21:35:16 +00:00
parent 8139102c83
commit 9f3ce626fe
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/app_dial.c
View File

@@ -2688,7 +2688,9 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
ast_copy_string(peer->context, chan->context, sizeof(peer->context)); ast_copy_string(peer->context, chan->context, sizeof(peer->context));
ast_copy_string(peer->exten, chan->exten, sizeof(peer->exten)); ast_copy_string(peer->exten, chan->exten, sizeof(peer->exten));
peer->priority = chan->priority + 2; peer->priority = chan->priority + 2;
ast_pbx_start(peer); if (ast_pbx_start(peer)) {
ast_hangup(peer);
}
hanguptree(outgoing, NULL, ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE) ? 1 : 0); hanguptree(outgoing, NULL, ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE) ? 1 : 0);
if (continue_exec) if (continue_exec)
*continue_exec = 1; *continue_exec = 1;
@@ -2979,24 +2981,26 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
} }
ast_set2_flag(peer, autoloopflag, AST_FLAG_IN_AUTOLOOP); /* set it back the way it was */ ast_set2_flag(peer, autoloopflag, AST_FLAG_IN_AUTOLOOP); /* set it back the way it was */
} }
if (!ast_check_hangup(peer) && ast_test_flag64(&opts, OPT_CALLEE_GO_ON)) { if (!ast_check_hangup(peer)) {
if(!ast_strlen_zero(opt_args[OPT_ARG_CALLEE_GO_ON])) { if (ast_test_flag64(&opts, OPT_CALLEE_GO_ON)) {
replace_macro_delimiter(opt_args[OPT_ARG_CALLEE_GO_ON]); int goto_res;
ast_parseable_goto(peer, opt_args[OPT_ARG_CALLEE_GO_ON]);
} else { /* F() */ if (!ast_strlen_zero(opt_args[OPT_ARG_CALLEE_GO_ON])) {
int res; replace_macro_delimiter(opt_args[OPT_ARG_CALLEE_GO_ON]);
res = ast_goto_if_exists(peer, chan->context, chan->exten, (chan->priority) + 1); goto_res = ast_parseable_goto(peer, opt_args[OPT_ARG_CALLEE_GO_ON]);
if (res == AST_PBX_GOTO_FAILED) { } else { /* F() */
ast_hangup(peer); goto_res = ast_goto_if_exists(peer, chan->context,
chan->exten, chan->priority + 1);
}
if (!goto_res && !ast_pbx_start(peer)) {
/* The peer is now running its own PBX. */
goto out; goto out;
} }
} } else {
ast_pbx_start(peer);
} else {
if (!ast_check_hangup(chan))
chan->hangupcause = peer->hangupcause; chan->hangupcause = peer->hangupcause;
ast_hangup(peer); }
} }
ast_hangup(peer);
} }
out: out:
if (moh) { if (moh) {