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

Merged revisions 53354 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53354 | tilghman | 2007-02-07 09:30:02 -0600 (Wed, 07 Feb 2007) | 2 lines

Issue 7440 - Macro called from Macro from the h extension exits prematurely

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@53355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-02-07 15:33:51 +00:00
parent 1c90803367
commit 7f0c317655
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_macro.c
View File

@@ -115,9 +115,10 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
int oldpriority; int oldpriority;
char pc[80], depthc[12]; char pc[80], depthc[12];
char oldcontext[AST_MAX_CONTEXT] = ""; char oldcontext[AST_MAX_CONTEXT] = "";
const char *inhangupc;
int offset, depth = 0, maxdepth = 7; int offset, depth = 0, maxdepth = 7;
int setmacrocontext=0; int setmacrocontext=0;
int autoloopflag, dead = 0; int autoloopflag, dead = 0, inhangup = 0;
char *save_macro_exten; char *save_macro_exten;
char *save_macro_context; char *save_macro_context;
@@ -141,6 +142,13 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
s = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH"); s = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH");
if (s) if (s)
sscanf(s, "%d", &depth); sscanf(s, "%d", &depth);
/* Used for detecting whether to return when a Macro is called from another Macro after hangup */
if (strcmp(chan->exten, "h") == 0)
pbx_builtin_setvar_helper(chan, "MACRO_IN_HANGUP", "1");
inhangupc = pbx_builtin_getvar_helper(chan, "MACRO_IN_HANGUP");
if (!ast_strlen_zero(inhangupc))
sscanf(inhangupc, "%d", &inhangup);
if (depth >= maxdepth) { if (depth >= maxdepth) {
ast_log(LOG_ERROR, "Macro(): possible infinite loop detected. Returning early.\n"); ast_log(LOG_ERROR, "Macro(): possible infinite loop detected. Returning early.\n");
ast_module_user_remove(u); ast_module_user_remove(u);
@@ -263,7 +271,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
break; break;
} }
/* don't stop executing extensions when we're in "h" */ /* don't stop executing extensions when we're in "h" */
if (chan->_softhangup && strcasecmp(oldexten,"h") && strcasecmp(chan->macroexten,"h")) { if (chan->_softhangup && !inhangup) {
ast_log(LOG_DEBUG, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n", ast_log(LOG_DEBUG, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n",
chan->exten, chan->macroexten, chan->priority); chan->exten, chan->macroexten, chan->priority);
goto out; goto out;