kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

features_config: Don't require features.conf to be present for Asterisk to load

Browse Source 
(closes issue ASTERISK-22426)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2806/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@398020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2013-08-30 16:57:41 +00:00
parent e68bf7187d
commit 90402bfda7
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/features_config.c
View File

@@ -1709,10 +1709,16 @@ static int load_config(void)
"", featuregroup_handler, 0); "", featuregroup_handler, 0);
if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) { if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
ast_log(LOG_ERROR, "Failed to process features.conf configuration!\n"); RAII_VAR(struct features_config *, features_cfg, __features_config_alloc(0), ao2_cleanup);
aco_info_destroy(&cfg_info);
ao2_global_obj_release(globals); if (aco_set_defaults(&global_option, "general", features_cfg->global) ||
return -1; aco_set_defaults(&featuremap_option, "featuremap", features_cfg->featuremap)) {
ast_log(LOG_ERROR, "Failed to load features.conf and failed to initialize defaults.\n");
return -1;
}
ast_log(LOG_NOTICE, "Could not load features config; using defaults\n");
ao2_global_obj_replace(globals, features_cfg);
} }
return 0; return 0;

13
main/udptl.c
View File

@@ -1458,14 +1458,17 @@ static int removed_options_handler(const struct aco_option *opt, struct ast_vari
static void __ast_udptl_reload(int reload) static void __ast_udptl_reload(int reload)
{ {
RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup);
if (aco_process_config(&cfg_info, reload) == ACO_PROCESS_ERROR) { if (aco_process_config(&cfg_info, reload) == ACO_PROCESS_ERROR) {
if (!reload) { if (!reload) {
if (!aco_set_defaults(&general_option, "general", udptl_cfg->general)) { RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup);
ast_log(LOG_WARNING, "Could not load udptl config; using defaults\n");
ao2_global_obj_replace(globals, udptl_cfg); if (aco_set_defaults(&general_option, "general", udptl_cfg->general)) {
ast_log(LOG_ERROR, "Failed to load udptl.conf and failed to initialize defaults.\n");
return;
} }
ast_log(LOG_NOTICE, "Could not load udptl config; using defaults\n");
ao2_global_obj_replace(globals, udptl_cfg);
} }
} }
} }