diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-13 18:20:34 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-13 18:20:34 +0000 |
| commit | 786f5898d12d30c481b1d178bb80e5801dbf666f (patch) | |
| tree | 2b5e07ed1b5fbd7aae1187f068eff498621878a2 /main/pbx.c | |
| parent | 73ec67e008ca6db76625bfc1f992fa726c948837 (diff) | |
Finalize ast_channel opaquification
Review: https://reviewboard.asterisk.org/r/1786/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/pbx.c b/main/pbx.c index d848fc3b6..221e5173f 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5119,8 +5119,8 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, ast_channel_pbx(c)->rtimeoutms = 10000; ast_channel_pbx(c)->dtimeoutms = 5000; - autoloopflag = ast_test_flag(c, AST_FLAG_IN_AUTOLOOP); /* save value to restore at the end */ - ast_set_flag(c, AST_FLAG_IN_AUTOLOOP); + autoloopflag = ast_test_flag(ast_channel_flags(c), AST_FLAG_IN_AUTOLOOP); /* save value to restore at the end */ + ast_set_flag(ast_channel_flags(c), AST_FLAG_IN_AUTOLOOP); if (ast_strlen_zero(ast_channel_exten(c))) { /* If not successful fall back to 's' - but only if there is no given exten */ @@ -5370,7 +5370,7 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, } if ((!args || !args->no_hangup_chan) - && !ast_test_flag(c, AST_FLAG_BRIDGE_HANGUP_RUN) + && !ast_test_flag(ast_channel_flags(c), AST_FLAG_BRIDGE_HANGUP_RUN) && ast_exists_extension(c, ast_channel_context(c), "h", 1, S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, NULL))) { set_ext_pri(c, "h", 1); @@ -5388,8 +5388,8 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", ast_channel_context(c), ast_channel_exten(c), ast_channel_priority(c), ast_channel_name(c)); } } - ast_set2_flag(c, autoloopflag, AST_FLAG_IN_AUTOLOOP); - ast_clear_flag(c, AST_FLAG_BRIDGE_HANGUP_RUN); /* from one round to the next, make sure this gets cleared */ + ast_set2_flag(ast_channel_flags(c), autoloopflag, AST_FLAG_IN_AUTOLOOP); + ast_clear_flag(ast_channel_flags(c), AST_FLAG_BRIDGE_HANGUP_RUN); /* from one round to the next, make sure this gets cleared */ pbx_destroy(ast_channel_pbx(c)); ast_channel_pbx_set(c, NULL); @@ -8302,7 +8302,7 @@ int ast_explicit_goto(struct ast_channel *chan, const char *context, const char if (priority > -1) { ast_channel_priority_set(chan, priority); /* see flag description in channel.h for explanation */ - if (ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP)) { + if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_IN_AUTOLOOP)) { ast_channel_priority_set(chan, ast_channel_priority(chan) - 1); } } @@ -9977,7 +9977,7 @@ static int pbx_builtin_background(struct ast_channel *chan, const char *data) * users can EXEC Background and reasonably expect that the DTMF code will * be returned (see #16434). */ - if (!ast_test_flag(chan, AST_FLAG_DISABLE_WORKAROUNDS) + if (!ast_test_flag(ast_channel_flags(chan), AST_FLAG_DISABLE_WORKAROUNDS) && (exten[0] = res) && ast_canmatch_extension(chan, args.context, exten, 1, S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)) |