kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditionally load the AGI command gosub, depending on whether or not res_agi

Browse Source 
has been loaded, fix a return value in the loader, and ensure that the help
workhorse header does not print on load.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@120602 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-05 15:58:11 +00:00
parent 77f9f76bc2
commit 90d75af346
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/app_stack.c
View File

@@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/channel.h" #include "asterisk/channel.h"
#include "asterisk/agi.h" #include "asterisk/agi.h"
static int agi_loaded = 0;
static const char *app_gosub = "Gosub"; static const char *app_gosub = "Gosub";
static const char *app_gosubif = "GosubIf"; static const char *app_gosubif = "GosubIf";
static const char *app_return = "Return"; static const char *app_return = "Return";
@@ -490,12 +492,15 @@ static int unload_module(void)
{ {
struct ast_context *con; struct ast_context *con;
if ((con = ast_context_find("app_stack_gosub_virtual_context"))) { if (agi_loaded) {
ast_context_remove_extension2(con, "s", 1, NULL); ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
ast_context_destroy(con, "app_stack"); /* leave nothing behind */
if ((con = ast_context_find("app_stack_gosub_virtual_context"))) {
ast_context_remove_extension2(con, "s", 1, NULL);
ast_context_destroy(con, "app_stack"); /* leave nothing behind */
}
} }
ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
ast_unregister_application(app_return); ast_unregister_application(app_return);
ast_unregister_application(app_pop); ast_unregister_application(app_pop);
ast_unregister_application(app_gosubif); ast_unregister_application(app_gosubif);
@@ -508,19 +513,31 @@ static int unload_module(void)
static int load_module(void) static int load_module(void)
{ {
struct ast_context *con; struct ast_context *con;
con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack");
if (!con) { if (!ast_module_check("res_agi.so")) {
ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n"); if (ast_load_resource("res_agi.so") == AST_MODULE_LOAD_SUCCESS) {
return AST_MODULE_LOAD_DECLINE; agi_loaded = 1;
}
} else { } else {
ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_stack"); agi_loaded = 1;
}
if (agi_loaded) {
con = ast_context_find_or_create(NULL, NULL, "app_stack_gosub_virtual_context", "app_stack");
if (!con) {
ast_log(LOG_ERROR, "Virtual context 'app_stack_gosub_virtual_context' does not exist and unable to create\n");
return AST_MODULE_LOAD_DECLINE;
} else {
ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_stack");
}
ast_agi_register(ast_module_info->self, &gosub_agi_command);
} }
ast_register_application(app_pop, pop_exec, pop_synopsis, pop_descrip); ast_register_application(app_pop, pop_exec, pop_synopsis, pop_descrip);
ast_register_application(app_return, return_exec, return_synopsis, return_descrip); ast_register_application(app_return, return_exec, return_synopsis, return_descrip);
ast_register_application(app_gosubif, gosubif_exec, gosubif_synopsis, gosubif_descrip); ast_register_application(app_gosubif, gosubif_exec, gosubif_synopsis, gosubif_descrip);
ast_register_application(app_gosub, gosub_exec, gosub_synopsis, gosub_descrip); ast_register_application(app_gosub, gosub_exec, gosub_synopsis, gosub_descrip);
ast_agi_register(ast_module_info->self, &gosub_agi_command);
ast_custom_function_register(&local_function); ast_custom_function_register(&local_function);
return 0; return 0;

5
main/loader.c
View File

@@ -726,11 +726,12 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
int ast_load_resource(const char *resource_name) int ast_load_resource(const char *resource_name)
{ {
int res;
AST_LIST_LOCK(&module_list); AST_LIST_LOCK(&module_list);
load_resource(resource_name, 0); res = load_resource(resource_name, 0);
AST_LIST_UNLOCK(&module_list); AST_LIST_UNLOCK(&module_list);
return 0; return res;
} }
struct load_order_entry { struct load_order_entry {

1
res/res_agi.c
View File

@@ -2722,7 +2722,6 @@ static char *handle_cli_agi_show(struct ast_cli_entry *e, int cmd, struct ast_cl
" When called with a topic as an argument, displays usage\n" " When called with a topic as an argument, displays usage\n"
" information on the given command. If called without a\n" " information on the given command. If called without a\n"
" topic, it provides a list of AGI commands.\n"; " topic, it provides a list of AGI commands.\n";
break;
case CLI_GENERATE: case CLI_GENERATE:
return NULL; return NULL;
} }