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

pbx.c: when set flag AST_SOFTHANGUP_ASYNCGOTO, ast_explicit_goto should return -1.

Browse Source 
Under certain circumstances the context/extens/prio are set in the ast_async_goto, for example action Redirect.
In the situation that action Redirect is broken by GotoIf this info is changed.
that will causes confusion in dialplan execution.

Resolves: #1273
(cherry picked from commit 88f653c12d)
This commit is contained in:
Tinet-mucw
2025-06-18 19:34:56 -07:00
committed by Asterisk Development Team
parent cb434eb1be
commit 57340d50bf
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/asterisk/pbx.h
View File

@@ -1152,6 +1152,8 @@ int ast_context_unlockmacro(const char *macrocontext);
* \brief Set the channel to next execute the specified dialplan location.
* \see ast_async_parseable_goto, ast_async_goto_if_exists
*
* \note If the AST_SOFTHANGUP_ASYNCGOTO flag is set,
* it can prevent the dialplan location from being overwritten by ast_explicit_goto.
* \note Do _NOT_ hold any channel locks when calling this function.
*/
int ast_async_goto(struct ast_channel *chan, const char *context, const char *exten, int priority);
@@ -1533,6 +1535,7 @@ int ast_async_parseable_goto(struct ast_channel *chan, const char *goto_string);
/*!
* \note This function will handle locking the channel as needed.
* \note If the AST_SOFTHANGUP_ASYNCGOTO flag is set on the channel, this function will fail and return -1.
*/
int ast_explicit_goto(struct ast_channel *chan, const char *context, const char *exten, int priority);

4
main/pbx.c
View File

@@ -7009,6 +7009,10 @@ int ast_explicit_goto(struct ast_channel *chan, const char *context, const char
ast_channel_lock(chan);
if (ast_channel_softhangup_internal_flag(chan) & AST_SOFTHANGUP_ASYNCGOTO) {
ast_channel_unlock(chan);
return -1;
}
if (!ast_strlen_zero(context))
ast_channel_context_set(chan, context);
if (!ast_strlen_zero(exten))