diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-29 16:52:47 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-29 16:52:47 +0000 |
| commit | a9d607a35764d93790172cab1f630e14fb8e043c (patch) | |
| tree | dadea55813cfc525898844c51eec824d468455cb /apps/app_disa.c | |
| parent | 0b988da21c1ec856b7b8bad2434bf93498d17cfd (diff) | |
Opaquify ast_channel structs and lists
Review: https://reviewboard.asterisk.org/r/1773/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_disa.c')
| -rw-r--r-- | apps/app_disa.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_disa.c b/apps/app_disa.c index 5de3acfa5..0432a0b61 100644 --- a/apps/app_disa.c +++ b/apps/app_disa.c @@ -314,9 +314,9 @@ static int disa_exec(struct ast_channel *chan, const char *data) if (j == '#') { /* end of extension .. maybe */ if (i == 0 && (ast_matchmore_extension(chan, args.context, "#", 1, - S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL)) + S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL)) || ast_exists_extension(chan, args.context, "#", 1, - S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) ) { + S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) ) { /* Let the # be the part of, or the entire extension */ } else { break; @@ -347,7 +347,7 @@ static int disa_exec(struct ast_channel *chan, const char *data) /* if can do some more, do it */ if (!ast_matchmore_extension(chan, args.context, exten, 1, - S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) { + S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) { break; } } @@ -360,7 +360,7 @@ static int disa_exec(struct ast_channel *chan, const char *data) struct ast_flags cdr_flags = { AST_CDR_FLAG_POSTED }; if (!ast_exists_extension(chan, args.context, exten, 1, - S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) { + S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) { pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten); exten[0] = 'i'; exten[1] = '\0'; @@ -368,7 +368,7 @@ static int disa_exec(struct ast_channel *chan, const char *data) } if (!recheck || ast_exists_extension(chan, args.context, exten, 1, - S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) { + S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) { ast_playtones_stop(chan); /* We're authenticated and have a target extension */ if (!ast_strlen_zero(args.cid)) { |