diff options
| author | Matthew Jordan <mjordan@digium.com> | 2012-05-07 18:58:40 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2012-05-07 18:58:40 +0000 |
| commit | 11faa15d112ccc687991a2a6c0736040f62a7a07 (patch) | |
| tree | 62ff55bdeaf87cce9134c5d6254b7bf1bb3c50c2 | |
| parent | 005cd92e78643d0476570713532bae8d3c9f0869 (diff) | |
Fix channel opaquification slip-up in r365477
Those channels are opaque now...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@365480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_voicemail.c | 4 | ||||
| -rw-r--r-- | main/pbx.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index da974fcfc..55aec5d22 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5835,8 +5835,8 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ e[0] = *code; if (strchr(ecodes, e[0]) == NULL && ast_canmatch_extension(chan, - (!ast_strlen_zero(options->exitcontext) ? options->exitcontext : chan->context), - e, 1, S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) { + (!ast_strlen_zero(options->exitcontext) ? options->exitcontext : ast_channel_context(chan)), + e, 1, S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) { strncat(ecodes, e, sizeof(ecodes) - strlen(ecodes) - 1); } } diff --git a/main/pbx.c b/main/pbx.c index 75a569cd9..e4774f2ef 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5263,8 +5263,8 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, if (invalid || (ast_strlen_zero(dst_exten) && - !ast_exists_extension(c, c->context, c->exten, 1, - S_COR(c->caller.id.number.valid, c->caller.id.number.str, NULL)))) { + !ast_exists_extension(c, ast_channel_context(c), ast_channel_exten(c), 1, + S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, NULL)))) { /*!\note * If there is no match at priority 1, it is not a valid extension anymore. * Try to continue at "i" (for invalid) or "e" (for exception) or exit if |