2005-11-08 23:37:53 +00:00
|
|
|
/*
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
2006-09-26 17:25:27 +00:00
|
|
|
* Copyright (c) 2004-2006 Tilghman Lesher <app_stack_v003@the-tilghman.com>.
|
2005-11-08 23:37:53 +00:00
|
|
|
*
|
|
|
|
* This code is released by the author with no restrictions on usage.
|
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*! \file
|
|
|
|
*
|
|
|
|
* \brief Stack applications Gosub, Return, etc.
|
2005-12-30 21:18:06 +00:00
|
|
|
*
|
2006-09-26 17:25:27 +00:00
|
|
|
* \author Tilghman Lesher <app_stack_v003@the-tilghman.com>
|
2005-11-08 23:37:53 +00:00
|
|
|
*
|
|
|
|
* \ingroup applications
|
|
|
|
*/
|
|
|
|
|
2008-10-15 08:55:47 +00:00
|
|
|
/*** MODULEINFO
|
2011-07-05 22:11:40 +00:00
|
|
|
<use type="module">res_agi</use>
|
2011-07-14 20:28:54 +00:00
|
|
|
<support_level>core</support_level>
|
2008-10-15 08:55:47 +00:00
|
|
|
***/
|
|
|
|
|
2006-06-07 18:54:56 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
|
2005-11-08 23:37:53 +00:00
|
|
|
#include "asterisk/pbx.h"
|
|
|
|
#include "asterisk/module.h"
|
2006-09-26 17:25:27 +00:00
|
|
|
#include "asterisk/app.h"
|
2007-06-20 04:36:23 +00:00
|
|
|
#include "asterisk/manager.h"
|
2007-11-22 03:50:04 +00:00
|
|
|
#include "asterisk/channel.h"
|
2008-05-30 16:10:46 +00:00
|
|
|
#include "asterisk/agi.h"
|
2005-11-08 23:37:53 +00:00
|
|
|
|
2008-11-01 21:10:07 +00:00
|
|
|
/*** DOCUMENTATION
|
|
|
|
<application name="Gosub" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Jump to label, saving return address.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="context" />
|
|
|
|
<parameter name="exten" />
|
|
|
|
<parameter name="priority" required="true" hasparams="optional">
|
|
|
|
<argument name="arg1" multiple="true" required="true" />
|
|
|
|
<argument name="argN" />
|
|
|
|
</parameter>
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Jumps to the label specified, saving the return address.</para>
|
|
|
|
</description>
|
2008-11-05 13:07:29 +00:00
|
|
|
<see-also>
|
|
|
|
<ref type="application">GosubIf</ref>
|
|
|
|
<ref type="application">Macro</ref>
|
|
|
|
<ref type="application">Goto</ref>
|
|
|
|
<ref type="application">Return</ref>
|
|
|
|
<ref type="application">StackPop</ref>
|
|
|
|
</see-also>
|
2008-11-01 21:10:07 +00:00
|
|
|
</application>
|
|
|
|
<application name="GosubIf" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Conditionally jump to label, saving return address.
|
|
|
|
</synopsis>
|
|
|
|
<syntax argsep="?">
|
|
|
|
<parameter name="condition" required="true" />
|
|
|
|
<parameter name="destination" required="true" argsep=":">
|
|
|
|
<argument name="labeliftrue" hasparams="optional">
|
|
|
|
<argument name="arg1" required="true" multiple="true" />
|
|
|
|
<argument name="argN" />
|
|
|
|
</argument>
|
|
|
|
<argument name="labeliffalse" hasparams="optional">
|
|
|
|
<argument name="arg1" required="true" multiple="true" />
|
|
|
|
<argument name="argN" />
|
|
|
|
</argument>
|
|
|
|
</parameter>
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>If the condition is true, then jump to labeliftrue. If false, jumps to
|
|
|
|
labeliffalse, if specified. In either case, a jump saves the return point
|
|
|
|
in the dialplan, to be returned to with a Return.</para>
|
|
|
|
</description>
|
2008-11-05 13:07:29 +00:00
|
|
|
<see-also>
|
|
|
|
<ref type="application">Gosub</ref>
|
|
|
|
<ref type="application">Return</ref>
|
|
|
|
<ref type="application">MacroIf</ref>
|
|
|
|
<ref type="function">IF</ref>
|
|
|
|
<ref type="application">GotoIf</ref>
|
|
|
|
</see-also>
|
2008-11-01 21:10:07 +00:00
|
|
|
</application>
|
|
|
|
<application name="Return" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Return from gosub routine.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="value">
|
|
|
|
<para>Return value.</para>
|
|
|
|
</parameter>
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Jumps to the last label on the stack, removing it. The return <replaceable>value</replaceable>, if
|
|
|
|
any, is saved in the channel variable <variable>GOSUB_RETVAL</variable>.</para>
|
|
|
|
</description>
|
2008-11-05 13:07:29 +00:00
|
|
|
<see-also>
|
|
|
|
<ref type="application">Gosub</ref>
|
|
|
|
<ref type="application">StackPop</ref>
|
|
|
|
</see-also>
|
2008-11-01 21:10:07 +00:00
|
|
|
</application>
|
|
|
|
<application name="StackPop" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Remove one address from gosub stack.
|
|
|
|
</synopsis>
|
|
|
|
<syntax />
|
|
|
|
<description>
|
|
|
|
<para>Removes last label on the stack, discarding it.</para>
|
|
|
|
</description>
|
2008-11-05 13:07:29 +00:00
|
|
|
<see-also>
|
|
|
|
<ref type="application">Return</ref>
|
|
|
|
<ref type="application">Gosub</ref>
|
|
|
|
</see-also>
|
2008-11-01 21:10:07 +00:00
|
|
|
</application>
|
2008-11-03 17:11:22 +00:00
|
|
|
<function name="LOCAL" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Manage variables local to the gosub stack frame.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="varname" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Read and write a variable local to the gosub stack frame, once we Return() it will be lost
|
|
|
|
(or it will go back to whatever value it had before the Gosub()).</para>
|
|
|
|
</description>
|
|
|
|
<see-also>
|
|
|
|
<ref type="application">Gosub</ref>
|
|
|
|
<ref type="application">GosubIf</ref>
|
|
|
|
<ref type="application">Return</ref>
|
|
|
|
</see-also>
|
|
|
|
</function>
|
2008-12-02 18:39:12 +00:00
|
|
|
<function name="LOCAL_PEEK" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Retrieve variables hidden by the local gosub stack frame.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="n" required="true" />
|
|
|
|
<parameter name="varname" required="true" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
2008-12-03 11:01:23 +00:00
|
|
|
<para>Read a variable <replaceable>varname</replaceable> hidden by
|
2008-12-02 18:39:12 +00:00
|
|
|
<replaceable>n</replaceable> levels of gosub stack frames. Note that ${LOCAL_PEEK(0,foo)}
|
2008-12-03 11:01:23 +00:00
|
|
|
is the same as <variable>foo</variable>, since the value of <replaceable>n</replaceable>
|
|
|
|
peeks under 0 levels of stack frames; in other words, 0 is the current level. If
|
|
|
|
<replaceable>n</replaceable> exceeds the available number of stack frames, then an empty
|
|
|
|
string is returned.</para>
|
2008-12-02 18:39:12 +00:00
|
|
|
</description>
|
|
|
|
<see-also>
|
|
|
|
<ref type="application">Gosub</ref>
|
|
|
|
<ref type="application">GosubIf</ref>
|
|
|
|
<ref type="application">Return</ref>
|
|
|
|
</see-also>
|
|
|
|
</function>
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
<function name="STACK_PEEK" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
View info about the location which called Gosub
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="n" required="true" />
|
|
|
|
<parameter name="which" required="true" />
|
|
|
|
<parameter name="suppress" required="false" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Read the calling <literal>c</literal>ontext, <literal>e</literal>xtension,
|
|
|
|
<literal>p</literal>riority, or <literal>l</literal>abel, as specified by
|
|
|
|
<replaceable>which</replaceable>, by going up <replaceable>n</replaceable> frames
|
|
|
|
in the Gosub stack. If <replaceable>suppress</replaceable> is true, then if the
|
|
|
|
number of available stack frames is exceeded, then no error message will be
|
|
|
|
printed.</para>
|
|
|
|
</description>
|
|
|
|
</function>
|
2009-06-06 23:28:38 +00:00
|
|
|
<agi name="gosub" language="en_US">
|
|
|
|
<synopsis>
|
|
|
|
Cause the channel to execute the specified dialplan subroutine.
|
|
|
|
</synopsis>
|
|
|
|
<syntax>
|
|
|
|
<parameter name="context" required="true" />
|
|
|
|
<parameter name="extension" required="true" />
|
|
|
|
<parameter name="priority" required="true" />
|
|
|
|
<parameter name="optional-argument" />
|
|
|
|
</syntax>
|
|
|
|
<description>
|
|
|
|
<para>Cause the channel to execute the specified dialplan subroutine,
|
|
|
|
returning to the dialplan with execution of a Return().</para>
|
|
|
|
</description>
|
|
|
|
</agi>
|
2008-11-01 21:10:07 +00:00
|
|
|
***/
|
2008-06-05 15:58:11 +00:00
|
|
|
|
2009-05-12 13:59:35 +00:00
|
|
|
static const char * const app_gosub = "Gosub";
|
|
|
|
static const char * const app_gosubif = "GosubIf";
|
|
|
|
static const char * const app_return = "Return";
|
|
|
|
static const char * const app_pop = "StackPop";
|
2005-11-08 23:37:53 +00:00
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
static void gosub_free(void *data);
|
|
|
|
|
|
|
|
static struct ast_datastore_info stack_info = {
|
|
|
|
.type = "GOSUB",
|
|
|
|
.destroy = gosub_free,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct gosub_stack_frame {
|
|
|
|
AST_LIST_ENTRY(gosub_stack_frame) entries;
|
|
|
|
/* 100 arguments is all that we support anyway, but this will handle up to 255 */
|
|
|
|
unsigned char arguments;
|
2007-06-20 04:36:23 +00:00
|
|
|
struct varshead varshead;
|
2007-03-03 16:43:36 +00:00
|
|
|
int priority;
|
2009-11-10 21:22:50 +00:00
|
|
|
unsigned int is_agi:1;
|
2007-03-03 16:43:36 +00:00
|
|
|
char *context;
|
|
|
|
char extension[0];
|
|
|
|
};
|
|
|
|
|
2007-06-20 13:00:45 +00:00
|
|
|
static int frame_set_var(struct ast_channel *chan, struct gosub_stack_frame *frame, const char *var, const char *value)
|
|
|
|
{
|
|
|
|
struct ast_var_t *variables;
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
/* Does this variable already exist? */
|
|
|
|
AST_LIST_TRAVERSE(&frame->varshead, variables, entries) {
|
|
|
|
if (!strcmp(var, ast_var_name(variables))) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-20 23:30:05 +00:00
|
|
|
if (!found) {
|
|
|
|
variables = ast_var_assign(var, "");
|
|
|
|
AST_LIST_INSERT_HEAD(&frame->varshead, variables, entries);
|
|
|
|
pbx_builtin_pushvar_helper(chan, var, value);
|
|
|
|
} else {
|
|
|
|
pbx_builtin_setvar_helper(chan, var, value);
|
2007-06-20 13:00:45 +00:00
|
|
|
}
|
2009-05-20 23:30:05 +00:00
|
|
|
|
|
|
|
manager_event(EVENT_FLAG_DIALPLAN, "VarSet",
|
|
|
|
"Channel: %s\r\n"
|
|
|
|
"Variable: LOCAL(%s)\r\n"
|
|
|
|
"Value: %s\r\n"
|
|
|
|
"Uniqueid: %s\r\n",
|
2012-01-24 20:12:09 +00:00
|
|
|
ast_channel_name(chan), var, value, ast_channel_uniqueid(chan));
|
2007-06-20 13:00:45 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
static void gosub_release_frame(struct ast_channel *chan, struct gosub_stack_frame *frame)
|
2005-11-08 23:37:53 +00:00
|
|
|
{
|
2007-06-20 04:36:23 +00:00
|
|
|
struct ast_var_t *vardata;
|
2006-09-26 17:25:27 +00:00
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
/* If chan is not defined, then we're calling it as part of gosub_free,
|
|
|
|
* and the channel variables will be deallocated anyway. Otherwise, we're
|
|
|
|
* just releasing a single frame, so we need to clean up the arguments for
|
|
|
|
* that frame, so that we re-expose the variables from the previous frame
|
|
|
|
* that were hidden by this one.
|
|
|
|
*/
|
2007-06-20 05:47:05 +00:00
|
|
|
while ((vardata = AST_LIST_REMOVE_HEAD(&frame->varshead, entries))) {
|
|
|
|
if (chan)
|
|
|
|
pbx_builtin_setvar_helper(chan, ast_var_name(vardata), NULL);
|
2007-06-20 04:36:23 +00:00
|
|
|
ast_var_delete(vardata);
|
2007-06-20 05:47:05 +00:00
|
|
|
}
|
2007-06-20 04:36:23 +00:00
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
ast_free(frame);
|
|
|
|
}
|
2006-09-26 17:25:27 +00:00
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
static struct gosub_stack_frame *gosub_allocate_frame(const char *context, const char *extension, int priority, unsigned char arguments)
|
|
|
|
{
|
|
|
|
struct gosub_stack_frame *new = NULL;
|
|
|
|
int len_extension = strlen(extension), len_context = strlen(context);
|
|
|
|
|
|
|
|
if ((new = ast_calloc(1, sizeof(*new) + 2 + len_extension + len_context))) {
|
2007-06-20 04:36:23 +00:00
|
|
|
AST_LIST_HEAD_INIT_NOLOCK(&new->varshead);
|
2007-03-03 16:43:36 +00:00
|
|
|
strcpy(new->extension, extension);
|
|
|
|
new->context = new->extension + len_extension + 1;
|
|
|
|
strcpy(new->context, context);
|
|
|
|
new->priority = priority;
|
|
|
|
new->arguments = arguments;
|
|
|
|
}
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gosub_free(void *data)
|
|
|
|
{
|
|
|
|
AST_LIST_HEAD(, gosub_stack_frame) *oldlist = data;
|
|
|
|
struct gosub_stack_frame *oldframe;
|
|
|
|
AST_LIST_LOCK(oldlist);
|
|
|
|
while ((oldframe = AST_LIST_REMOVE_HEAD(oldlist, entries))) {
|
|
|
|
gosub_release_frame(NULL, oldframe);
|
|
|
|
}
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
|
|
|
AST_LIST_HEAD_DESTROY(oldlist);
|
|
|
|
ast_free(oldlist);
|
|
|
|
}
|
|
|
|
|
2009-05-21 21:13:09 +00:00
|
|
|
static int pop_exec(struct ast_channel *chan, const char *data)
|
2007-03-03 16:43:36 +00:00
|
|
|
{
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
struct ast_datastore *stack_store;
|
2007-03-03 16:43:36 +00:00
|
|
|
struct gosub_stack_frame *oldframe;
|
|
|
|
AST_LIST_HEAD(, gosub_stack_frame) *oldlist;
|
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_lock(chan);
|
|
|
|
if (!(stack_store = ast_channel_datastore_find(chan, &stack_info, NULL))) {
|
2007-03-03 16:43:36 +00:00
|
|
|
ast_log(LOG_WARNING, "%s called with no gosub stack allocated.\n", app_pop);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-03-03 16:43:36 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
oldlist = stack_store->data;
|
|
|
|
AST_LIST_LOCK(oldlist);
|
|
|
|
oldframe = AST_LIST_REMOVE_HEAD(oldlist, entries);
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
|
|
|
|
2007-06-14 19:39:12 +00:00
|
|
|
if (oldframe) {
|
2007-03-03 16:43:36 +00:00
|
|
|
gosub_release_frame(chan, oldframe);
|
2007-06-14 19:39:12 +00:00
|
|
|
} else {
|
|
|
|
ast_debug(1, "%s called with an empty gosub stack\n", app_pop);
|
|
|
|
}
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2005-11-08 23:37:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-05-21 21:13:09 +00:00
|
|
|
static int return_exec(struct ast_channel *chan, const char *data)
|
2005-11-08 23:37:53 +00:00
|
|
|
{
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
struct ast_datastore *stack_store;
|
2007-03-03 16:43:36 +00:00
|
|
|
struct gosub_stack_frame *oldframe;
|
|
|
|
AST_LIST_HEAD(, gosub_stack_frame) *oldlist;
|
2009-05-21 21:13:09 +00:00
|
|
|
const char *retval = data;
|
2009-11-10 21:22:50 +00:00
|
|
|
int res = 0;
|
2005-11-08 23:37:53 +00:00
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_lock(chan);
|
|
|
|
if (!(stack_store = ast_channel_datastore_find(chan, &stack_info, NULL))) {
|
2007-03-03 16:43:36 +00:00
|
|
|
ast_log(LOG_ERROR, "Return without Gosub: stack is unallocated\n");
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2005-11-08 23:37:53 +00:00
|
|
|
return -1;
|
2006-09-26 17:25:27 +00:00
|
|
|
}
|
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
oldlist = stack_store->data;
|
|
|
|
AST_LIST_LOCK(oldlist);
|
|
|
|
oldframe = AST_LIST_REMOVE_HEAD(oldlist, entries);
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
2006-09-26 17:25:27 +00:00
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
if (!oldframe) {
|
|
|
|
ast_log(LOG_ERROR, "Return without Gosub: stack is empty\n");
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2005-11-08 23:37:53 +00:00
|
|
|
return -1;
|
2009-11-10 21:22:50 +00:00
|
|
|
} else if (oldframe->is_agi) {
|
|
|
|
/* Exit from AGI */
|
|
|
|
res = -1;
|
2005-11-08 23:37:53 +00:00
|
|
|
}
|
|
|
|
|
2007-03-03 16:43:36 +00:00
|
|
|
ast_explicit_goto(chan, oldframe->context, oldframe->extension, oldframe->priority);
|
|
|
|
gosub_release_frame(chan, oldframe);
|
2006-09-26 17:25:27 +00:00
|
|
|
|
|
|
|
/* Set a return value, if any */
|
|
|
|
pbx_builtin_setvar_helper(chan, "GOSUB_RETVAL", S_OR(retval, ""));
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2009-11-10 21:22:50 +00:00
|
|
|
return res;
|
2005-11-08 23:37:53 +00:00
|
|
|
}
|
|
|
|
|
2009-05-21 21:13:09 +00:00
|
|
|
static int gosub_exec(struct ast_channel *chan, const char *data)
|
2005-11-08 23:37:53 +00:00
|
|
|
{
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
struct ast_datastore *stack_store;
|
2012-02-29 16:52:47 +00:00
|
|
|
AST_LIST_HEAD(,gosub_stack_frame) *oldlist;
|
2010-03-16 23:49:35 +00:00
|
|
|
struct gosub_stack_frame *newframe, *lastframe;
|
2006-10-03 15:50:25 +00:00
|
|
|
char argname[15], *tmp = ast_strdupa(data), *label, *endparen;
|
2010-03-16 23:49:35 +00:00
|
|
|
int i, max_argc = 0;
|
2006-09-26 17:25:27 +00:00
|
|
|
AST_DECLARE_APP_ARGS(args2,
|
|
|
|
AST_APP_ARG(argval)[100];
|
|
|
|
);
|
2005-11-08 23:37:53 +00:00
|
|
|
|
|
|
|
if (ast_strlen_zero(data)) {
|
2008-05-30 16:10:46 +00:00
|
|
|
ast_log(LOG_ERROR, "%s requires an argument: %s([[context,]exten,]priority[(arg1[,...][,argN])])\n", app_gosub, app_gosub);
|
2005-11-08 23:37:53 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_lock(chan);
|
|
|
|
if (!(stack_store = ast_channel_datastore_find(chan, &stack_info, NULL))) {
|
2012-01-09 22:15:50 +00:00
|
|
|
ast_debug(1, "Channel %s has no datastore, so we're allocating one.\n", ast_channel_name(chan));
|
2008-08-05 16:56:11 +00:00
|
|
|
stack_store = ast_datastore_alloc(&stack_info, NULL);
|
2007-03-03 16:43:36 +00:00
|
|
|
if (!stack_store) {
|
|
|
|
ast_log(LOG_ERROR, "Unable to allocate new datastore. Gosub will fail.\n");
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-03-03 16:43:36 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
oldlist = ast_calloc(1, sizeof(*oldlist));
|
|
|
|
if (!oldlist) {
|
|
|
|
ast_log(LOG_ERROR, "Unable to allocate datastore list head. Gosub will fail.\n");
|
2008-08-05 16:56:11 +00:00
|
|
|
ast_datastore_free(stack_store);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-03-03 16:43:36 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
stack_store->data = oldlist;
|
|
|
|
AST_LIST_HEAD_INIT(oldlist);
|
|
|
|
ast_channel_datastore_add(chan, stack_store);
|
2010-03-16 23:49:35 +00:00
|
|
|
} else {
|
|
|
|
oldlist = stack_store->data;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((lastframe = AST_LIST_FIRST(oldlist))) {
|
|
|
|
max_argc = lastframe->arguments;
|
2007-03-03 16:43:36 +00:00
|
|
|
}
|
|
|
|
|
2006-10-02 04:17:57 +00:00
|
|
|
/* Separate the arguments from the label */
|
2006-10-03 15:50:25 +00:00
|
|
|
/* NOTE: you cannot use ast_app_separate_args for this, because '(' cannot be used as a delimiter. */
|
|
|
|
label = strsep(&tmp, "(");
|
|
|
|
if (tmp) {
|
|
|
|
endparen = strrchr(tmp, ')');
|
2006-10-02 04:17:57 +00:00
|
|
|
if (endparen)
|
|
|
|
*endparen = '\0';
|
2006-10-03 15:50:25 +00:00
|
|
|
else
|
|
|
|
ast_log(LOG_WARNING, "Ouch. No closing paren: '%s'?\n", (char *)data);
|
2009-08-06 21:29:26 +00:00
|
|
|
AST_STANDARD_RAW_ARGS(args2, tmp);
|
2006-10-03 15:50:25 +00:00
|
|
|
} else
|
|
|
|
args2.argc = 0;
|
2006-09-26 17:25:27 +00:00
|
|
|
|
2010-03-16 23:49:35 +00:00
|
|
|
/* Mask out previous arguments in this invocation */
|
|
|
|
if (args2.argc > max_argc) {
|
|
|
|
max_argc = args2.argc;
|
|
|
|
}
|
|
|
|
|
2006-10-02 04:17:57 +00:00
|
|
|
/* Create the return address, but don't save it until we know that the Gosub destination exists */
|
2012-02-20 23:43:27 +00:00
|
|
|
newframe = gosub_allocate_frame(ast_channel_context(chan), ast_channel_exten(chan), ast_channel_priority(chan) + 1, max_argc);
|
2005-11-08 23:37:53 +00:00
|
|
|
|
2008-12-03 18:37:46 +00:00
|
|
|
if (!newframe) {
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-06-20 13:00:45 +00:00
|
|
|
return -1;
|
2008-12-03 18:37:46 +00:00
|
|
|
}
|
2007-06-20 13:00:45 +00:00
|
|
|
|
2006-10-03 15:50:25 +00:00
|
|
|
if (ast_parseable_goto(chan, label)) {
|
|
|
|
ast_log(LOG_ERROR, "Gosub address is invalid: '%s'\n", (char *)data);
|
2007-03-03 16:43:36 +00:00
|
|
|
ast_free(newframe);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2005-11-08 23:37:53 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-02-13 17:27:06 +00:00
|
|
|
if (!ast_exists_extension(chan, ast_channel_context(chan), ast_channel_exten(chan),
|
2012-03-13 18:20:34 +00:00
|
|
|
ast_test_flag(ast_channel_flags(chan), AST_FLAG_IN_AUTOLOOP) ? ast_channel_priority(chan) + 1 : ast_channel_priority(chan),
|
2012-02-29 16:52:47 +00:00
|
|
|
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) {
|
2008-12-03 18:37:46 +00:00
|
|
|
ast_log(LOG_ERROR, "Attempt to reach a non-existent destination for gosub: (Context:%s, Extension:%s, Priority:%d)\n",
|
2012-03-13 18:20:34 +00:00
|
|
|
ast_channel_context(chan), ast_channel_exten(chan), ast_test_flag(ast_channel_flags(chan), AST_FLAG_IN_AUTOLOOP) ? ast_channel_priority(chan) + 1 : ast_channel_priority(chan));
|
2012-02-13 17:27:06 +00:00
|
|
|
ast_channel_context_set(chan, newframe->context);
|
|
|
|
ast_channel_exten_set(chan, newframe->extension);
|
2012-02-28 21:26:34 +00:00
|
|
|
ast_channel_priority_set(chan, newframe->priority - 1);
|
2008-12-03 18:37:46 +00:00
|
|
|
ast_free(newframe);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2008-12-03 18:37:46 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-09-26 17:25:27 +00:00
|
|
|
/* Now that we know for certain that we're going to a new location, set our arguments */
|
2010-03-16 23:49:35 +00:00
|
|
|
for (i = 0; i < max_argc; i++) {
|
2006-09-26 17:25:27 +00:00
|
|
|
snprintf(argname, sizeof(argname), "ARG%d", i + 1);
|
2010-03-16 23:49:35 +00:00
|
|
|
frame_set_var(chan, newframe, argname, i < args2.argc ? args2.argval[i] : "");
|
|
|
|
ast_debug(1, "Setting '%s' to '%s'\n", argname, i < args2.argc ? args2.argval[i] : "");
|
2006-09-26 17:25:27 +00:00
|
|
|
}
|
2008-10-27 16:44:55 +00:00
|
|
|
snprintf(argname, sizeof(argname), "%d", args2.argc);
|
|
|
|
frame_set_var(chan, newframe, "ARGC", argname);
|
2006-09-26 17:25:27 +00:00
|
|
|
|
2006-10-02 04:17:57 +00:00
|
|
|
/* And finally, save our return address */
|
2007-03-03 16:43:36 +00:00
|
|
|
oldlist = stack_store->data;
|
|
|
|
AST_LIST_LOCK(oldlist);
|
|
|
|
AST_LIST_INSERT_HEAD(oldlist, newframe, entries);
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-03-03 16:43:36 +00:00
|
|
|
|
2005-11-08 23:37:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-05-21 21:13:09 +00:00
|
|
|
static int gosubif_exec(struct ast_channel *chan, const char *data)
|
2005-11-08 23:37:53 +00:00
|
|
|
{
|
2006-10-02 22:02:45 +00:00
|
|
|
char *args;
|
2005-11-08 23:37:53 +00:00
|
|
|
int res=0;
|
2006-10-02 22:02:45 +00:00
|
|
|
AST_DECLARE_APP_ARGS(cond,
|
|
|
|
AST_APP_ARG(ition);
|
|
|
|
AST_APP_ARG(labels);
|
|
|
|
);
|
|
|
|
AST_DECLARE_APP_ARGS(label,
|
|
|
|
AST_APP_ARG(iftrue);
|
|
|
|
AST_APP_ARG(iffalse);
|
|
|
|
);
|
2005-11-08 23:37:53 +00:00
|
|
|
|
|
|
|
if (ast_strlen_zero(data)) {
|
2006-10-02 04:17:57 +00:00
|
|
|
ast_log(LOG_WARNING, "GosubIf requires an argument: GosubIf(cond?label1(args):label2(args)\n");
|
2005-11-08 23:37:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-02 22:02:45 +00:00
|
|
|
args = ast_strdupa(data);
|
2009-08-06 21:29:26 +00:00
|
|
|
AST_NONSTANDARD_RAW_ARGS(cond, args, '?');
|
2006-10-02 22:02:45 +00:00
|
|
|
if (cond.argc != 2) {
|
|
|
|
ast_log(LOG_WARNING, "GosubIf requires an argument: GosubIf(cond?label1(args):label2(args)\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-08-06 21:29:26 +00:00
|
|
|
AST_NONSTANDARD_RAW_ARGS(label, cond.labels, ':');
|
2005-11-08 23:37:53 +00:00
|
|
|
|
2006-10-02 22:02:45 +00:00
|
|
|
if (pbx_checkcondition(cond.ition)) {
|
|
|
|
if (!ast_strlen_zero(label.iftrue))
|
|
|
|
res = gosub_exec(chan, label.iftrue);
|
|
|
|
} else if (!ast_strlen_zero(label.iffalse)) {
|
|
|
|
res = gosub_exec(chan, label.iffalse);
|
2005-11-08 23:37:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-06-20 04:36:23 +00:00
|
|
|
static int local_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
|
|
|
|
{
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
struct ast_datastore *stack_store;
|
2007-06-20 04:36:23 +00:00
|
|
|
AST_LIST_HEAD(, gosub_stack_frame) *oldlist;
|
|
|
|
struct gosub_stack_frame *frame;
|
|
|
|
struct ast_var_t *variables;
|
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_lock(chan);
|
|
|
|
if (!(stack_store = ast_channel_datastore_find(chan, &stack_info, NULL))) {
|
|
|
|
ast_channel_unlock(chan);
|
2007-06-20 04:36:23 +00:00
|
|
|
return -1;
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
}
|
2007-06-20 04:36:23 +00:00
|
|
|
|
|
|
|
oldlist = stack_store->data;
|
|
|
|
AST_LIST_LOCK(oldlist);
|
2009-08-09 07:11:22 +00:00
|
|
|
if (!(frame = AST_LIST_FIRST(oldlist))) {
|
|
|
|
/* Not within a Gosub routine */
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2009-08-09 07:11:22 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-06-20 04:36:23 +00:00
|
|
|
AST_LIST_TRAVERSE(&frame->varshead, variables, entries) {
|
|
|
|
if (!strcmp(data, ast_var_name(variables))) {
|
2008-04-30 19:21:04 +00:00
|
|
|
const char *tmp;
|
|
|
|
tmp = pbx_builtin_getvar_helper(chan, data);
|
2007-06-20 05:47:05 +00:00
|
|
|
ast_copy_string(buf, S_OR(tmp, ""), len);
|
2007-06-20 04:36:23 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-06-20 04:36:23 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int local_write(struct ast_channel *chan, const char *cmd, char *var, const char *value)
|
|
|
|
{
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
struct ast_datastore *stack_store;
|
2007-06-20 04:36:23 +00:00
|
|
|
AST_LIST_HEAD(, gosub_stack_frame) *oldlist;
|
|
|
|
struct gosub_stack_frame *frame;
|
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_lock(chan);
|
|
|
|
if (!(stack_store = ast_channel_datastore_find(chan, &stack_info, NULL))) {
|
2007-06-20 04:36:23 +00:00
|
|
|
ast_log(LOG_ERROR, "Tried to set LOCAL(%s), but we aren't within a Gosub routine\n", var);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-06-20 04:36:23 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
oldlist = stack_store->data;
|
|
|
|
AST_LIST_LOCK(oldlist);
|
|
|
|
frame = AST_LIST_FIRST(oldlist);
|
2007-06-20 05:47:05 +00:00
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
if (frame) {
|
2007-06-20 13:00:45 +00:00
|
|
|
frame_set_var(chan, frame, var, value);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
}
|
2007-06-20 04:36:23 +00:00
|
|
|
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_channel_unlock(chan);
|
2007-06-20 04:36:23 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function local_function = {
|
|
|
|
.name = "LOCAL",
|
|
|
|
.write = local_write,
|
|
|
|
.read = local_read,
|
|
|
|
};
|
|
|
|
|
2008-12-02 18:39:12 +00:00
|
|
|
static int peek_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
|
|
|
|
{
|
|
|
|
int found = 0, n;
|
|
|
|
struct ast_var_t *variables;
|
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(n);
|
|
|
|
AST_APP_ARG(name);
|
|
|
|
);
|
|
|
|
|
|
|
|
if (!chan) {
|
|
|
|
ast_log(LOG_ERROR, "LOCAL_PEEK must be called on an active channel\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-08-06 21:29:26 +00:00
|
|
|
AST_STANDARD_RAW_ARGS(args, data);
|
2008-12-02 18:39:12 +00:00
|
|
|
n = atoi(args.n);
|
|
|
|
*buf = '\0';
|
|
|
|
|
|
|
|
ast_channel_lock(chan);
|
2012-02-29 16:52:47 +00:00
|
|
|
AST_LIST_TRAVERSE(ast_channel_varshead(chan), variables, entries) {
|
2008-12-02 18:39:12 +00:00
|
|
|
if (!strcmp(args.name, ast_var_name(variables)) && ++found > n) {
|
|
|
|
ast_copy_string(buf, ast_var_value(variables), len);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function peek_function = {
|
|
|
|
.name = "LOCAL_PEEK",
|
|
|
|
.read = peek_read,
|
|
|
|
};
|
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
static int stackpeek_read(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **str, ssize_t len)
|
|
|
|
{
|
|
|
|
struct ast_datastore *stack_store;
|
|
|
|
AST_LIST_HEAD(, gosub_stack_frame) *oldlist;
|
|
|
|
struct gosub_stack_frame *frame;
|
|
|
|
int n;
|
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(n);
|
|
|
|
AST_APP_ARG(which);
|
|
|
|
AST_APP_ARG(suppress);
|
|
|
|
);
|
|
|
|
|
|
|
|
if (!chan) {
|
|
|
|
ast_log(LOG_ERROR, "STACK_PEEK must be called on an active channel\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
data = ast_strdupa(data);
|
|
|
|
AST_STANDARD_APP_ARGS(args, data);
|
|
|
|
|
|
|
|
n = atoi(args.n);
|
|
|
|
if (n <= 0) {
|
|
|
|
ast_log(LOG_ERROR, "STACK_PEEK must be called with a positive peek value\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_channel_lock(chan);
|
|
|
|
if (!(stack_store = ast_channel_datastore_find(chan, &stack_info, NULL))) {
|
|
|
|
if (!ast_true(args.suppress)) {
|
|
|
|
ast_log(LOG_ERROR, "STACK_PEEK called on a channel without a gosub stack\n");
|
|
|
|
}
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
oldlist = stack_store->data;
|
|
|
|
|
|
|
|
AST_LIST_LOCK(oldlist);
|
|
|
|
AST_LIST_TRAVERSE(oldlist, frame, entries) {
|
|
|
|
if (--n == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!frame) {
|
|
|
|
/* Too deep */
|
|
|
|
if (!ast_true(args.suppress)) {
|
|
|
|
ast_log(LOG_ERROR, "Stack peek of '%s' is more stack frames than I have\n", args.n);
|
|
|
|
}
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
args.which = ast_skip_blanks(args.which);
|
|
|
|
|
|
|
|
switch (args.which[0]) {
|
|
|
|
case 'l': /* label */
|
|
|
|
ast_str_set(str, len, "%s,%s,%d", frame->context, frame->extension, frame->priority - 1);
|
|
|
|
break;
|
|
|
|
case 'c': /* context */
|
|
|
|
ast_str_set(str, len, "%s", frame->context);
|
|
|
|
break;
|
|
|
|
case 'e': /* extension */
|
|
|
|
ast_str_set(str, len, "%s", frame->extension);
|
|
|
|
break;
|
|
|
|
case 'p': /* priority */
|
|
|
|
ast_str_set(str, len, "%d", frame->priority - 1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ast_log(LOG_ERROR, "Unknown argument '%s' to STACK_PEEK\n", args.which);
|
|
|
|
}
|
|
|
|
|
|
|
|
AST_LIST_UNLOCK(oldlist);
|
|
|
|
ast_channel_unlock(chan);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_custom_function stackpeek_function = {
|
|
|
|
.name = "STACK_PEEK",
|
|
|
|
.read2 = stackpeek_read,
|
|
|
|
};
|
|
|
|
|
2009-05-21 21:13:09 +00:00
|
|
|
static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, const char * const *argv)
|
2008-05-30 16:10:46 +00:00
|
|
|
{
|
|
|
|
int old_priority, priority;
|
|
|
|
char old_context[AST_MAX_CONTEXT], old_extension[AST_MAX_EXTENSION];
|
|
|
|
struct ast_app *theapp;
|
|
|
|
char *gosub_args;
|
|
|
|
|
|
|
|
if (argc < 4 || argc > 5) {
|
|
|
|
return RESULT_SHOWUSAGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_debug(1, "Gosub called with %d arguments: 0:%s 1:%s 2:%s 3:%s 4:%s\n", argc, argv[0], argv[1], argv[2], argv[3], argc == 5 ? argv[4] : "");
|
|
|
|
|
2009-08-10 19:20:57 +00:00
|
|
|
if (sscanf(argv[3], "%30d", &priority) != 1 || priority < 1) {
|
2008-05-30 16:10:46 +00:00
|
|
|
/* Lookup the priority label */
|
2010-07-14 15:48:36 +00:00
|
|
|
priority = ast_findlabel_extension(chan, argv[1], argv[2], argv[3],
|
2012-02-29 16:52:47 +00:00
|
|
|
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL));
|
2010-07-14 15:48:36 +00:00
|
|
|
if (priority < 0) {
|
2008-05-30 16:10:46 +00:00
|
|
|
ast_log(LOG_ERROR, "Priority '%s' not found in '%s@%s'\n", argv[3], argv[2], argv[1]);
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "200 result=-1 Gosub label not found\n");
|
2008-05-30 16:10:46 +00:00
|
|
|
return RESULT_FAILURE;
|
|
|
|
}
|
2010-07-14 15:48:36 +00:00
|
|
|
} else if (!ast_exists_extension(chan, argv[1], argv[2], priority,
|
2012-02-29 16:52:47 +00:00
|
|
|
S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) {
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "200 result=-1 Gosub label not found\n");
|
2008-05-30 16:10:46 +00:00
|
|
|
return RESULT_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save previous location, since we're going to change it */
|
2012-02-13 17:27:06 +00:00
|
|
|
ast_copy_string(old_context, ast_channel_context(chan), sizeof(old_context));
|
|
|
|
ast_copy_string(old_extension, ast_channel_exten(chan), sizeof(old_extension));
|
2012-02-20 23:43:27 +00:00
|
|
|
old_priority = ast_channel_priority(chan);
|
2008-05-30 16:10:46 +00:00
|
|
|
|
|
|
|
if (!(theapp = pbx_findapp("Gosub"))) {
|
|
|
|
ast_log(LOG_ERROR, "Gosub() cannot be found in the list of loaded applications\n");
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "503 result=-2 Gosub is not loaded\n");
|
2008-05-30 16:10:46 +00:00
|
|
|
return RESULT_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Apparently, if you run ast_pbx_run on a channel that already has a pbx
|
|
|
|
* structure, you need to add 1 to the priority to get it to go to the
|
|
|
|
* right place. But if it doesn't have a pbx structure, then leaving off
|
|
|
|
* the 1 is the right thing to do. See how this code differs when we
|
|
|
|
* call a Gosub for the CALLEE channel in Dial or Queue.
|
|
|
|
*/
|
|
|
|
if (argc == 5) {
|
2012-02-20 23:43:27 +00:00
|
|
|
if (asprintf(&gosub_args, "%s,%s,%d(%s)", argv[1], argv[2], priority + (ast_channel_pbx(chan) ? 1 : 0), argv[4]) < 0) {
|
2008-11-02 18:52:13 +00:00
|
|
|
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
|
|
|
gosub_args = NULL;
|
|
|
|
}
|
2008-05-30 16:10:46 +00:00
|
|
|
} else {
|
2012-02-20 23:43:27 +00:00
|
|
|
if (asprintf(&gosub_args, "%s,%s,%d", argv[1], argv[2], priority + (ast_channel_pbx(chan) ? 1 : 0)) < 0) {
|
2008-11-02 18:52:13 +00:00
|
|
|
ast_log(LOG_WARNING, "asprintf() failed: %s\n", strerror(errno));
|
|
|
|
gosub_args = NULL;
|
|
|
|
}
|
2008-05-30 16:10:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (gosub_args) {
|
|
|
|
int res;
|
|
|
|
|
|
|
|
ast_debug(1, "Trying gosub with arguments '%s'\n", gosub_args);
|
|
|
|
|
|
|
|
if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) {
|
2012-02-20 23:43:27 +00:00
|
|
|
struct ast_pbx *pbx = ast_channel_pbx(chan);
|
2009-02-10 07:06:29 +00:00
|
|
|
struct ast_pbx_args args;
|
2009-11-10 21:22:50 +00:00
|
|
|
struct ast_datastore *stack_store = ast_channel_datastore_find(chan, &stack_info, NULL);
|
2012-05-04 22:17:38 +00:00
|
|
|
AST_LIST_HEAD(,gosub_stack_frame) *oldlist;
|
|
|
|
struct gosub_stack_frame *cur;
|
|
|
|
if (!stack_store) {
|
|
|
|
ast_log(LOG_WARNING, "No GoSub stack remaining after AGI GoSub execution.\n");
|
|
|
|
ast_free(gosub_args);
|
|
|
|
return RESULT_FAILURE;
|
|
|
|
}
|
|
|
|
oldlist = stack_store->data;
|
|
|
|
cur = AST_LIST_FIRST(oldlist);
|
2009-11-10 21:22:50 +00:00
|
|
|
cur->is_agi = 1;
|
|
|
|
|
2009-02-10 07:06:29 +00:00
|
|
|
memset(&args, 0, sizeof(args));
|
|
|
|
args.no_hangup_chan = 1;
|
2008-05-30 16:40:13 +00:00
|
|
|
/* Suppress warning about PBX already existing */
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_pbx_set(chan, NULL);
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "100 result=0 Trying...\n");
|
2009-02-10 05:39:33 +00:00
|
|
|
ast_pbx_run_args(chan, &args);
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "200 result=0 Gosub complete\n");
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_pbx(chan)) {
|
|
|
|
ast_free(ast_channel_pbx(chan));
|
2008-05-30 16:40:13 +00:00
|
|
|
}
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_pbx_set(chan, pbx);
|
2008-05-30 16:10:46 +00:00
|
|
|
} else {
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "200 result=%d Gosub failed\n", res);
|
2008-05-30 16:10:46 +00:00
|
|
|
}
|
|
|
|
ast_free(gosub_args);
|
|
|
|
} else {
|
2008-11-19 12:42:19 +00:00
|
|
|
ast_agi_send(agi->fd, chan, "503 result=-2 Memory allocation failure\n");
|
2008-05-30 16:10:46 +00:00
|
|
|
return RESULT_FAILURE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Restore previous location */
|
2012-02-13 17:27:06 +00:00
|
|
|
ast_channel_context_set(chan, old_context);
|
|
|
|
ast_channel_exten_set(chan, old_extension);
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_priority_set(chan, old_priority);
|
2008-05-30 16:10:46 +00:00
|
|
|
|
|
|
|
return RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2009-06-15 19:10:10 +00:00
|
|
|
static struct agi_command gosub_agi_command =
|
2009-06-06 23:28:38 +00:00
|
|
|
{ { "gosub", NULL }, handle_gosub, NULL, NULL, 0 };
|
2008-05-30 16:10:46 +00:00
|
|
|
|
2006-08-21 02:11:39 +00:00
|
|
|
static int unload_module(void)
|
2005-11-08 23:37:53 +00:00
|
|
|
{
|
2012-04-20 23:29:56 +00:00
|
|
|
struct ast_context *con;
|
|
|
|
|
2009-06-15 16:07:23 +00:00
|
|
|
ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
|
2008-05-30 16:10:46 +00:00
|
|
|
|
2005-11-08 23:37:53 +00:00
|
|
|
ast_unregister_application(app_return);
|
|
|
|
ast_unregister_application(app_pop);
|
|
|
|
ast_unregister_application(app_gosubif);
|
|
|
|
ast_unregister_application(app_gosub);
|
2007-06-20 04:36:23 +00:00
|
|
|
ast_custom_function_unregister(&local_function);
|
2008-12-02 18:39:12 +00:00
|
|
|
ast_custom_function_unregister(&peek_function);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_custom_function_unregister(&stackpeek_function);
|
2005-11-08 23:37:53 +00:00
|
|
|
|
2012-04-20 23:29:56 +00:00
|
|
|
con = ast_context_find("gosub_virtual_context");
|
|
|
|
if (con) {
|
|
|
|
/* leave nothing behind */
|
|
|
|
ast_context_remove_extension2(con, "s", 1, NULL, 0);
|
|
|
|
ast_context_destroy(con, "app_stack");
|
|
|
|
}
|
|
|
|
|
2005-11-08 23:37:53 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-08-21 02:11:39 +00:00
|
|
|
static int load_module(void)
|
2005-11-08 23:37:53 +00:00
|
|
|
{
|
2012-04-20 23:29:56 +00:00
|
|
|
struct ast_context *con;
|
|
|
|
|
|
|
|
/* Create internal gosub return target to indicate successful completion. */
|
|
|
|
con = ast_context_find_or_create(NULL, NULL, "gosub_virtual_context", "app_stack");
|
|
|
|
if (!con) {
|
|
|
|
ast_log(LOG_ERROR, "'gosub_virtual_context' does not exist and unable to create\n");
|
|
|
|
} else {
|
|
|
|
ast_add_extension2(con, 1, "s", 1, NULL, NULL, "NoOp",
|
|
|
|
ast_strdup("Internal Gosub call complete GOSUB_RETVAL=${GOSUB_RETVAL}"),
|
|
|
|
ast_free_ptr, "app_stack");
|
|
|
|
}
|
|
|
|
|
2009-06-15 16:07:23 +00:00
|
|
|
ast_agi_register(ast_module_info->self, &gosub_agi_command);
|
2008-05-30 16:10:46 +00:00
|
|
|
|
2008-11-01 21:10:07 +00:00
|
|
|
ast_register_application_xml(app_pop, pop_exec);
|
|
|
|
ast_register_application_xml(app_return, return_exec);
|
|
|
|
ast_register_application_xml(app_gosubif, gosubif_exec);
|
|
|
|
ast_register_application_xml(app_gosub, gosub_exec);
|
2007-06-20 04:36:23 +00:00
|
|
|
ast_custom_function_register(&local_function);
|
2008-12-02 18:39:12 +00:00
|
|
|
ast_custom_function_register(&peek_function);
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
ast_custom_function_register(&stackpeek_function);
|
2005-11-08 23:37:53 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER, "Dialplan subroutines (Gosub, Return, etc)",
|
2010-09-02 05:27:53 +00:00
|
|
|
.load = load_module,
|
|
|
|
.unload = unload_module,
|
Enable macros in 1.8 to find the next highest "h" extension in a context, like in 1.4.
This change restores functionality that was present in 1.4, when AEL macros
were implemented with the Macro dialplan application. Macros are fraught with
functionality issues, because they consume a large portion of the underlying
application stack. This limits the ability of AEL users to call many layers
of subroutines, an issue which Gosub does not have (originally tested to
100,000 levels deep). Therefore, starting in 1.6.0, AEL macros were
implemented with Gosub.
However, there were some implicit behaviors of Macro, which were not replicated
at the same time as with the transition to Gosub, one of which is documented in
the related issue. In particular, the "h" extension is designed to execute not
in the Macro context, but in the topmost calling context. Due to legacy issues
with a misapplied bugfix many years ago, when a macro exited in 1.4, it looks
in all calling contexts, bubbling up from the deepest level until it finds an
"h" extension.
Since AEL hides the complexity of the underlying dialplan logic from the AEL
programmer, it's reasonable to assume that this behavior should not change in
the transition from Asterisk 1.4 LTS to Asterisk 1.8 LTS, lest we break
working AEL configurations in the transition to Asterisk 1.8 LTS. This fix
is the result, which implements a search for the "h" extension in all calling
Gosub contexts.
Fixes ASTERISK-19336
Patch: 20120308__ael_bugfix_for_trunk__2.diff (License #5003) by Tilghman Lesher
(with slight modifications for 1.8)
Tested by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/1776/
........
Merged revisions 358810 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358811 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-13 08:06:20 +00:00
|
|
|
.load_pri = AST_MODPRI_APP_DEPEND,
|
2010-09-02 05:27:53 +00:00
|
|
|
.nonoptreq = "res_agi",
|
|
|
|
);
|