diff options
| author | Matt O'Gorman <mogorman@digium.com> | 2006-08-31 21:00:20 +0000 |
|---|---|---|
| committer | Matt O'Gorman <mogorman@digium.com> | 2006-08-31 21:00:20 +0000 |
| commit | 05a695af721cb8002f3d462c6952f45f0e9c5d9e (patch) | |
| tree | 5eac7fd790352b502dbbc4fc21ae517fe7c388ad /apps/app_rpt.c | |
| parent | f2b836ff4f9f34c48f36b9aca18c633834dc0ace (diff) | |
everything that loads a config that needs a config file to run
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
Diffstat (limited to 'apps/app_rpt.c')
| -rw-r--r-- | apps/app_rpt.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c index e1da544c9..858525a58 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -7150,7 +7150,7 @@ char tmpstr[300]; } -static void *rpt_master(void *ignore) +static void *rpt_master(void *config) { int i,n; pthread_attr_t attr; @@ -7160,7 +7160,7 @@ char *this,*val; /* go thru all the specified repeaters */ this = NULL; n = 0; - rpt_vars[n].cfg = ast_config_load("rpt.conf"); + rpt_vars[n].cfg = config; cfg = rpt_vars[n].cfg; if (!cfg) { ast_log(LOG_NOTICE, "Unable to open radio repeater configuration rpt.conf. Radio Repeater disabled.\n"); @@ -8030,7 +8030,12 @@ static int unload_module(void) static int load_module(void) { - ast_pthread_create(&rpt_master_thread,NULL,rpt_master,NULL); + struct ast_config *cfg = ast_config_load("rpt.conf"); + if (!cfg) { + ast_log(LOG_WARNING, "No such configuration file rpt.conf\n"); + return AST_MODULE_LOAD_DECLINE; + } + ast_pthread_create(&rpt_master_thread,NULL,rpt_master,cfg); /* Register cli extensions */ ast_cli_register(&cli_debug); |