diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-05 16:01:32 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-05 16:01:32 +0000 |
commit | fcf28e47cd93d3957afb27cfac49fbd40a639c2b (patch) | |
tree | 28f1c2e200a0e9155ecf39db1bd587000e978891 /apps/app_stack.c | |
parent | 07a72fb19f2584930bb895544e1575b6801d3a09 (diff) |
Merged revisions 120602 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r120602 | tilghman | 2008-06-05 10:58:11 -0500 (Thu, 05 Jun 2008) | 4 lines
Conditionally load the AGI command gosub, depending on whether or not res_agi
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@120603 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_stack.c')
-rw-r--r-- | apps/app_stack.c | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index f181fe952..9e6c0dadd 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -36,6 +36,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" #include "asterisk/agi.h" +static int agi_loaded = 0; + static const char *app_gosub = "Gosub"; static const char *app_gosubif = "GosubIf"; static const char *app_return = "Return"; @@ -487,12 +489,15 @@ static int unload_module(void) { struct ast_context *con; - 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 */ + if (agi_loaded) { + ast_agi_unregister(ast_module_info->self, &gosub_agi_command); + + 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_pop); ast_unregister_application(app_gosubif); @@ -505,19 +510,31 @@ static int unload_module(void) static int load_module(void) { struct ast_context *con; - con = ast_context_find_or_create(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; + + if (!ast_module_check("res_agi.so")) { + if (ast_load_resource("res_agi.so") == AST_MODULE_LOAD_SUCCESS) { + agi_loaded = 1; + } } 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, "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_return, return_exec, return_synopsis, return_descrip); ast_register_application(app_gosubif, gosubif_exec, gosubif_synopsis, gosubif_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); return 0; |