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

adds two new applications, exitwhile, and continuewhile

Browse Source 
patch from bug 6994.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-04-26 18:49:07 +00:00
parent 55a24ef8cc
commit d5892657fe
1 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/app_while.c
View File

@@ -52,7 +52,7 @@ static char *exec_desc =
"Usage: ExecIF (<expr>|<app>|<data>)\n" "Usage: ExecIF (<expr>|<app>|<data>)\n"
"If <expr> is true, execute and return the result of <app>(<data>).\n" "If <expr> is true, execute and return the result of <app>(<data>).\n"
"If <expr> is true, but <app> is not found, then the application\n" "If <expr> is true, but <app> is not found, then the application\n"
"will return a non-zero value."; "will return a non-zero value.\n";
static char *exec_synopsis = "Conditional exec"; static char *exec_synopsis = "Conditional exec";
static char *start_app = "While"; static char *start_app = "While";
@@ -61,15 +61,27 @@ static char *start_desc =
"Start a While Loop. Execution will return to this point when\n" "Start a While Loop. Execution will return to this point when\n"
"EndWhile is called until expr is no longer true.\n"; "EndWhile is called until expr is no longer true.\n";
static char *start_synopsis = "Start A While Loop"; static char *start_synopsis = "Start a while loop";
static char *stop_app = "EndWhile"; static char *stop_app = "EndWhile";
static char *stop_desc = static char *stop_desc =
"Usage: EndWhile()\n" "Usage: EndWhile()\n"
"Return to the previous called While\n\n"; "Return to the previous called While\n";
static char *stop_synopsis = "End A While Loop"; static char *stop_synopsis = "End a while loop";
static char *exit_app = "ExitWhile";
static char *exit_desc =
"Usage: ExitWhile()\n"
"Exits a While loop, whether or not the conditional has been satisfied.\n";
static char *exit_synopsis = "End a While loop";
static char *continue_app = "ContinueWhile";
static char *continue_desc =
"Usage: ContinueWhile()\n"
"Returns to the top of the while loop and re-evaluates the conditional.\n";
static char *continue_synopsis = "Restart a While loop";
static char *tdesc = "While Loops and Conditional Execution"; static char *tdesc = "While Loops and Conditional Execution";
@@ -265,7 +277,7 @@ static int _while_exec(struct ast_channel *chan, void *data, int end)
} }
if (!end && !ast_true(condition)) { if ((!end && !ast_true(condition)) || (end == 2)) {
/* Condition Met (clean up helper vars) */ /* Condition Met (clean up helper vars) */
const char *goto_str; const char *goto_str;
pbx_builtin_setvar_helper(chan, varname, NULL); pbx_builtin_setvar_helper(chan, varname, NULL);
@@ -324,6 +336,28 @@ static int while_end_exec(struct ast_channel *chan, void *data) {
return _while_exec(chan, data, 1); return _while_exec(chan, data, 1);
} }
static int while_exit_exec(struct ast_channel *chan, void *data) {
return _while_exec(chan, data, 2);
}
static int while_continue_exec(struct ast_channel *chan, void *data)
{
int x;
const char *prefix = "WHILE", *while_pri=NULL;
for (x = 0; ; x++) {
const char *tmp = get_index(chan, prefix, x);
if (tmp)
while_pri = tmp;
else
break;
}
if (while_pri)
ast_parseable_goto(chan, while_pri);
return 0;
}
static int unload_module(void *mod) static int unload_module(void *mod)
{ {
@@ -332,6 +366,8 @@ static int unload_module(void *mod)
res = ast_unregister_application(start_app); res = ast_unregister_application(start_app);
res |= ast_unregister_application(exec_app); res |= ast_unregister_application(exec_app);
res |= ast_unregister_application(stop_app); res |= ast_unregister_application(stop_app);
res |= ast_unregister_application(exit_app);
res |= ast_unregister_application(continue_app);
STANDARD_HANGUP_LOCALUSERS; STANDARD_HANGUP_LOCALUSERS;
@@ -345,6 +381,8 @@ static int load_module(void *mod)
res = ast_register_application(start_app, while_start_exec, start_synopsis, start_desc); res = ast_register_application(start_app, while_start_exec, start_synopsis, start_desc);
res |= ast_register_application(exec_app, execif_exec, exec_synopsis, exec_desc); res |= ast_register_application(exec_app, execif_exec, exec_synopsis, exec_desc);
res |= ast_register_application(stop_app, while_end_exec, stop_synopsis, stop_desc); res |= ast_register_application(stop_app, while_end_exec, stop_synopsis, stop_desc);
res |= ast_register_application(exit_app, while_exit_exec, exit_synopsis, exit_desc);
res |= ast_register_application(continue_app, while_continue_exec, continue_synopsis, continue_desc);
return res; return res;
} }