fix logic for n+101 jumps

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Russell Bryant 20 years ago
parent 49641825eb
commit cccb11916f

@ -1,5 +1,8 @@
2005-11-20 Russell Bryant <russell@digium.com> 2005-11-20 Russell Bryant <russell@digium.com>
* apps/app_controlplayback.c: Fix logic in checking for success when jumping to priority n+101.
* apps/app_md5.c: Fix logic in checking for success when jumping to priority n+101.
* apps/app_hasnewvoicemail.c: Fix a typo in the application description. Also, fix the logic in checking for success when jumping to priority n+101. (issue #5795) * apps/app_hasnewvoicemail.c: Fix a typo in the application description. Also, fix the logic in checking for success when jumping to priority n+101. (issue #5795)
* UPGRADE.txt: Add a note on a second way that the IAX2 channel naming convention has changed. (issue #5792) * UPGRADE.txt: Add a note on a second way that the IAX2 channel naming convention has changed. (issue #5792)

@ -140,7 +140,7 @@ static int controlplayback_exec(struct ast_channel *chan, void *data)
} else { } else {
if (res < 0) { if (res < 0) {
if (priority_jump || option_priority_jumping) { if (priority_jump || option_priority_jumping) {
if (!ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) { if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) {
ast_log(LOG_WARNING, "ControlPlayback tried to jump to priority n+101 as requested, but priority didn't exist\n"); ast_log(LOG_WARNING, "ControlPlayback tried to jump to priority n+101 as requested, but priority didn't exist\n");
} }
} }

@ -157,9 +157,9 @@ static int md5check_exec(struct ast_channel *chan, void *data)
ast_log(LOG_DEBUG, "ERROR: MD5 not verified: %s -- %s\n", args.md5hash, args.string); ast_log(LOG_DEBUG, "ERROR: MD5 not verified: %s -- %s\n", args.md5hash, args.string);
pbx_builtin_setvar_helper(chan, "CHECKMD5STATUS", "NOMATCH"); pbx_builtin_setvar_helper(chan, "CHECKMD5STATUS", "NOMATCH");
if (priority_jump || option_priority_jumping) { if (priority_jump || option_priority_jumping) {
if (!ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101))
if (option_debug > 2) if (option_debug > 2)
ast_log(LOG_DEBUG, "ERROR: Can't jump to exten+101 (e%s,p%d), sorry\n", chan->exten,chan->priority+101); ast_log(LOG_DEBUG, "Can't jump to exten+101 (e%s,p%d), sorry\n", chan->exten,chan->priority+101);
} }
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
return res; return res;

Loading…
Cancel
Save