This change fixes bug 7731, macros not executing more than one level deep in a hung...
authorSteve Murphy <murf@digium.com>
Tue, 15 Aug 2006 21:25:19 +0000 (21:25 +0000)
committerSteve Murphy <murf@digium.com>
Tue, 15 Aug 2006 21:25:19 +0000 (21:25 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39909 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_macro.c

index 8b46bf0..ed496e3 100644 (file)
@@ -133,7 +133,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
        s = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH");
        if (s)
                sscanf(s, "%d", &depth);
-       if (depth >= 7) {
+       if (depth >= 20) {
                ast_log(LOG_ERROR, "Macro():  possible infinite loop detected.  Returning early.\n");
                LOCAL_USER_REMOVE(u);
                return 0;
@@ -254,9 +254,9 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive)
                        break;
                }
                /* don't stop executing extensions when we're in "h" */
-               if (chan->_softhangup && strcasecmp(oldexten,"h")) {
-                       ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",
-                               chan->exten, chan->priority);
+               if (chan->_softhangup && strcasecmp(chan->macroexten,"h")) {
+                       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);
                        goto out;
                }
                chan->priority++;