kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

everything that loads a config that needs a config file to run

Browse Source 
now reports AST_MODULE_LOAD_DECLINE when loading if config file
is not there, also fixed an error in res_config_pgsql where it 
had a non static function when it should.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41633 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-08-31 21:00:20 +00:00
parent f2b836ff4f
commit 05a695af72
35 changed files with 418 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pbx/pbx_config.c
View File

@@ -1336,7 +1336,7 @@ static int unload_module(void)
return 0;
}
static void pbx_load_config(const char *config_file)
static int pbx_load_config(const char *config_file)
{
struct ast_config *cfg;
char *end;
@@ -1349,7 +1349,7 @@ static void pbx_load_config(const char *config_file)
cfg = ast_config_load(config_file);
if (!cfg)
return;
return 0;
/* Use existing config to populate the PBX table */
static_config = ast_true(ast_variable_retrieve(cfg, "general", "static"));
@@ -1491,13 +1491,15 @@ static void pbx_load_config(const char *config_file)
}
}
ast_config_destroy(cfg);
return 1;
}
static int pbx_load_module(void)
{
struct ast_context *con;
pbx_load_config(config);
if(!pbx_load_config(config))
return AST_MODULE_LOAD_DECLINE;
ast_merge_contexts_and_delete(&local_contexts, registrar);
for (con = NULL; (con = ast_walk_contexts(con));)
@@ -1511,7 +1513,7 @@ static int pbx_load_module(void)
static int load_module(void)
{
if (pbx_load_module())
return -1;
return AST_MODULE_LOAD_DECLINE;
ast_cli_register(&context_remove_extension_cli);
ast_cli_register(&context_dont_include_cli);

3
pbx/pbx_dundi.c
View File

@@ -4488,7 +4488,8 @@ static int load_module(void)
return -1;
}
set_config("dundi.conf",&sin);
if(set_config("dundi.conf",&sin))
return AST_MODULE_LOAD_DECLINE;
netsocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);