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

instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-11-02 23:34:39 +00:00
parent 585899dbc0
commit a67790c6f5
7 changed files with 96 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/app_stack.c
View File

@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
<depend>res_agi</depend>
<use>res_agi</use>
***/
#include "asterisk.h"
@@ -38,6 +38,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h"
#include "asterisk/manager.h"
#include "asterisk/channel.h"
/* usage of AGI is optional, so indicate that to the header file */
#define ASTERISK_AGI_OPTIONAL
#include "asterisk/agi.h"
/*** DOCUMENTATION
@@ -104,7 +107,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</description>
</application>
***/
static int agi_loaded = 0;
static const char *app_gosub = "Gosub";
static const char *app_gosubif = "GosubIf";
@@ -537,7 +539,7 @@ static int unload_module(void)
{
struct ast_context *con;
if (agi_loaded) {
if (ast_agi_unregister) {
ast_agi_unregister(ast_module_info->self, &gosub_agi_command);
if ((con = ast_context_find("app_stack_gosub_virtual_context"))) {
@@ -559,15 +561,10 @@ static int load_module(void)
{
struct ast_context *con;
if (!ast_module_check("res_agi.so")) {
if (ast_load_resource("res_agi.so") == AST_MODULE_LOAD_SUCCESS) {
agi_loaded = 1;
}
} else {
agi_loaded = 1;
}
if (agi_loaded) {
/* usage of AGI is optional, so check to see if the ast_agi_register()
function is available; if so, use it.
*/
if (ast_agi_register) {
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");