diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-15 23:04:36 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-15 23:04:36 +0000 |
| commit | 25cb2f0cd7ca0039bc8edd46200592a92ee68163 (patch) | |
| tree | 52c90c09b07e35050feba8fedf51f4276ed35db2 /apps | |
| parent | 70c0723370e66f74f22e57ff74ee33ddca91c3c5 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39962 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_macro.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 745bf4e36..4fb336025 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -127,7 +127,7 @@ static int macro_exec(struct ast_channel *chan, void *data) depth = 0; } - if (depth >= 7) { + if (depth >= 20) { ast_log(LOG_ERROR, "Macro(): possible infinite loop detected. Returning early.\n"); LOCAL_USER_REMOVE(u); return 0; @@ -241,9 +241,9 @@ static int macro_exec(struct ast_channel *chan, void *data) 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++; |