kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix small goto logic issue

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Anthony Minessale II
2004-12-02 18:08:11 +00:00
parent 2e868d323f
commit 3253f72193
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pbx.c
View File

@@ -3855,13 +3855,13 @@ int ast_add_extension(const char *context, int replace, const char *extension, i
} }
int ast_explicit_goto(struct ast_channel *chan, const char *context, const char *exten, int priority) { int ast_explicit_goto(struct ast_channel *chan, const char *context, const char *exten, int priority) {
if(chan && !ast_check_hangup(chan)) { if(chan) {
if (context && !ast_strlen_zero(context)) if (context && !ast_strlen_zero(context))
strncpy(chan->context, context, sizeof(chan->context) - 1); strncpy(chan->context, context, sizeof(chan->context) - 1);
if (exten && !ast_strlen_zero(exten)) if (exten && !ast_strlen_zero(exten))
strncpy(chan->exten, exten, sizeof(chan->context) - 1); strncpy(chan->exten, exten, sizeof(chan->context) - 1);
if (priority) if (priority)
chan->priority = priority - 1; chan->priority = priority;
return 0; return 0;
} }
return -1; return -1;
@@ -3874,7 +3874,7 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex
if (chan->pbx) { if (chan->pbx) {
/* This channel is currently in the PBX */ /* This channel is currently in the PBX */
ast_explicit_goto(chan, context, exten, priority); ast_explicit_goto(chan, context, exten, priority - 1);
ast_softhangup_nolock(chan, AST_SOFTHANGUP_ASYNCGOTO); ast_softhangup_nolock(chan, AST_SOFTHANGUP_ASYNCGOTO);
} else { } else {
/* In order to do it when the channel doesn't really exist within /* In order to do it when the channel doesn't really exist within
@@ -5454,7 +5454,7 @@ static int __ast_goto_if_exists(struct ast_channel *chan, char* context, char *e
return goto_func(chan, return goto_func(chan,
context ? context : chan->context, context ? context : chan->context,
exten ? exten : chan->exten, exten ? exten : chan->exten,
priority ? priority : chan->priority); (priority ? priority : chan->priority) - 1);
} else } else
return -3; return -3;
} }